Scott Lahteine
36541d61ab
Merge pull request #9038 from thinkyhead/bf1_fix_resume_pos
...
[1.1.x] Fix resume_print positioning
2018-01-03 20:46:50 -06:00
Scott Lahteine
a436e89b83
Fix resume_print positioning
2018-01-03 20:12:44 -06:00
Thomas Moore
faf7dda9d3
Fix 'lcd_temp_menu_e0_filament_change' was not declared error
2018-01-03 19:18:34 +00:00
Tannoo
d3139e47f8
[1.1.x] EEPROM init fix ( #9002 )
2018-01-03 04:28:15 -06:00
Scott Lahteine
c893a90d64
Merge pull request #8988 from tcm0116/1.1.x_ubl
...
[1.1.x] Fix UBL compilation warnings
2018-01-02 21:37:59 -06:00
Thomas Moore
586d50ff99
Fix UBL compilation warnings
2018-01-02 19:41:02 -06:00
Scott Lahteine
ba9879f8fa
Merge pull request #9008 from karkla/bugfix-1.1.x
...
[1.1.x] Update pins_MKS_BASE.h with Microstepping pin definitions
2018-01-01 18:47:59 -06:00
Scott Lahteine
3cd48db9a9
Merge pull request #8983 from ABH10/bugfix-1.1.x_thermistor-tables
...
[1.1.x] Update of comments in thermistor table files. No functional changes.
2018-01-01 18:40:29 -06:00
karkla
454a8ae26a
Update pins_MKS_BASE.h
...
Microstepping Pins (reverse engineered at V1.4)
Some new batches have the HR4982 (Heroic) instead of the A4982 (Allegro) as stepper driver. While most of the functionality is similar, the HR variant obviously doesn't work with diode smoothers (no fast decay). But the Heroic has a 128 µStepping mode where the A4982 is doing quarter steps (MS1=L / MS2=H). To achieve comfortable tests with the M350/M351 commands, the following definitions have to made.
2018-01-02 01:29:27 +01:00
Scott Lahteine
9de9e37539
Some temperature code cleanup
2018-01-01 18:03:43 -06:00
Roxy-3D
949191215b
Z BabyStepping should not be dependent on a bed leveling system being active
2018-01-01 14:39:28 -06:00
Arne Husth
decf844788
Update of comments in thermistor table files. No functional changes.
2017-12-31 14:46:56 +01:00
Scott Lahteine
642dec3625
Fix typo in delta buffer_line call
...
Fix #8901
2017-12-31 01:38:36 -06:00
Scott Lahteine
8e82dd0b5b
Merge pull request #8947 from houseofbugs/bugfix-1.1.x
...
[1.1.x] SLIM_LCD_MENUS option
2017-12-31 00:56:10 -06:00
Scott Lahteine
5f13e2e336
Merge pull request #8977 from thinkyhead/bf1_sync_up_configs
...
[1.1.x] Synchronize configs with 2.0.x
2017-12-31 00:55:39 -06:00
Scott Lahteine
4153d76810
Update Marlin_main.cpp
2017-12-31 00:24:57 -06:00
houseofbugs
a66811a597
A specific option to SLIM_LCD_MENUS
2017-12-31 00:15:24 -06:00
Scott Lahteine
839dd66c3b
Synchronize configs with 2.0.x
2017-12-31 00:02:22 -06:00
Scott Lahteine
7a8c132ee9
Apply SLIM_LCD_MENUS to example configs
2017-12-30 23:52:53 -06:00
Scott Lahteine
1e18d716c2
Merge pull request #7107 from tcm0116/load_unload
...
[1.1.x] Add M701 and M702 filament load and unload
2017-12-30 23:34:16 -06:00
Thomas Moore
81193e9338
Add M701 / M702 filament load / unload
2017-12-30 19:48:21 -06:00
Scott Lahteine
d1cad5afa4
Apply FILAMENT_LOAD_UNLOAD_GCODES to example configs
2017-12-30 18:22:31 -06:00
Scott Lahteine
2a535bdce8
Followup to #8964
2017-12-30 16:47:26 -06:00
Claus Näveke
52244f690e
Add example config for Tronxy X1 ( #8964 )
2017-12-30 16:38:42 -06:00
Scott Lahteine
eaf681675a
Merge pull request #8965 from thinkyhead/bf1_better_no_reentry
...
[1.1.x] ultralcd.cpp: Improve no_reentry, use when queuing G-code
2017-12-30 04:24:24 -06:00
Scott Lahteine
2385c06696
Apply some PGM_P pointers
2017-12-30 04:16:50 -06:00
Scott Lahteine
81e0f5bc7d
Single pause flag also indicates SD print pause
2017-12-30 04:16:50 -06:00
Scott Lahteine
18e277d9d3
Enqueue commands properly in ultralcd.cpp
2017-12-30 04:16:50 -06:00
Scott Lahteine
025a4558fb
Merge pull request #8944 from zarthcode/patch-1
...
Fix malformed Capabilities report
2017-12-28 21:06:23 -06:00
Scott Lahteine
85ca7fed93
Show bedlevel with Bed temp indicator
...
…and display a third extruder on character display
2017-12-28 20:21:47 -06:00
Anthony
7637eb863a
Fix malformed Capabilities report
2017-12-28 20:03:44 -06:00
Scott Lahteine
f9b7659b56
Merge pull request #8907 from marcio-ao/bugfix-1.1.x
...
[1.1.x] Multi extruder support for M600 / LCD
2017-12-27 01:30:32 -06:00
Marcio Teixeira
6195f7810a
Multi extruder support for M600 and LCD (FR #8672 )
2017-12-26 22:59:05 -06:00
Scott Lahteine
ecba9b6738
Merge pull request #8897 from thinkyhead/bf1_lcd_click_redraw
...
[1.1.x] Clear lcd_clicked on use
2017-12-26 20:54:31 -06:00
Scott Lahteine
93e3b3d5ba
Merge pull request #8911 from houseofbugs/patch-1
...
[1.1.x] Fix NO_VOLUMETRICS compile error
2017-12-26 20:25:20 -06:00
Scott Lahteine
417bdb0488
Fix bug in NO_VOLUMETRICS
2017-12-26 19:56:22 -06:00
Timothy Hoogland
8ea3b29c17
Fix NO_VOLUMETRICS compile error
2017-12-26 19:32:09 -06:00
Scott Lahteine
81f1001b2c
Clear lcd_clicked immediately on use
2017-12-25 21:50:58 -06:00
Scott Lahteine
99f98890c2
Merge pull request #8892 from thinkyhead/bf1_action_on_action
...
[1.1.x] Fixes for G29 / 3POINT
2017-12-25 09:08:02 -06:00
Scott Lahteine
5f0026893f
Fix some compiler warnings
2017-12-25 08:51:35 -06:00
Scott Lahteine
4f943a73bc
Fixes for G29 / 3POINT
2017-12-25 08:35:47 -06:00
Scott Lahteine
e31923be8d
lcd_map_control deps on ULTIPANEL
2017-12-25 07:44:32 -06:00
Scott Lahteine
395235a529
Merge pull request #8891 from thinkyhead/bf1_action_on_action
...
[1.1.x] Allow consecutive uses of G29
2017-12-25 07:30:04 -06:00
Scott Lahteine
55848a4bd8
Allow consecutive uses of G29
2017-12-25 06:32:55 -06:00
Scott Lahteine
19e768d43d
Merge pull request #8849 from silentninja1/patch-3
...
[1.1.x] //Actions on Pause / Resume (M600, M125, etc.)
2017-12-25 04:41:37 -06:00
Scott Lahteine
3c7cdcdc22
General cleanup of config-store, reset_bed_level
2017-12-25 04:23:52 -06:00
Scott Lahteine
e0d487e339
Update TMC2208 config store
2017-12-25 04:08:39 -06:00
Scott Lahteine
defff1e4a8
Fix GT2560 A+ servo pins
2017-12-25 02:20:13 -06:00
Scott Lahteine
05a6d48753
Tweak to M125 code
2017-12-25 01:33:46 -06:00
silentninja1
b12eb33feb
Add support for pause and resume action commands on M600
2017-12-25 01:28:17 -06:00
