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

1594 Commits

Author SHA1 Message Date
Marek Bel
ada7cffd32 Open menu to select filament before first layer calibration if MMU unit is present. 2018-09-11 19:53:29 +02:00
PavelSindler
96aada9061 load filament messages, czech language missing translation readded 2018-09-11 18:25:38 +02:00
Marek Bel
5649d6c3c0 Precede active filament on status screen with letter F. 2018-09-11 17:27:10 +02:00
Marek Bel
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
Marek Bel
46df46f482 Add possibility to use other filaments in LCD_COMMAND_V2_CAL. 2018-09-11 17:03:20 +02:00
Marek Bel
19a1ccdc76 Rename choose_extruder_menu() to choose_menu_P(), add parameters to make it reusable. 2018-09-11 16:51:00 +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
d9a2fe70ec missing declaration fix 2018-09-11 11:06:37 +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
Robert Pelnar
4ca300bc39 Lang update, french translation 
+resized reserved space
 2018-09-11 03:43:05 +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
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
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
PavelSindler
d290543d7d
Merge pull request #1085 from mkbel/fix_active_filament 
Fix active filament PFW-528
 2018-08-28 23:50:57 +02:00
PavelSindler
705f098b1c eject filament: initial version 2018-08-28 23:50:31 +02:00
Marek Bel
2cd8691376 Do not use global variable tmp_extruder when setting temperature. 2018-08-28 20:26:33 +02:00
MRprusa3d
0695f3f345 Z-move correction 
Z-move inhibition after FactoryReset
 2018-08-28 19:58:03 +02:00
Marek Bel
8aeb7e04f1 Fix bound check for T0 .. T4 command. Document mmu_load_to_nozzle(). 2018-08-28 18:52:16 +02:00
Marek Bel
55eaa1de83 Fix code indentation. 2018-08-28 18:26:10 +02:00
Marek Bel
9fb68fb724 Remove usage of global variable tmp_extruder in M200. 2018-08-28 18:08:21 +02:00
mkbel
5ad2fdaaaa
Merge pull request #1080 from PavelSindler/M600_change_extruder 
removed redundant code
 2018-08-28 17:36:50 +02:00
Marek Bel
adde0d3944 Merge branch 'prusa3d_MK3' into MK3_dev 2018-08-28 17:31:12 +02:00
MRprusa3d
d3869bd857 Z-endstop @ MK3 
add show P.I.N.D.A. state menu item @ CalibrationMenu
 2018-08-28 16:12:59 +02:00
Marek Bel
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
PavelSindler
27bd31e255 removed redundant code 2018-08-28 11:26:35 +02:00
PavelSindler
3e2cb72695
Merge branch 'MK3' into auto_deplete_2 2018-08-28 11:01:30 +02:00
PavelSindler
755baddb54
Merge branch 'MK3' into fix_unable_to_compile 2018-08-28 10:57:19 +02:00
Marek Bel
72cd0d26f9 Increase scope of code disabled by macro TMC2130 to whole lcd_settings_linearity_correction_menu. 2018-08-27 21:08:40 +02:00
Marek Bel
dd39976176 Merge remote-tracking branch 'pavel/fix_unable_to_compile' into fix_unable_to_compile 2018-08-27 21:06:35 +02:00
Marek Bel
7aadb2f660 Fix compile time error: default argument given for parameter 2 of int8_t lcd_show_fullscreen_message_yes_no_and_wait_P 2018-08-27 20:57:57 +02:00
Marek Bel
9611401b69 Fix mmu_M600_load_filament increments tmp_extruder, which is not set in case of automatic == true. 2018-08-27 20:23:43 +02:00
Marek Bel
2a00e5d348 Fix loading filament screen hangs if changed automatically. 2018-08-27 20:09:22 +02:00
Marek Bel
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
Marek Bel
1cdb7a48cb Show auto deplete only when mmu unit present. 2018-08-27 16:24:21 +02:00
Marek Bel
8279aba4d7 Add auto deplete setting. 2018-08-27 16:15:46 +02:00
PavelSindler
191e5dfddd mmu M600: dont use change extruder posibility; unload starts always imidiately 2018-08-27 16:12:10 +02:00
Marek Bel
f02b0d80e3 Split settings menu into separate macros. 2018-08-27 15:48:09 +02:00
PavelSindler
2b32b41969 MK2.5 build error hotfix 2018-08-27 05:53:39 +02:00
PavelSindler
168bc74102
Merge pull request #1075 from PavelSindler/mmu_filament_sensor 
Mmu filament sensor
 2018-08-27 05:26:12 +02:00
