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
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
001680bbdc
Merge branch 'MK3' into time_remaining_fix
...
# Conflicts:
# Firmware/Marlin_main.cpp
2018-09-07 08:21:36 +02:00
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
2f02828273
time remaining fix
2018-09-07 02:02:35 +02:00
66305b3e04
MK25: always show "normal mode" remaining time
2018-09-06 23:05:36 +02:00
48f5da9cb8
lcd_clicked fix
2018-09-06 20:54:51 +02:00
0e50c388af
Save 1K flash memory.
2018-09-06 15:06:46 +02:00
0d99dc0a3f
PFW-543 Add filament ramming when unloading filament with MMU.
2018-09-06 15:06:33 +02:00
40679dcb3a
Merge branch 'MK3' into MK3
2018-09-05 00:06:48 +02:00
35cf3f3a61
Time info
...
suffix for doubt time estimation (i.e. if feed rate changed)
2018-09-04 14:39:46 +02:00
12b1769531
Fix printer reset when changing filament during print over USB.
2018-08-30 16:02:13 +02:00
ed49e5187b
version changed
2018-08-30 11:35:06 +02:00
d96b0d5f32
linearity correction define added (menu readded)
2018-08-30 11:28:12 +02:00
25a22120fb
1-st Layer Calibration correction
...
filament loading improvement
2018-08-30 03:32:33 +02:00
b2c94f36cc
removed unused "out of range" function
2018-08-29 14:41:39 +02:00
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
b284c70d9b
auto deplete: dont eject filament
2018-08-29 13:08:09 +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
d290543d7d
Merge pull request #1085 from mkbel/fix_active_filament
...
Fix active filament PFW-528
2018-08-28 23:50:57 +02:00
705f098b1c
eject filament: initial version
2018-08-28 23:50:31 +02:00
2cd8691376
Do not use global variable tmp_extruder when setting temperature.
2018-08-28 20:26:33 +02:00
0695f3f345
Z-move correction
...
Z-move inhibition after FactoryReset
2018-08-28 19:58:03 +02:00
8aeb7e04f1
Fix bound check for T0 .. T4 command. Document mmu_load_to_nozzle().
2018-08-28 18:52:16 +02:00
55eaa1de83
Fix code indentation.
2018-08-28 18:26:10 +02:00
9fb68fb724
Remove usage of global variable tmp_extruder in M200.
2018-08-28 18:08:21 +02:00
5ad2fdaaaa
Merge pull request #1080 from PavelSindler/M600_change_extruder
...
removed redundant code
2018-08-28 17:36:50 +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
27bd31e255
removed redundant code
2018-08-28 11:26:35 +02:00
3e2cb72695
Merge branch 'MK3' into auto_deplete_2
2018-08-28 11:01:30 +02:00
755baddb54
Merge branch 'MK3' into fix_unable_to_compile
2018-08-28 10:57:19 +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
dd39976176
Merge remote-tracking branch 'pavel/fix_unable_to_compile' into fix_unable_to_compile
2018-08-27 21:06:35 +02:00
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
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
2a00e5d348
Fix loading filament screen hangs if changed automatically.
2018-08-27 20:09:22 +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
8279aba4d7
Add auto deplete setting.
2018-08-27 16:15:46 +02:00
191e5dfddd
mmu M600: dont use change extruder posibility; unload starts always imidiately
2018-08-27 16:12:10 +02:00
f02b0d80e3
Split settings menu into separate macros.
2018-08-27 15:48:09 +02:00
2b32b41969
MK2.5 build error hotfix
2018-08-27 05:53:39 +02:00
168bc74102
Merge pull request #1075 from PavelSindler/mmu_filament_sensor
...
Mmu filament sensor
2018-08-27 05:26:12 +02:00
b01e2a1a22
Merge pull request #1073 from PavelSindler/M600_mmu_fix
...
M600 mmu fix
2018-08-27 05:26:00 +02:00
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
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
03fffae4c3
finda runout sensor can be turned on/off from menu
2018-08-27 05:20:42 +02:00
ceb49d1262
finda filament runout: initial version
2018-08-27 04:21:43 +02:00
ac3b92bade
commentary fix
2018-08-26 23:55:29 +02:00
d3ed270a5a
single material printer (no mmu unit) M600 hotfix: M600_check_state loop working
2018-08-26 23:52:45 +02:00
b13ff8e424
Wait for ok after U0 (unload current filament) command.
2018-08-26 22:08:52 +02:00
4b1f1bc6a6
mmu timeout update: no need to press knob on printer to recover paused print
2018-08-26 21:39:37 +02:00
5769b758ee
max feedrate for stealth mode reduced to 100mm/s (because of loudness)
2018-08-26 16:50:28 +02:00
2610547a48
Fixed displayed filament after load
2018-08-26 16:39:21 +02:00
c57fdb11b7
show active extruder: numbers corrected
2018-08-26 14:22:52 +02:00
85358342bc
Merge pull request #1065 from PavelSindler/mmu_v2_continue_loading
...
Mmu v2: continue loading command
2018-08-25 20:03:12 +02:00
cf83852d22
Merge pull request #1068 from PavelSindler/M600_fix
...
M600 fix: remove unretract
2018-08-25 20:02:30 +02:00
ddcdfce356
Merge pull request #1069 from PavelSindler/mmu_timeout
...
5 minutes mmu timeout
2018-08-25 20:02:12 +02:00
0929a35a4f
5 minutes mmu timeout
2018-08-25 17:21:17 +02:00
815167c4b6
Merge pull request #1066 from mkbel/fix_linearity_correction_2
...
Fix linearity correction 2
2018-08-25 16:56:40 +02:00
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
f3edd37d11
removing unretract
2018-08-25 16:52:19 +02:00
1f5bece0db
check for required mmu2 firmware buildnr
2018-08-25 16:15:35 +02:00
5fe6a3ed1c
Place similar functions together.
2018-08-24 22:04:48 +02:00
ea88dea432
Fix memory overwrite.
2018-08-24 21:24:14 +02:00
085c77effb
Fix when value edited, other values appeard as +1.000 instead of [off].
2018-08-24 20:38:07 +02:00
df61172984
Fix linearity correction not saved and applied when menu was left by timeout.
2018-08-24 20:31:49 +02:00
32723d8d6f
whitespace
2018-08-24 20:30:44 +02:00
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
0c80eca648
merge with upstream
2018-08-24 18:30:03 +02:00
68f2e22dad
continue loading command
2018-08-24 18:28:05 +02:00
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
5daae818e1
Convert menu_item_edit to template function.
2018-08-24 17:40:40 +02:00
ac5cb0989e
Uncomment linearity correction menu. Fix return from linearity correction menu.
2018-08-24 16:00:51 +02:00
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
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
5dc2af961b
ShippingPrepare & M600
...
message after ShippingPrepare
M600 :: better filament (un)retraction
2018-08-23 00:08:14 +02:00
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
07d07831f1
Add portability note.
2018-08-22 19:40:12 +02:00
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
3477f84143
Merge pull request #1055 from XPila/MK3
...
MMU - communication fix + active extruder status
2018-08-22 16:48:09 +02:00
dfb4bfac5b
MMU - display status while switching active extruder [PFW-465]
2018-08-22 16:38:34 +02:00
a1190e9a22
Merge pull request #1052 from PavelSindler/mmu_v2
...
fixes and improvements for multimaterial
2018-08-22 14:28:33 +00:00
7836742621
MMU communication fix - WD reset inside manage_response
2018-08-22 16:19:57 +02:00
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
a81b8dbd61
remove manage_heater
2018-08-22 16:09:38 +02:00
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
d2aeb40bee
manage response function update
2018-08-22 15:46:36 +02:00
f99196a7a0
fix reseting during filament change
2018-08-22 11:09:12 +02:00
315bfc43dd
MMU communication fix
2018-08-21 16:41:01 +02:00
94423e6f7e
MMU communication - mmu_ready
2018-08-20 20:53:53 +02:00
1cd0c6cfea
Status screen - print active MMU exrtuder (1/2 PFW465)
2018-08-20 00:59:36 +02:00
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
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
f1ad1d22ba
Menu lcd_adjust_bed fixed (Bed level correction, PFW-499)
2018-08-19 13:59:33 +02:00
a11ae18f7e
XYZ calibration fix (progmem constants declaration) + version changed
2018-08-13 14:55:31 +02:00
b7f17292ca
Version changed
2018-08-10 20:08:10 +02:00
8409a26594
Live adjust Z - display zero in case of invalid calibration status (same logic in babystep_load and _lcd_babystep)
2018-08-10 19:55:50 +02:00
b16fec956c
Enabled pullup for RX2 pin (it prevents uart2 from rx buffer overflow in case of disconnected MMU)
2018-08-10 16:20:53 +02:00
Marek Bel
mkbel
PavelSindler
PavelSindler
MRprusa3d
Robert Pelnar
MRprusa3d