josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,087 Commits 31 Branches 140 Tags 71 MiB
Commit Graph

2087 Commits

Author SHA1 Message Date
PavelSindler b45eb05970 xyz cal. messages 2018-09-11 16:31:42 +02:00
Marek Bel 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
Marek Bel 0fcd2cf2a1 Merge branch 'MK3_dev' into fix_mmu_1st_lay_cal 2018-09-11 15:26:35 +02:00
PavelSindler fa6676b734
Merge pull request #1130 from PavelSindler/lang2 
translations
 2018-09-11 14:24:32 +02:00
PavelSindler f7baee1f56 lang_en update 2018-09-11 14:21:15 +02:00
PavelSindler 5c1a3f7fe8 eject filament translations 2018-09-11 13:15:52 +02:00
PavelSindler c7f3b7a174
Merge pull request #1129 from PavelSindler/MK3_for_merging 
missing declaration fix
 2018-09-11 11:07:20 +02:00
PavelSindler d9a2fe70ec missing declaration fix 2018-09-11 11:06:37 +02:00
PavelSindler 5d4bb10d27
Merge pull request #1128 from PavelSindler/MK3_for_merging 
translations
 2018-09-11 10:53:06 +02:00
PavelSindler d6a7c3d061 corrections 2018-09-11 10:51:21 +02:00
PavelSindler b963d4bf79 translation of new messages 2018-09-11 10:47:31 +02:00
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