3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1918 commits 3 branches 78 tags 40 MiB
Commit graph

1479 commits

Author SHA1 Message Date
Marek Bel
0fcd2cf2a1 Merge branch 'MK3_dev' into fix_mmu_1st_lay_cal 2018-09-11 15:26:35 +02:00
Marek Bel
b3bc71b45b Merge remote-tracking branch 'prusa3d/MK3' into MK3_dev 2018-09-10 23:52:51 +02:00
Marek Bel
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
PavelSindler
1253fb338a wizard hotfix 2018-09-10 18:02:54 +02:00
Marek Bel
764e5c9769 Merge branch 'MK3' into MK3_dev 2018-09-09 22:52:01 +02:00
Marek Bel
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
Marek Bel
ebfbf4ac3f Merge branch 'MK3' into MK3_dev 2018-09-07 09:24:45 +02:00
mkbel
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
Marek Bel
001680bbdc Merge branch 'MK3' into time_remaining_fix 
# Conflicts:
#	Firmware/Marlin_main.cpp
 2018-09-07 08:21:36 +02:00
mkbel
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
PavelSindler
2f02828273 time remaining fix 2018-09-07 02:02:35 +02:00
PavelSindler
66305b3e04 MK25: always show "normal mode" remaining time 2018-09-06 23:05:36 +02:00
PavelSindler
48bf5d3a75
Merge pull request #1104 from mkbel/MK3_dev 
Merge MK3 into Mk3_dev
 2018-09-06 21:01:29 +02:00
PavelSindler
dbc0654b1c
Merge pull request #1108 from mkbel/pause_print 
Pause print
 2018-09-06 21:01:16 +02:00
PavelSindler
48f5da9cb8 lcd_clicked fix 2018-09-06 20:54:51 +02:00
Marek Bel
0e50c388af Save 1K flash memory. 2018-09-06 15:06:46 +02:00
Marek Bel
0d99dc0a3f PFW-543 Add filament ramming when unloading filament with MMU. 2018-09-06 15:06:33 +02:00
Marek Bel
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
Marek Bel
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
Marek Bel
05a0b9c939 Remove fanSpeedBckp global variable. 2018-09-06 11:41:44 +02:00
Marek Bel
40990c4deb Remove saved_feedmultiply global variable. 2018-09-06 11:30:06 +02:00
Marek Bel
b43c8dad74 Remove HotendTempBckp global variable. 2018-09-06 10:05:59 +02:00
Marek Bel
d71311f13f Remove redundant HotendTempBckp from crash detection recover. 2018-09-06 09:41:37 +02:00
Marek Bel
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
Marek Bel
67b2456ad9 Merge branch 'MK3' into MK3_dev 2018-09-05 21:48:29 +02:00
Marek Bel
74be7677cf Fix problem, that current_position is rewritten after long_pause() call. 2018-09-05 21:10:05 +02:00
Marek Bel
4b47a74d1d Remove unused declarations from tmc2130.cpp. Move used declaration to Marlin.h. 2018-09-05 18:14:32 +02:00
PavelSindler
ed43913c5c
Merge pull request #1099 from mkbel/fix_compiler_warnings 
Fix compiler warnings
 2018-09-05 16:53:51 +02:00
PavelSindler
40679dcb3a
Merge branch 'MK3' into MK3 2018-09-05 00:06:48 +02:00
Marek Bel
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
MRprusa3d
35cf3f3a61 Time info 
suffix for doubt time estimation (i.e. if feed rate changed)
 2018-09-04 14:39:46 +02:00
Marek Bel
2abd2a6cab Resume print fan. 
Known limitations: Unused code not removed. Unload filament moves extruder to print position.
 2018-09-04 11:13:51 +02:00
Marek Bel
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
Marek Bel
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
Marek Bel
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
Marek Bel
63a215b0c3 Remove unused variable chars. 2018-09-03 20:48:03 +02:00
Marek Bel
cbf633cfd4 Remove unused variable chars. 2018-09-03 20:47:12 +02:00
Marek Bel
c95b463e0b Remove unused variable yes. Remove redundant tmp_extruder assignment. 2018-09-03 20:44:40 +02:00
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
Marek Bel
12b1769531 Fix printer reset when changing filament during print over USB. 2018-08-30 16:02:13 +02:00
PavelSindler
ed49e5187b version changed 2018-08-30 11:35:06 +02:00
PavelSindler
d96b0d5f32 linearity correction define added (menu readded) 2018-08-30 11:28:12 +02:00
MRprusa3d
25a22120fb 1-st Layer Calibration correction 
filament loading improvement
 2018-08-30 03:32:33 +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
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