f161d3ade4
Change formatting.
2019-03-04 22:17:43 +01:00
b2255c8be9
Preheat nozzle before loading filament in M600 (change filament) gcode.
...
This fixes problem of not heating the nozzle when retrying load after MMU load failed.
2019-03-04 22:00:24 +01:00
7e48d633cb
mode switching
...
info-message viewing during mode switching
2019-03-04 21:30:36 +01:00
17f095b957
shorter Z movements (makes calibration faster)
2019-03-04 20:32:56 +01:00
27f69bb761
Merge pull request #1570 from PavelSindler/mmu_stealth_mode
...
mmu stealth mode
2019-03-04 17:09:11 +01:00
7f92d73a40
MMU_STEALTH_MODE -> MMU_FORCE_STEALTH_MODE; activate_stealth_mode() function update
2019-03-04 17:04:22 +01:00
9dde8c4732
Merge pull request #1591 from MRprusa3d/PFW-795c
...
better autoLoad
2019-03-04 15:31:04 +01:00
1051b7c39f
Merge pull request #1583 from mkbel/fix_cut
...
Fix unable to cut filament, if nozzle is already preheated.
2019-03-04 15:29:54 +01:00
e832f0f2ee
Merge pull request #1582 from mkbel/remove_unused_code
...
Remove commented out code, fix formatting.
2019-03-04 15:29:36 +01:00
8812d40546
Revert "Fix compiler warning: variable 'kill_message' set but not used"
...
This reverts commit a964f996fa
2019-03-04 15:05:14 +01:00
b02ca18c93
better autoLoad
...
autoLoad inhibit if Support::ExtruderInfo-menu is selected
2019-03-04 12:52:35 +01:00
9e38b1e101
Add missing message "Preheating to cut".
2019-03-01 18:17:08 +01:00
6437d44991
Fix unable to cut filament, if nozzle is already preheated.
2019-03-01 18:10:06 +01:00
83e07b5cdf
Fix compiler warnings:
...
sketch/ultralcd.cpp: In function 'void mFilamentPrompt()':
sketch/ultralcd.cpp:2335:7: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch]
switch(eFilamentAction)
^
sketch/ultralcd.cpp:2335:7: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch]
switch(eFilamentAction)
^
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuLoad' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuUnLoad' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuEject' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch]
sketch/ultralcd.cpp: In function 'void mFilamentItem(uint16_t, uint16_t)':
sketch/ultralcd.cpp:2513:12: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch]
switch(eFilamentAction)
^
sketch/ultralcd.cpp:2513:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2562:12: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch]
switch(eFilamentAction)
^
sketch/ultralcd.cpp:2562:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch]
2019-03-01 18:07:19 +01:00
824d11e4b0
Remove "Press the knob to eject filament" message, as it is never shown.
2019-03-01 17:43:28 +01:00
57cf7ee171
Fix compiler warning: 'lcd_selftest_fsensor' defined but not used
2019-03-01 17:21:13 +01:00
4c2d4fcf77
Fix compiler warning ultralcd.cpp:4038:10: warning: unused variable 'chars
2019-03-01 17:18:05 +01:00
a964f996fa
Fix compiler warning: variable 'kill_message' set but not used
...
kill_message is unused since:
Author: MRprusa3d <martin.remis@prusa3d.cz>
Date: 4 months ago (11/2/2018 11:03:14 PM)
Commit hash: 73794b56cf
2019-03-01 17:08:36 +01:00
8e51b37d91
Suppress warning: unused parameter.
2019-03-01 16:57:20 +01:00
22500970ba
Remove commented out code, fix formatting.
2019-03-01 16:18:16 +01:00
85c208f9f4
Merge branch 'MK3' into bad_load_cut
2019-03-01 14:55:55 +01:00
22c0d6e230
Merge pull request #1577 from mkbel/add_cut
...
Add MMU cut filament
2019-03-01 14:53:12 +01:00
e14e4be94e
Merge pull request #1575 from mkbel/add_ramming_eject
...
Add filament ramming to eject filament.
2019-03-01 14:21:23 +01:00
0db721b244
Merge pull request #1559 from mkbel/detect_bad_load
...
Move extruder forth and back after filament detected by sensor to det…
2019-03-01 14:21:04 +01:00
3cbcbba738
Merge pull request #1510 from mkbel/fix_menu_stack_third_time
...
Fix menu stack overrun.
2019-03-01 14:20:22 +01:00
250a448d05
Merge pull request #1549 from mionut/7MBL
...
7x7 mesh bed leveling with power failure save + pinda temperature filter
2019-03-01 14:19:52 +01:00
488497df2c
version change
2019-03-01 13:56:03 +01:00
ca88010018
Revert "version change"
...
This reverts commit f14733f2dd
2019-03-01 13:54:25 +01:00
f14733f2dd
version change
2019-03-01 13:53:18 +01:00
e27fdafcec
menu switch - initial
2019-02-28 19:42:09 +01:00
482f8ef01a
Merge remote-tracking branch 'mionut/7MBL' into 7x7
2019-02-28 15:54:49 +01:00
2a005caf42
Add cutter enable to tune menu.
2019-02-27 17:47:51 +01:00
02a692c5d9
Store cutter enable state in EEPROM.
2019-02-27 17:34:03 +01:00
ff6eb0b1af
Merge pull request #1568 from MRprusa3d/PFW-795
...
preHeat @ filament management
2019-02-27 13:15:39 +01:00
4a4eb9962c
Cut filament when cutter is enabled and MMU load fails.
2019-02-27 10:42:26 +01:00
2f1e968563
"lcd_update_enable()" replacement
2019-02-26 23:17:52 +01:00
49b1d1cb93
Move prototype to header file.
2019-02-26 18:50:15 +01:00
a67645fda6
Merge branch 'add_cut' into bad_load_cut
2019-02-26 18:35:55 +01:00
815231bc26
Add MMU cut filament menu.
2019-02-26 17:58:00 +01:00
ff35119ef3
preHeat @ filament management
...
another funcionality III / autoLoad
2019-02-26 17:33:37 +01:00
5a5a482a59
Rename preprocessor macro K1 to PID_K1 to avoid future conflict with MMU command.
2019-02-26 13:59:44 +01:00
6c9dd4f272
Add filament ramming to eject filament.
2019-02-26 13:41:28 +01:00
7a1b47c340
Convert functions mmu_eject_fil_0 to mmu_eject_fil_4 to template function.
2019-02-26 11:11:05 +01:00
34e2495487
Convert mmu_load_to_nozzle_0 to mmu_load_to_nozzle_4 to template.
2019-02-26 10:32:10 +01:00
d5c5ed55eb
Change formatting.
2019-02-25 11:12:39 +01:00
8f5fbe569c
Merge branch 'MK3' into detect_bad_load
2019-02-25 10:41:26 +01:00
8e3d52ee6d
fix compilation error for MK2.5, make code more readable
2019-02-22 17:15:40 +01:00
26cab2911f
mmu stealth mode
2019-02-22 16:30:54 +01:00
51827c578f
MESH_MEAS_NUM_X_POINTS constant correction to MESH_MEAS_NUM_Y_POINTS
2019-02-22 15:05:06 +02:00
62875f2e95
MESH_MEAS_NUM_X_POINTS constant correction to MESH_MEAS_NUM_Y_POINTS
2019-02-22 14:35:48 +02:00
c0a8d87e9e
Merge remote-tracking branch 'my_remote/PFW-795' into PFW-795
2019-02-22 03:16:23 +01:00
be0ed46335
preHeat @ filament management
...
another funcionality III
2019-02-22 03:09:50 +01:00
730e370e78
Merge pull request #1565 from PavelSindler/MK3_for_merging
...
version change
2019-02-21 19:17:03 +01:00
da28773480
version change
2019-02-21 19:16:24 +01:00
e422cc1c26
Merge branch 'MK3' into PFW-795
2019-02-21 15:43:56 +01:00
ed93f1b7f0
preHeat @ filament management
...
another funcionality IIb
2019-02-21 15:27:22 +01:00
16bb6c80c7
Merge pull request #1562 from PavelSindler/mmu_stop_print_fix
...
comments
2019-02-21 14:29:04 +01:00
6ad5c07e6d
comments
2019-02-21 14:28:05 +01:00
323071f50a
preHeat @ filament management
...
another funcionality II
2019-02-21 13:20:29 +01:00
a54c68b874
preHeat @ filament management
...
another funcionality II
2019-02-21 04:45:44 +01:00
8b858286ac
Document.
2019-02-21 02:30:01 +01:00
326c8492b5
Move extruder forth and back after filament detected by sensor to detect bad load.
2019-02-21 01:19:26 +01:00
1e729048dc
cmdqueue_reset fix
2019-02-21 00:14:49 +01:00
da0867cfc5
preHeat @ filament management
...
another funcionality
2019-02-20 03:01:33 +01:00
afc86a1363
missing ;
2019-02-18 05:50:29 +02:00
11d19879fc
Merge pull request #1533 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload / autoLoad / MMU
2019-02-15 17:45:38 +01:00
9d76b6912c
merge new changes from upstream
2019-02-15 17:05:39 +01:00
2b6668b853
merge MK3S branch into MK3
2019-02-15 16:42:40 +01:00
fec64a9d5e
Merge pull request #1525 from mkbel/improve_mmu_load_failed_2
...
Improve mmu load failed 2
2019-02-15 15:52:35 +01:00
69ff37729e
whitespace
2019-02-15 14:19:30 +01:00
0f791ce47f
mmu needs attention: idler error fix
2019-02-15 14:17:47 +01:00
0c1f9b5100
preHeat @ filament management
...
target temperature keeping
2019-02-15 02:25:44 +01:00
4835b9b220
7x7 points mesh bed leveling
2019-02-14 10:57:58 +02:00
80c3420a12
Merge branch 'MK3' into PFW-210
2019-02-14 00:05:50 +01:00
ef1f82627e
preHeat @ filament load / unload / autoLoad / MMU
...
MMU options added
2019-02-13 23:53:00 +01:00
a5437cb15b
Resend MMU T commands only.
...
This solves problem with unload repeated if unload takes too long, second ok reply then triggers Wait end and resumes print.
2019-02-13 22:29:29 +01:00
a4032e437e
Add MMU wait command after MMU load failed. Resume print when MMU wait command returns OK.
2019-02-13 21:28:21 +01:00
daaec0ef04
Convert MmuCmd to enum class.
2019-02-13 17:12:35 +01:00
8e23e7f322
Save some flash by using smaller type for filament.
2019-02-13 16:37:54 +01:00
9e873ac0f7
Use enum for mmu_cmd instead of plain integer type.
2019-02-13 01:51:39 +01:00
bb7eeef1f4
Define debug printf and puts functions to make code more readable.
2019-02-12 23:24:23 +01:00
e1216934ef
Save flash by defining underlying type and omitting number value.
2019-02-12 21:53:11 +01:00
3379fb4866
Convert mmu_state to enum.
2019-02-12 21:43:26 +01:00
4c76393231
version change
2019-02-12 13:44:50 +01:00
62500f0b55
version changed
2019-02-12 10:39:09 +01:00
6c8d9c6fb4
Retry filament load on MMU load failure once.
2019-02-11 23:43:42 +01:00
d33b24c281
Unload filament after MMU load failed so MMU unit can be controlled by its buttons.
2019-02-11 23:24:55 +01:00
b85661309f
configuration change
2019-02-11 16:38:36 +01:00
ccc542d74a
MK2.5 IR_SENSOR_PIN modified
2019-02-11 14:32:21 +01:00
cd692f6be6
version change
2019-02-07 19:43:08 +01:00
065d56b2c6
version change
2019-02-06 23:58:30 +01:00
38b0e5439b
version change
2019-02-06 23:52:24 +01:00
b17a961241
MK2.5S
...
pin definition for filament sensor connection
2019-02-06 23:31:48 +01:00
e028db7bf9
version change
2019-02-06 23:30:01 +01:00
ff52499bdc
extr fan RPM measuring fix
2019-02-06 23:05:13 +01:00
e432e258dc
extr fan RPM measuring fix
2019-02-06 22:56:10 +01:00
22217a42f7
message change
2019-02-06 21:37:39 +01:00
a85d8e7f97
message change
2019-02-06 21:36:21 +01:00
d19c92bca8
welcome message changed
2019-02-06 19:41:17 +01:00
de9c87c592
welcome message changed
2019-02-06 19:38:52 +01:00
c704a4b7ab
Fix menu stack overrun.
2019-02-06 18:25:45 +01:00
726d5aa3c3
typo fixed
2019-02-06 16:29:10 +01:00
63c8a36185
typo fixed
2019-02-06 16:27:44 +01:00
a220c97f94
Revert "variant files"
...
This reverts commit 850d3316b6
2019-02-06 16:19:30 +01:00
2fe8e0670a
MK2 build fail fixed
2019-02-06 16:15:19 +01:00
850d3316b6
variant files
2019-02-06 15:18:12 +01:00
ef86c78f25
menu item text changed
2019-02-06 14:24:47 +01:00
1ba046395e
fan measurements fix: keep fanSpeedSoftPwm = 255 during measurements, selftest changes
2019-02-06 12:37:18 +01:00
27d002a46f
Merge remote-tracking branch 'robert/MK3-variants' into variants
2019-02-06 09:20:21 +01:00
860e6f9994
Merge remote-tracking branch 'upstream/MK3' into variants
2019-02-06 09:19:38 +01:00
fcb7dd90cf
Merge pull request #1505 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload / autoLoad
2019-02-06 09:14:03 +01:00
a53d150903
preHeat @ filament load / unload / autoLoad
...
autoLoad option added
2019-02-06 01:58:05 +01:00
93d4128163
Fixed timer2 colission with arduino framework around "tone" function.
2019-02-05 19:08:57 +01:00
62e253edd0
fanSpeed -> fanSpeedSoftPwm (fixes fan speed menu)
2019-02-05 18:21:44 +01:00
903028e574
fix fan speed measuring for PWM = 255
2019-02-05 17:46:31 +01:00
91b12ff64b
bed level correction menu fix (menu_item_edit for negative integers)
2019-02-05 16:49:29 +01:00
f9298b37b8
fan check hotfix (selftest, measuring RPM, fan errors)
2019-02-05 04:02:38 +01:00
ea20529945
merge changes from upstream
2019-02-04 15:23:39 +01:00
5a2df47077
minTemp
...
better stability for delay-cutting
2019-02-04 14:54:25 +01:00
9a51a7be29
Merge branch 'bed_correction_fix' into variants
2019-02-04 12:47:06 +01:00
0853ef5d06
Merge remote-tracking branch 'upstream/MK3' into variants
2019-02-04 12:45:28 +01:00
b4f2dc3b5e
Merge remote-tracking branch 'robert/MK3-variants' into variants
2019-02-04 12:41:08 +01:00
6d5a2ae816
Merge pull request #1499 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload
2019-02-04 12:37:42 +01:00
d2a4cb4c49
Use _delay_ms instead of delay (fix - fast scrolling in sd card menu - temporary solution)
2019-02-04 12:20:07 +01:00
fff8fc8a48
preHeat @ filament load / unload
...
filament-list correction (PET missing)
2019-02-04 12:12:35 +01:00
2f9ab7b185
Merge branch 'dev' into variants
2019-02-04 01:32:24 +01:00
3244c37435
Conditional translation for fan control (FAN_SOFT_PWM), temporary disabled lcd backlight control
2019-02-04 01:32:04 +01:00
036bd4eb46
Merge branch 'dev' into variants
2019-02-04 01:20:14 +01:00
6bf8611afa
mintemp: delay cutting lines removed
2019-02-04 01:19:58 +01:00
71e4459cc9
Merge branch 'dev' into variants
2019-02-04 01:14:11 +01:00
fba207e0ec
crash detection: don't wait for heater if target temp = 0; new priting type
2019-02-04 01:13:46 +01:00
5324181bf7
maximum bed level correction value enlarged from 50um to 100um and is now used in menus and mesh bed leveling itself
2019-02-03 20:56:14 +01:00
454a087fb3
Merge branch 'dev' into variants
2019-02-01 21:24:38 +01:00
4444b155f1
M600: prevention of blob; massage changed when autoload is active
2019-02-01 21:08:34 +01:00
97aaf919a3
Merge remote-tracking branch 'upstream/MK3' into dev
2019-02-01 18:12:59 +01:00
79449a8eaf
Conditional translation for fan control (FAN_SOFT_PWM), temporary disabled lcd backlight control
2019-02-01 13:29:50 +01:00
2cb3b99981
Merge branch 'dev' into variants
2019-01-31 18:04:38 +01:00
4f67a9569c
dont show filament sensor in extruder info menu
2019-01-31 18:03:56 +01:00
6342b6032c
Merge remote-tracking branch 'upstream/MK3' into variants
2019-01-31 10:18:41 +01:00
491dbf5ebd
Merge pull request #1493 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload
2019-01-31 10:15:59 +01:00
921b6993ee
preHeat @ filament load / unload
2019-01-31 05:21:53 +01:00
9926468c91
Merge remote-tracking branch 'upstream/MK3' into variants
2019-01-30 17:26:45 +01:00
b24cd58a50
Merge pull request #1491 from XPila/MK3-bed_fast_pwm
...
HW pwm fix
2019-01-30 12:52:44 +01:00
9890c60fe5
HW PWM fix
2019-01-30 00:06:12 +01:00
bbdb2c1597
Merge branch 'dev' into variants
2019-01-29 15:34:56 +01:00
19fd05bb46
Merge pull request #1490 from PavelSindler/menu_update
...
menu update
2019-01-29 13:29:27 +01:00
1fa9913029
include printers.h
2019-01-28 21:54:44 +01:00
220437316b
Merge pull request #1485 from XPila/MK3-bed_fast_pwm
...
Mk3 bed fast pwm
2019-01-28 21:14:01 +01:00
60acdd23c5
variants
2019-01-28 21:12:38 +01:00
29e156b26d
printer types updated
2019-01-28 19:48:46 +01:00
Marek Bel
MRprusa3d
PavelSindler
mkbel
PavelSindler
Laurentiu
MRprusa3d
Robert Pelnar