3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,176 Commits 3 Branches 78 Tags 40 MiB
3d97d81734
Commit Graph

2176 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PavelSindler
c023fb12d5 add choose filament messages 2018-09-11 09:50:50 +02:00
PavelSindler
90e3ae5464
Merge pull request #1127 from XPila/MK3 
Lang update, french translation
 2018-09-11 09:44:02 +02:00
PavelSindler
dad8017ae6
Merge pull request #1125 from PavelSindler/messages_corrections 
MM messages corrections; no debug messages when printer communicates with MMU2
 2018-09-11 09:43:52 +02:00
Robert Pelnar
4ca300bc39 Lang update, french translation 
+resized reserved space
 2018-09-11 03:43:05 +02:00
PavelSindler
edca3e7e45
Merge pull request #1126 from mkbel/MK3_dev 
Merge branch MK3 into MK3_dev
 2018-09-11 01:05:11 +02:00
Marek Bel
b3bc71b45b Merge remote-tracking branch 'prusa3d/MK3' into MK3_dev 2018-09-10 23:52:51 +02:00
PavelSindler
25a46557d1 merge with upstream 2018-09-10 22:11:32 +02:00
PavelSindler
8a9f066c1b choose_extruder_menu: extruder -> filament 2018-09-10 22:09:37 +02:00
MRprusa3d
6804f54094
Merge pull request #1124 from PavelSindler/fix_wizard 
wizard hotfix
 2018-09-10 20:02:36 +00: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
1bb9e9ed92 MMU_DEBUG 2018-09-10 20:39:28 +02:00
PavelSindler
6fa798aa83 init 2018-09-10 20:08:13 +02:00
PavelSindler
1253fb338a wizard hotfix 2018-09-10 18:02:54 +02:00
PavelSindler
e837739c3d
Merge pull request #1123 from mkbel/MK3_dev 
Merge branch 'MK3' into MK3_dev
 2018-09-10 14:52:46 +02:00
Marek Bel
764e5c9769 Merge branch 'MK3' into MK3_dev 2018-09-09 22:52:01 +02:00
PavelSindler
bad112c8e1
Merge pull request #1116 from mkbel/pick_mmu_1stLay_unload 
Do not unload filament from nozzle when touching bed in the end of fi…
 2018-09-07 11:34:21 +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
mkbel
ec64f4865d
Merge pull request #1115 from mkbel/MK3_dev 
Merge MK3 into Mk3_dev
 2018-09-07 09:26:28 +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
mkbel
00225bafdc
Merge pull request #1113 from PavelSindler/time_remaining_fix 
time remaining fix (PFW-554)
 2018-09-07 09:03:56 +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
mkbel
3f55c815a8
Merge pull request #1114 from mkbel/MK3_dev 
Merge MK3 into Mk3 dev
 2018-09-07 08:01:28 +02:00
Marek Bel
fa17ef647b Merge branch 'MK3' into MK3_dev 2018-09-07 07:59:54 +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
e2d92a8c4e
Merge pull request #1109 from mkbel/pick_ramming 
Add filament ramming when unloading filament with MMU.
 2018-09-06 21:01:54 +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
dbdb8ad650
Merge pull request #1098 from mkbel/add_ramming 
Add ramming
 2018-09-05 16:50:17 +02:00
PavelSindler
74113ecf67
Merge pull request #1093 from mkbel/MK3_dev 
Mk3 dev
 2018-09-05 16:47:53 +02:00
PavelSindler
1543a1b45a
Merge pull request #1057 from MRprusa3d/MK3 
ShippingPrepare & M600
 2018-09-05 00:06:58 +02:00
PavelSindler
40679dcb3a
Merge branch 'MK3' into MK3 2018-09-05 00:06:48 +02:00
PavelSindler
ae823c3c43
Merge pull request #1102 from MRprusa3d/PFW-525 
Time info
 2018-09-04 15:20:14 +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