d14822b22f
Give wizard states human readable names. Use uint8_t as underlying type - saves 20B of FLASH memory.
2018-09-13 16:37:41 +02:00
8235f0f869
Merge branch 'MK3_dev' into add_cancel
2018-09-12 19:38:26 +02:00
7bc46323e2
Update pause print documentation.
2018-09-12 18:35:26 +02:00
de2100ac7b
Merge branch 'MK3' into MK3_dev
2018-09-12 15:22:12 +02:00
0d4f4fe933
Merge pull request #1143 from PavelSindler/lang2
...
lang fix
2018-09-12 09:38:18 +02:00
45066ebddc
lang fix
2018-09-12 09:37:16 +02:00
30d54be9de
Merge pull request #1142 from PavelSindler/lang2
...
changed version
2018-09-12 09:20:32 +02:00
298950e601
changed version
2018-09-12 09:19:23 +02:00
3e84bf6341
Lang update (translation + increased reserved space)
2018-09-12 02:45:13 +02:00
13b67f0e0a
Add Cancel item into PLA filament selection menu initiated by first layer calibration with MMU.
2018-09-11 22:33:13 +02:00
ada7cffd32
Open menu to select filament before first layer calibration if MMU unit is present.
2018-09-11 19:53:29 +02:00
96aada9061
load filament messages, czech language missing translation readded
2018-09-11 18:25:38 +02:00
5649d6c3c0
Precede active filament on status screen with letter F.
2018-09-11 17:27:10 +02:00
98264808dc
Change gcode "T?" question from "Choose extruder:" to "Choose filament" and answers from "Extruder 1" .. "Extruder 5" to "Filament 1" .. "Filament 5".
2018-09-11 17:16:13 +02:00
46df46f482
Add possibility to use other filaments in LCD_COMMAND_V2_CAL.
2018-09-11 17:03:20 +02:00
19a1ccdc76
Rename choose_extruder_menu() to choose_menu_P(), add parameters to make it reusable.
2018-09-11 16:51:00 +02:00
6c6354b2cb
Do not preheat nozzle before loading filament to MMU in first layer calibration wizard.
...
Show insert PLA filament to the first tube of MMU instead of "to the extruder".
First layer calibration wizard with MMU is now functional. But there is no option to unload filament from wizard.
2018-09-11 16:03:46 +02:00
0fcd2cf2a1
Merge branch 'MK3_dev' into fix_mmu_1st_lay_cal
2018-09-11 15:26:35 +02:00
d9a2fe70ec
missing declaration fix
2018-09-11 11:06:37 +02:00
c023fb12d5
add choose filament messages
2018-09-11 09:50:50 +02:00
90e3ae5464
Merge pull request #1127 from XPila/MK3
...
Lang update, french translation
2018-09-11 09:44:02 +02:00
4ca300bc39
Lang update, french translation
...
+resized reserved space
2018-09-11 03:43:05 +02:00
b3bc71b45b
Merge remote-tracking branch 'prusa3d/MK3' into MK3_dev
2018-09-10 23:52:51 +02:00
25a46557d1
merge with upstream
2018-09-10 22:11:32 +02:00
8a9f066c1b
choose_extruder_menu: extruder -> filament
2018-09-10 22:09:37 +02:00
cc08d660f7
Always use filament 1 for first layer calibration when MMU is present.
...
Lift Z when moving from intro line to meander.
For MMU, print longer intro line to allow load to nozzle.
2018-09-10 20:55:50 +02:00
1bb9e9ed92
MMU_DEBUG
2018-09-10 20:39:28 +02:00
6fa798aa83
init
2018-09-10 20:08:13 +02:00
1253fb338a
wizard hotfix
2018-09-10 18:02:54 +02:00
764e5c9769
Merge branch 'MK3' into MK3_dev
2018-09-09 22:52:01 +02:00
5a6ef00cfc
Do not unload filament from nozzle when touching bed in the end of first layer calibration. Unload it after reaching home position.
2018-09-07 10:50:23 +02:00
ebfbf4ac3f
Merge branch 'MK3' into MK3_dev
2018-09-07 09:24:45 +02:00
cbc506c379
Merge pull request #1110 from PavelSindler/lcd_clicked_error_fix
...
lcd_clicked() fix (PFW-534 and PFW-546)
2018-09-07 09:07:03 +02:00
001680bbdc
Merge branch 'MK3' into time_remaining_fix
...
# Conflicts:
# Firmware/Marlin_main.cpp
2018-09-07 08:21:36 +02:00
801f8e93e8
Merge pull request #1112 from PavelSindler/MK25_time_remaining
...
MK25: always show "normal mode" remaining time (PFW-553)
2018-09-07 08:05:16 +02:00
2f02828273
time remaining fix
2018-09-07 02:02:35 +02:00
66305b3e04
MK25: always show "normal mode" remaining time
2018-09-06 23:05:36 +02:00
48bf5d3a75
Merge pull request #1104 from mkbel/MK3_dev
...
Merge MK3 into Mk3_dev
2018-09-06 21:01:29 +02:00
dbc0654b1c
Merge pull request #1108 from mkbel/pause_print
...
Pause print
2018-09-06 21:01:16 +02:00
48f5da9cb8
lcd_clicked fix
2018-09-06 20:54:51 +02:00
0e50c388af
Save 1K flash memory.
2018-09-06 15:06:46 +02:00
0d99dc0a3f
PFW-543 Add filament ramming when unloading filament with MMU.
2018-09-06 15:06:33 +02:00
5d1e59cec3
Fix problem that nozzle temperature stays 0 if resume print is invoked from menu earlier than pause movements are finished.
2018-09-06 13:20:24 +02:00
0fe48de4af
Remove feedmultiplyBckp global variable. Remove redundant isPrintPaused = true assignment, as it is already done in lcd_pause_print(). Remove unused saved_feedmultiply and fanSpeedBckp prototypes. Move isPrintPaused = true assignment to safer location, as LCD_COMMAND_LONG_PAUSE is not reached if lcd_commands_type is not LCD_COMMAND_IDLE.
2018-09-06 12:23:21 +02:00
05a0b9c939
Remove fanSpeedBckp global variable.
2018-09-06 11:41:44 +02:00
40990c4deb
Remove saved_feedmultiply global variable.
2018-09-06 11:30:06 +02:00
b43c8dad74
Remove HotendTempBckp global variable.
2018-09-06 10:05:59 +02:00
d71311f13f
Remove redundant HotendTempBckp from crash detection recover.
2018-09-06 09:41:37 +02:00
920d828833
Rename lcd_sdcard_pause() to lcd_pause_print() to reflect, that also USB printing could be possible to pause. Unite it with pause_print() and use new (immediate) pause mechanism in all places where old mechanism was used. Rename resume_print() to lcd_resume_print() and make it global, unite it with lcd_sdcard_resume() and use it also in place, where lcd_commands_type = LCD_COMMAND_LONG_PAUSE_RESUME was used. Remove LCD_COMMAND_LONG_PAUSE_RESUME lcd_command_type. Remove unused pause_lastpos[].
2018-09-06 08:43:54 +02:00
67b2456ad9
Merge branch 'MK3' into MK3_dev
2018-09-05 21:48:29 +02:00
Marek Bel
PavelSindler
PavelSindler
Robert Pelnar
mkbel