a7fdfdd258
Put repetitive code into separate function. No change in functionality.
2018-09-18 17:15:13 +02:00
6ee97468ee
Remove lcd_buttons_update() call from all other places than interrupt. There is no known reason, why lcd_buttons_update() should be called from multiple places and multiple contexts. Remove mutex, which is not needed anymore, and wasn't implemented properly anyway (Operation was not atomic.).
2018-09-18 16:05:49 +02:00
f532da4b17
Remove duplicate button debouncing code. Save 254B flash.
2018-09-18 14:39:01 +02:00
90a10a692a
Enable button debouncing also in modal mode (!lcd_update_enabled). In lcd_clicked() consume click event immediately.
2018-09-18 14:38:50 +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
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
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
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
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
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
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
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
74be7677cf
Fix problem, that current_position is rewritten after long_pause() call.
2018-09-05 21:10:05 +02:00
a5db084b70
Move resuming nozzle temperature to restore_print_from_ram_and_continue().
...
Known limitations: Unused code not removed. Unload filament moves extruder to print position.
2018-09-04 14:56:20 +02:00
35cf3f3a61
Time info
...
suffix for doubt time estimation (i.e. if feed rate changed)
2018-09-04 14:39:46 +02:00
acef0578a5
Don't move before reaching nozzle temperature when resuming the print.
...
Known limitations: Doesn't resume print fan. Unused code not removed. Unload filament moves extruder to print position.
2018-09-04 10:07:52 +02:00
d54e629950
Retract, lift Z, move away in XY, disable fan and nozzle heating. Resume nozzle heating.
...
Known limitations: Doesn't wait for nozzle temperature reaching set temperature before moving to print area. Doesn't resume print fan. Unused code not removed.
2018-09-04 08:53:27 +02:00
af08e16426
Use stop_and_save_print_to_ram() and restore_print_from_ram_and_continue() pair to pause print from menu. Move declaration of those functions to marlin.h. Move declaration of FSensorStateMenu to ultralcd.h.
...
Known limitations: Filament is not retracted, extruder is not lifted in Z and moved to rear left corner in XY. Nozzle heating is not turned off nor restored. Unused code is not removed.
2018-09-04 08:13:56 +02:00
63a215b0c3
Remove unused variable chars.
2018-09-03 20:48:03 +02:00
cbf633cfd4
Remove unused variable chars.
2018-09-03 20:47:12 +02:00
e5c0e26601
Merge branch 'MK3' into MK3_dev
2018-08-30 19:05:24 +02:00
12b1769531
Fix printer reset when changing filament during print over USB.
2018-08-30 16:02:13 +02:00
25a22120fb
1-st Layer Calibration correction
...
filament loading improvement
2018-08-30 03:32:33 +02:00
515e78cfd1
Eject filament feature in menu, M600: if it was envoked by FINDA, eject filament
2018-08-29 01:58:28 +02:00
b9808354c4
Merge remote-tracking branch 'upstream/MK3' into M600_change_extruder
2018-08-28 23:53:35 +02:00
705f098b1c
eject filament: initial version
2018-08-28 23:50:31 +02:00
adde0d3944
Merge branch 'prusa3d_MK3' into MK3_dev
2018-08-28 17:31:12 +02:00
d3869bd857
Z-endstop @ MK3
...
add show P.I.N.D.A. state menu item @ CalibrationMenu
2018-08-28 16:12:59 +02:00
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
3e2cb72695
Merge branch 'MK3' into auto_deplete_2
2018-08-28 11:01:30 +02:00
72cd0d26f9
Increase scope of code disabled by macro TMC2130 to whole lcd_settings_linearity_correction_menu.
2018-08-27 21:08:40 +02:00
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
1cdb7a48cb
Show auto deplete only when mmu unit present.
2018-08-27 16:24:21 +02:00
Marek Bel
PavelSindler
PavelSindler
MRprusa3d