PavelSindler
b01e2a1a22
Merge pull request #1073 from PavelSindler/M600_mmu_fix 
M600 mmu fix
 2018-08-27 05:26:00 +02:00
PavelSindler
5d3eff6aea
Merge pull request #1072 from PavelSindler/manage_response 
mmu timeout update: no need to press knob on printer
 2018-08-27 05:25:50 +02:00
PavelSindler
c1ce07c463
Merge pull request #1071 from PavelSindler/feedrate_limit 
max feedrate for stealth mode reduced to 100mm/s (because of loudness)
 2018-08-27 05:25:41 +02:00
PavelSindler
03fffae4c3 finda runout sensor can be turned on/off from menu 2018-08-27 05:20:42 +02:00
PavelSindler
ceb49d1262 finda filament runout: initial version 2018-08-27 04:21:43 +02:00
PavelSindler
ac3b92bade commentary fix 2018-08-26 23:55:29 +02:00
PavelSindler
d3ed270a5a single material printer (no mmu unit) M600 hotfix: M600_check_state loop working 2018-08-26 23:52:45 +02:00
PavelSindler
b13ff8e424 Wait for ok after U0 (unload current filament) command. 2018-08-26 22:08:52 +02:00
PavelSindler
4b1f1bc6a6 mmu timeout update: no need to press knob on printer to recover paused print 2018-08-26 21:39:37 +02:00
PavelSindler
5769b758ee max feedrate for stealth mode reduced to 100mm/s (because of loudness) 2018-08-26 16:50:28 +02:00
PavelSindler
2610547a48 Fixed displayed filament after load 2018-08-26 16:39:21 +02:00
PavelSindler
c57fdb11b7 show active extruder: numbers corrected 2018-08-26 14:22:52 +02:00
PavelSindler
85358342bc
Merge pull request #1065 from PavelSindler/mmu_v2_continue_loading 
Mmu v2: continue loading command
 2018-08-25 20:03:12 +02:00
PavelSindler
cf83852d22
Merge pull request #1068 from PavelSindler/M600_fix 
M600 fix: remove unretract
 2018-08-25 20:02:30 +02:00
PavelSindler
ddcdfce356
Merge pull request #1069 from PavelSindler/mmu_timeout 
5 minutes mmu timeout
 2018-08-25 20:02:12 +02:00
PavelSindler
0929a35a4f 5 minutes mmu timeout 2018-08-25 17:21:17 +02:00
PavelSindler
815167c4b6
Merge pull request #1066 from mkbel/fix_linearity_correction_2 
Fix linearity correction 2
 2018-08-25 16:56:40 +02:00
PavelSindler
255cd2f34e
Merge pull request #1056 from mkbel/prdel 
Reserve space for MENU_ITEM_EDIT_int3_P in shared memory
 2018-08-25 16:55:56 +02:00
PavelSindler
f3edd37d11 removing unretract 2018-08-25 16:52:19 +02:00
PavelSindler
1f5bece0db check for required mmu2 firmware buildnr 2018-08-25 16:15:35 +02:00
Marek Bel
6b7e47d730 Merge branch 'MK3' into MK3_dev 2018-08-24 22:21:08 +02:00
Marek Bel
5fe6a3ed1c Place similar functions together. 2018-08-24 22:04:48 +02:00
Marek Bel
ea88dea432 Fix memory overwrite. 2018-08-24 21:24:14 +02:00
Marek Bel
085c77effb Fix when value edited, other values appeard as +1.000 instead of [off]. 2018-08-24 20:38:07 +02:00
Marek Bel
df61172984 Fix linearity correction not saved and applied when menu was left by timeout. 2018-08-24 20:31:49 +02:00
PavelSindler
32723d8d6f whitespace 2018-08-24 20:30:44 +02:00
Marek Bel
46a3baac57 Add menu_item_edit_P<uint8_t*> specialization to be used for linearity correction. Works well, but costs about 600..700B of FLASH, needs to be optimized. 2018-08-24 20:06:09 +02:00
PavelSindler
0c80eca648 merge with upstream 2018-08-24 18:30:03 +02:00
PavelSindler
68f2e22dad continue loading command 2018-08-24 18:28:05 +02:00
Marek Bel
5a7c9e3ffd Make local functions static. Saves 30B of flash with Arduino 1.6.9. No difference with Arduino 1.8.5. 2018-08-24 18:00:05 +02:00
Marek Bel
5daae818e1 Convert menu_item_edit to template function. 2018-08-24 17:40:40 +02:00
PavelSindler
e6ac75f6a1
Merge pull request #1061 from mkbel/MK3_dev 
Merge branch 'MK3' into MK3_dev
 2018-08-24 16:27:07 +02:00
