Commit Graph

1867 Commits

Author SHA1 Message Date
Marek Bel
517fbb66bf Save 1K flash memory. 2018-09-03 20:00:46 +02:00
Marek Bel
d796df3f14 PFW-543 Add filament ramming when unloading filament with MMU. 2018-09-03 17:32:42 +02:00
Marek Bel
e5c0e26601 Merge branch 'MK3' into MK3_dev 2018-08-30 19:05:24 +02:00
PavelSindler
c24f673399
Merge pull request #1092 from mkbel/fix_fil_change_reset
Fix printer reset when changing filament during print over USB.
2018-08-30 16:53:01 +02:00
Marek Bel
12b1769531 Fix printer reset when changing filament during print over USB. 2018-08-30 16:02:13 +02:00
PavelSindler
e9a8d03c65
Merge pull request #1091 from PavelSindler/M600_change_extruder
version changed
2018-08-30 11:35:51 +02:00
PavelSindler
ed49e5187b version changed 2018-08-30 11:35:06 +02:00
PavelSindler
0e06269fd7
Merge pull request #1090 from PavelSindler/M600_change_extruder
linearity correction define added (menu readded)
2018-08-30 11:28:52 +02:00
PavelSindler
d96b0d5f32 linearity correction define added (menu readded) 2018-08-30 11:28:12 +02:00
PavelSindler
4555d96e50
Merge pull request #1089 from MRprusa3d/PFW-524
1-st Layer Calibration correction
2018-08-30 09:21:07 +02:00
MRprusa3d
25a22120fb 1-st Layer Calibration correction
filament loading improvement
2018-08-30 03:32:33 +02:00
PavelSindler
ef289bf9bb
Merge pull request #1088 from PavelSindler/M600_change_extruder
M600 change extruder
2018-08-29 14:43:02 +02:00
PavelSindler
b2c94f36cc removed unused "out of range" function 2018-08-29 14:41:39 +02:00
PavelSindler
8a453e65f8 eject filament allowed only when nozzle is hot (there can be filament loaded in printer nozzle) 2018-08-29 13:16:17 +02:00
PavelSindler
b284c70d9b auto deplete: dont eject filament 2018-08-29 13:08:09 +02:00
PavelSindler
8de767c1fa
Merge pull request #1086 from PavelSindler/M600_change_extruder
Multimaterial v2: Eject filament feature, M600 modified
2018-08-29 02:00:07 +02:00
PavelSindler
515e78cfd1 Eject filament feature in menu, M600: if it was envoked by FINDA, eject filament 2018-08-29 01:58:28 +02:00
PavelSindler
b9808354c4 Merge remote-tracking branch 'upstream/MK3' into M600_change_extruder 2018-08-28 23:53:35 +02:00
PavelSindler
d290543d7d
Merge pull request #1085 from mkbel/fix_active_filament
Fix active filament PFW-528
2018-08-28 23:50:57 +02:00
PavelSindler
705f098b1c eject filament: initial version 2018-08-28 23:50:31 +02:00
Marek Bel
2cd8691376 Do not use global variable tmp_extruder when setting temperature. 2018-08-28 20:26:33 +02:00
PavelSindler
8986226904
Merge pull request #1084 from MRprusa3d/PFW-439
Z-move correction
2018-08-28 20:07:10 +02:00
MRprusa3d
0695f3f345 Z-move correction
Z-move inhibition after FactoryReset
2018-08-28 19:58:03 +02:00
Marek Bel
8aeb7e04f1 Fix bound check for T0 .. T4 command. Document mmu_load_to_nozzle(). 2018-08-28 18:52:16 +02:00
Marek Bel
55eaa1de83 Fix code indentation. 2018-08-28 18:26:10 +02:00
PavelSindler
9cf29f5c76
Merge pull request #1082 from mkbel/MK3_dev
Merge branch MK3 into Mk3 dev
2018-08-28 18:25:07 +02:00
Marek Bel
9fb68fb724 Remove usage of global variable tmp_extruder in M200. 2018-08-28 18:08:21 +02:00
mkbel
5ad2fdaaaa
Merge pull request #1080 from PavelSindler/M600_change_extruder
removed redundant code
2018-08-28 17:36:50 +02:00
Marek Bel
adde0d3944 Merge branch 'prusa3d_MK3' into MK3_dev 2018-08-28 17:31:12 +02:00
PavelSindler
d60cdfb3eb
Merge pull request #1081 from MRprusa3d/PFW-410
Z-endstop @ MK3
2018-08-28 17:07:35 +02:00
MRprusa3d
d3869bd857 Z-endstop @ MK3
add show P.I.N.D.A. state menu item @ CalibrationMenu
2018-08-28 16:12:59 +02:00
Marek Bel
9a14daab06 Revert "Split settings menu into separate functions."
Original commit wont work, as intended as MENU_ITEM_* macros contain return statement.
2018-08-28 16:03:07 +02:00
PavelSindler
27bd31e255 removed redundant code 2018-08-28 11:26:35 +02:00
PavelSindler
7a88fc9ef7
Merge pull request #1078 from mkbel/auto_deplete_2
Auto deplete 2
2018-08-28 11:10:04 +02:00
PavelSindler
3e2cb72695
Merge branch 'MK3' into auto_deplete_2 2018-08-28 11:01:30 +02:00
PavelSindler
bb21cd6fec
Merge pull request #1079 from mkbel/fix_unable_to_compile
Fix unable to compile
2018-08-28 10:57:50 +02:00
PavelSindler
755baddb54
Merge branch 'MK3' into fix_unable_to_compile 2018-08-28 10:57:19 +02:00
mkbel
41e9e8e720
Merge pull request #1077 from PavelSindler/M600_change_extruder
Multi material M600: change extruder posibility removed; unload starts imidiately
2018-08-28 03:06:20 +02:00
Marek Bel
72cd0d26f9 Increase scope of code disabled by macro TMC2130 to whole lcd_settings_linearity_correction_menu. 2018-08-27 21:08:40 +02:00
Marek Bel
dd39976176 Merge remote-tracking branch 'pavel/fix_unable_to_compile' into fix_unable_to_compile 2018-08-27 21:06:35 +02:00
Marek Bel
7aadb2f660 Fix compile time error: default argument given for parameter 2 of int8_t lcd_show_fullscreen_message_yes_no_and_wait_P 2018-08-27 20:57:57 +02:00
Marek Bel
9611401b69 Fix mmu_M600_load_filament increments tmp_extruder, which is not set in case of automatic == true. 2018-08-27 20:23:43 +02:00
Marek Bel
2a00e5d348 Fix loading filament screen hangs if changed automatically. 2018-08-27 20:09:22 +02:00
Marek Bel
b08ae95568 Rename autoDeplete to lcd_autoDeplete and make it global. When filament runs out, call M600 AUTO if lcd_autoDeplete is enabled. Shorten finda polling period to 300 ms. 2018-08-27 19:36:54 +02:00
Marek Bel
1cdb7a48cb Show auto deplete only when mmu unit present. 2018-08-27 16:24:21 +02:00
Marek Bel
8279aba4d7 Add auto deplete setting. 2018-08-27 16:15:46 +02:00
PavelSindler
191e5dfddd mmu M600: dont use change extruder posibility; unload starts always imidiately 2018-08-27 16:12:10 +02:00
Marek Bel
f02b0d80e3 Split settings menu into separate macros. 2018-08-27 15:48:09 +02:00
PavelSindler
2b32b41969 MK2.5 build error hotfix 2018-08-27 05:53:39 +02:00
PavelSindler
168bc74102
Merge pull request #1075 from PavelSindler/mmu_filament_sensor
Mmu filament sensor
2018-08-27 05:26:12 +02:00