Bob-the-Kuhn
1beaef0452
fix 3S hang & enable SPLIT
2017-09-30 10:27:41 -05:00
Scott Lahteine
6904561fd5
Merge pull request #7793 from tcm0116/2.0.x-servo
...
[2.0.x] Fix Servo class compile errors
2017-09-29 17:51:21 -05:00
Scott Lahteine
92389e4236
Merge pull request #7794 from tcm0116/2.0.x-usb_interrupt
...
[2.0.x] Fix LPC1768 USB interrupt priority
2017-09-29 17:50:02 -05:00
Thomas Moore
f1b6b4bdaa
Fix LPC1768 USB interrupt priority
2017-09-29 08:21:33 -05:00
Thomas Moore
020ce176c4
Fix Servo class compile errors
2017-09-29 08:17:30 -05:00
Bob-the-Kuhn
de05b2b309
Merge pull request #7786 from Bob-the-Kuhn/2.0-compile-issue-fix
...
2.0.x Re-ARM compile issues - work around
2017-09-28 10:41:26 -05:00
Bob-the-Kuhn
62054af6eb
2.0 compile issues
2017-09-28 10:16:25 -05:00
Bob-the-Kuhn
17dddda024
Merge pull request #7746 from Bob-the-Kuhn/M355-&-LCD
...
Marlin 2.0.x - M355 fixes & LCD improvements
2017-09-27 19:39:04 -05:00
Christopher Pepper
bea3ec2724
M355 S0, S1 fixes & faster LCD, SD card
...
fix Travis error
2017-09-27 19:26:00 -05:00
Scott Lahteine
8c622a59cf
Merge pull request #7774 from thinkyhead/bf2_lcd_leveling_status
...
[2.0.x] Show leveling status on character LCD
2017-09-27 13:10:25 -05:00
GMagician
c47e2abefb
gitignorefix
2017-09-27 19:49:05 +02:00
Scott Lahteine
56c05a7015
Show leveling status on character LCD
2017-09-27 12:21:15 -05:00
Scott Lahteine
2ee4eef25c
Merge pull request #7748 from GMagician/Addressing-#7730
...
[bugfix-2.0.x] Fix compiler error (issue #7730 )
2017-09-27 12:06:55 -05:00
Scott Lahteine
ffed785656
Merge pull request #7768 from thinkyhead/bf2_HAL_STM32F1
...
[2.0.x] HAL for STM32F1
2017-09-27 11:52:34 -05:00
Scott Lahteine
88f9194168
Merge pull request #7771 from thinkyhead/bf2_user_menu_return
...
[2.0.x] User menu return-to-status option
2017-09-27 11:51:57 -05:00
Scott Lahteine
604b804125
Add confirmation step to Init EEPROM
2017-09-27 11:31:38 -05:00
Tannoo
c869dc9745
User script return-to-status option
2017-09-27 11:31:38 -05:00
victorpv
e9acb63290
STM32F1 HAL
...
Adding files for STM32F1 HAL based on libmaple/stm32duino core.
Current persistent_store uses cardreader changes to be sent in separate
commit, but could be changed to use i2c eeprom.
2017-09-27 11:20:10 -05:00
Scott Lahteine
baf0bd2b24
Merge pull request #7770 from thinkyhead/bf2_HAL_cleanups_etc
...
Some HAL formatting cleanup
2017-09-27 11:11:12 -05:00
Scott Lahteine
c2b1d51f16
HAL whitespace and style cleanup
2017-09-27 10:55:36 -05:00
Scott Lahteine
c272f2c84e
Cleanup pins spacing
2017-09-27 10:55:36 -05:00
Scott Lahteine
dff2904c0f
Marlin code whitespace cleanup
2017-09-27 10:55:36 -05:00
Scott Lahteine
9dd5390d7d
frameworks whitespace cleanup
2017-09-27 10:41:27 -05:00
Scott Lahteine
599f2ad983
Define pin accessors more like <Arduino.h>
2017-09-27 10:41:27 -05:00
Scott Lahteine
358656acc3
Tweak HAL_adc_start_conversion
2017-09-27 10:41:27 -05:00
Scott Lahteine
0cb4d25431
Tweaks to Servo classes
2017-09-27 10:41:27 -05:00
Scott Lahteine
f582f1bf4e
Merge pull request #7769 from thinkyhead/bf2_GT2560
...
Fixes for GT2560, ANET A8
2017-09-27 10:32:50 -05:00
Phr3d13
10c1b442ca
Fixes for Anet10 and gt2560
...
Fixes for 2 "... not declared in this scope" compiler errors.
2017-09-27 07:34:02 -05:00
Phr3d13
5a3a53379f
Update pins for GT2560_Rev_A_Plus
...
For PR #7738
2017-09-27 06:34:51 -05:00
Scott Lahteine
afe77bd138
Merge pull request #7763 from thinkyhead/bf2_fixes_from_bf1
...
[2.0.x] Fix G3D_PANEL encoder steps, babystep label #7762
2017-09-27 03:20:47 -05:00
Scott Lahteine
fdf1b8a7b8
Fix sanity check for LCD_FOR_MELZI
...
Comes from #7760
2017-09-27 03:04:19 -05:00
Scott Lahteine
b93a55e15f
Fix ST7920_DELAY_2 potentially being unset
...
Comes from #7760
2017-09-27 03:04:01 -05:00
Scott Lahteine
ce1638e32f
Add Babystep Z graphic overlay
...
See PR #7593
2017-09-27 01:25:05 -05:00
Scott Lahteine
49c693c85b
Tweak to serial macros
2017-09-27 01:25:05 -05:00
Scott Lahteine
46709ed7e0
More featureful CR-10 configurations
...
See #7725
2017-09-27 01:25:05 -05:00
Scott Lahteine
2b112143fa
Update Sanguinololu config version
2017-09-27 00:48:59 -05:00
Scott Lahteine
7cd5eb6d42
Update LEVEL_BED_CORNERS config option
2017-09-27 00:48:59 -05:00
Scott Lahteine
981a610f75
Disable BABYSTEP_XY, add to SDSORT comment
2017-09-27 00:48:59 -05:00
Scott Lahteine
4c5be9bb05
Fix a PARKING_EXTRUDER comment
2017-09-27 00:48:58 -05:00
Scott Lahteine
494b0eba2d
Config spacing fix
2017-09-27 00:48:47 -05:00
Scott Lahteine
2281154025
Increase BABYSTEP_MULTIPLICATOR to 100
2017-09-27 00:48:46 -05:00
Scott Lahteine
92dbf5f148
Fix babystep edit label, allowing translation
2017-09-26 23:43:05 -05:00
Scott Lahteine
37eb6d1732
Babystepping code tweak
2017-09-26 23:43:05 -05:00
Scott Lahteine
7a29f802d0
Fix ENCODER_PULSES_PER_STEP for G3D_PANEL
2017-09-26 23:43:05 -05:00
Scott Lahteine
5972251b17
No need for unused LCD_PINS_Dn
2017-09-26 23:27:53 -05:00
Scott Lahteine
7239ab231c
Fix ADVANCED_PAUSE_FEATURE in .travis.yml
2017-09-26 17:12:46 -05:00
GMagician
c508e9adec
Fix compiler error
...
Added missing include file,
called 'leveling_is_active()' with no prototipe defined.
2017-09-25 23:18:26 +02:00
Scott Lahteine
c4e4a0688c
Fix bug in SD Autostart
...
As pointed out by @marcio-ao in #7638
2017-09-24 17:53:39 -05:00
Scott Lahteine
88407727ec
Merge pull request #7727 from thinkyhead/apply_7697_from_1.1.x
...
G33 changes from 1.1.x
2017-09-24 17:48:16 -05:00
Scott Lahteine
6d5fcac54a
G33 changes from 1.1.x
2017-09-24 14:16:23 -05:00
