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 |
|
Scott Lahteine
|
00749d8ef0
|
Add pause/resume action to example configs
|
2017-12-25 01:28:16 -06:00 |
|
Thomas Moore
|
59d047c1d7
|
[1.1.x] Use NOZZLE_PARK_FEATURE for ADVANCED_PAUSE_FEATURE (#8864)
* Use NOZZLE_PARK_FEATURE for ADVANCED_PAUSE_FEATURE
|
2017-12-24 23:47:05 -06:00 |
|
Scott Lahteine
|
fb6b62a01b
|
Comment return false in motion functions
|
2017-12-24 22:56:56 -06:00 |
|
Scott Lahteine
|
1bb5791e64
|
Merge pull request #8888 from thinkyhead/bf1_reduce_jerk_default
[1.1.x] Reduce default jerk
|
2017-12-24 21:48:39 -06:00 |
|
Scott Lahteine
|
e47316c9d3
|
Tweak cleaning buffer / SD finished command
|
2017-12-24 20:33:58 -06:00 |
|
Scott Lahteine
|
88c0688961
|
Reduce default jerk. XY by half. Z by 1/4
|
2017-12-24 19:49:51 -06:00 |
|
Scott Lahteine
|
aa9cad0cc6
|
Merge pull request #8870 from petrzjunior/bugfix-1.1.x
[1.1.x][Language] Update Czech for Dec 2017
|
2017-12-24 18:48:37 -06:00 |
|
Scott Lahteine
|
0950527437
|
Fix WELCOME_MSG in PT
From #8879
|
2017-12-24 18:45:16 -06:00 |
|
Scott Lahteine
|
b7306ef07f
|
Fix WELCOME_MSG in PT
From #8879
|
2017-12-24 18:42:50 -06:00 |
|
Petr Zahradník
|
0fc3fea8df
|
Update Czech language Dec 2017
|
2017-12-22 18:33:11 +01:00 |
|
Scott Lahteine
|
b5677907d0
|
Minor speedup for SCARA scaling
And cleanup of Delta IK macros...
|
2017-12-21 22:39:06 -06:00 |
|
Scott Lahteine
|
6f40d57e14
|
Merge pull request #8851 from thinkyhead/bf1_more_scara_scaling
[1.1.x] SCARA Feedrate Scaling for G2/G3 - using HYPOT
|
2017-12-21 21:35:19 -06:00 |
|
Scott Lahteine
|
2aaf66b789
|
Merge pull request #8847 from thinkyhead/bf1_restore_position_float
[1.1.x] Restore position_float to LIN_ADVANCE
|
2017-12-21 16:33:46 -06:00 |
|
Scott Lahteine
|
fdd85a529a
|
Feedrate scaling for G2/G3
|
2017-12-20 19:33:16 -06:00 |
|