Marek Bel
ac5cb0989e Uncomment linearity correction menu. Fix return from linearity correction menu. 2018-08-24 16:00:51 +02:00
Marek Bel
050a7c41d0 Fix "Check MMU. Fix the issue and then press button on MMU unit." shown instead of "Loading filament 1". 2018-08-24 03:49:51 +02:00
Marek Bel
0de7668bac Remove usage of global variable tmp_extruder in M200. 2018-08-23 23:34:50 +02:00
Marek Bel
3c9047c9cd Remove usage of global variable tmp_extruder in mmu_M600_load_filament. For automatic load filament, use mmu_extruder value as filament previously selected. 2018-08-23 23:34:45 +02:00
Marek Bel
54138407dd Encapsulate MMU internal state. 2018-08-23 23:34:38 +02:00
Marek Bel
f1c51502fd Merge branch 'MK3' into MK3_dev 2018-08-23 23:28:20 +02:00
Marek Bel
142bf28dc2 Clear communication buffer when sending load filament command to MMU. 
This fixes PFW-517 in the moment, when the problem with not displaying "Loading filament 1" to "Loading filament 5" has appeared for the first time.
 2018-08-23 22:05:56 +02:00
MRprusa3d
5dc2af961b ShippingPrepare & M600 
message after ShippingPrepare
M600 :: better filament (un)retraction
 2018-08-23 00:08:14 +02:00
Marek Bel
3780516f74 PFW-512 Reserve space for MENU_ITEM_EDIT_int3_P in shared memory in lcd_tune_menu(). 2018-08-22 19:47:29 +02:00
Marek Bel
07d07831f1 Add portability note. 2018-08-22 19:40:12 +02:00
Marek Bel
bb5ac93921 Add missing compile time check for ShortTimer fitting into menu_data. Convert preprocessor checks to shorter and more accurate static_assert. Remove redundant macro MENU_DATA_EDIT_SIZE. Decrease scope of menu_stack and asociated macro. No functional change. 2018-08-22 18:55:42 +02:00
PavelSindler
3477f84143
Merge pull request #1055 from XPila/MK3 
MMU - communication fix + active extruder status
 2018-08-22 16:48:09 +02:00
Robert Pelnar
dfb4bfac5b MMU - display status while switching active extruder [PFW-465] 2018-08-22 16:38:34 +02:00
MRprusa3d
a1190e9a22
Merge pull request #1052 from PavelSindler/mmu_v2 
fixes and improvements for multimaterial
 2018-08-22 14:28:33 +00:00
Robert Pelnar
7836742621 MMU communication fix - WD reset inside manage_response 2018-08-22 16:19:57 +02:00
PavelSindler
9210ab12a9
Merge pull request #1053 from mkbel/MK3 
Hot fix PFW-505 Speed change after tuning (on USB).
 2018-08-22 16:19:08 +02:00
Marek Bel
fe43791673 Merge branch 'MK3' into MK3_dev 2018-08-22 16:17:10 +02:00
PavelSindler
a81b8dbd61 remove manage_heater 2018-08-22 16:09:38 +02:00
Marek Bel
ef6188cd59 Hot fix PFW-505 Speed change after tuning (on USB). 
When encoder is rotated left and pushed immediately on status screen, after returning to status screen print speed jumps to 345%.
This is caused by downcasting signed lcd_encoder to unsigned position and back to signed lcd_encoder.
 2018-08-22 16:09:19 +02:00
PavelSindler
d2aeb40bee manage response function update 2018-08-22 15:46:36 +02:00
PavelSindler
f99196a7a0 fix reseting during filament change 2018-08-22 11:09:12 +02:00
Marek Bel
3b3d6ab472 Merge branch 'MK3' into MK3_dev 2018-08-21 17:56:34 +02:00
Robert Pelnar
315bfc43dd MMU communication fix 2018-08-21 16:41:01 +02:00
Robert Pelnar
94423e6f7e MMU communication - mmu_ready 2018-08-20 20:53:53 +02:00
Robert Pelnar
1cd0c6cfea Status screen - print active MMU exrtuder (1/2 PFW465) 2018-08-20 00:59:36 +02:00
Robert Pelnar
c4281b0b36 Status screen redesign - fix of flickering and text wraping on status screen 
printf formating, saved flash, reduced code size
 2018-08-20 00:27:45 +02:00
Robert Pelnar
fd9516f520 Status screen - status message logic simplification 
added definitions of custom_message_type values
removed flag custom_message (previous solution maybe caused displaying of empty status line)
fixed in Marlin_main.cpp code "custom_message = _T(MSG_TEMP_CALIBRATION)"
 2018-08-19 18:34:57 +02:00