Marek Bel
6437d44991
Fix unable to cut filament, if nozzle is already preheated.
2019-03-01 18:10:06 +01:00
Marek Bel
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
Marek Bel
824d11e4b0
Remove "Press the knob to eject filament" message, as it is never shown.
2019-03-01 17:43:28 +01:00
Marek Bel
57cf7ee171
Fix compiler warning: 'lcd_selftest_fsensor' defined but not used
2019-03-01 17:21:13 +01:00
Marek Bel
4c2d4fcf77
Fix compiler warning ultralcd.cpp:4038:10: warning: unused variable 'chars
2019-03-01 17:18:05 +01:00
Marek Bel
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
Marek Bel
8e51b37d91
Suppress warning: unused parameter.
2019-03-01 16:57:20 +01:00
Marek Bel
22500970ba
Remove commented out code, fix formatting.
2019-03-01 16:18:16 +01:00
PavelSindler
85c208f9f4
Merge branch 'MK3' into bad_load_cut
2019-03-01 14:55:55 +01:00
PavelSindler
22c0d6e230
Merge pull request #1577 from mkbel/add_cut
...
Add MMU cut filament
2019-03-01 14:53:12 +01:00
PavelSindler
e14e4be94e
Merge pull request #1575 from mkbel/add_ramming_eject
...
Add filament ramming to eject filament.
2019-03-01 14:21:23 +01:00
PavelSindler
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
PavelSindler
3cbcbba738
Merge pull request #1510 from mkbel/fix_menu_stack_third_time
...
Fix menu stack overrun.
2019-03-01 14:20:22 +01:00
PavelSindler
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
PavelSindler
488497df2c
version change
2019-03-01 13:56:03 +01:00
PavelSindler
ca88010018
Revert "version change"
...
This reverts commit f14733f2dd
2019-03-01 13:54:25 +01:00
PavelSindler
f14733f2dd
version change
2019-03-01 13:53:18 +01:00
PavelSindler
e27fdafcec
menu switch - initial
2019-02-28 19:42:09 +01:00
PavelSindler
482f8ef01a
Merge remote-tracking branch 'mionut/7MBL' into 7x7
2019-02-28 15:54:49 +01:00
Marek Bel
2a005caf42
Add cutter enable to tune menu.
2019-02-27 17:47:51 +01:00
Marek Bel
02a692c5d9
Store cutter enable state in EEPROM.
2019-02-27 17:34:03 +01:00
PavelSindler
ff6eb0b1af
Merge pull request #1568 from MRprusa3d/PFW-795
...
preHeat @ filament management
2019-02-27 13:15:39 +01:00
Marek Bel
4a4eb9962c
Cut filament when cutter is enabled and MMU load fails.
2019-02-27 10:42:26 +01:00
MRprusa3d
2f1e968563
"lcd_update_enable()" replacement
2019-02-26 23:17:52 +01:00
Marek Bel
49b1d1cb93
Move prototype to header file.
2019-02-26 18:50:15 +01:00
Marek Bel
a67645fda6
Merge branch 'add_cut' into bad_load_cut
2019-02-26 18:35:55 +01:00
Marek Bel
815231bc26
Add MMU cut filament menu.
2019-02-26 17:58:00 +01:00
MRprusa3d
ff35119ef3
preHeat @ filament management
...
another funcionality III / autoLoad
2019-02-26 17:33:37 +01:00
Marek Bel
5a5a482a59
Rename preprocessor macro K1 to PID_K1 to avoid future conflict with MMU command.
2019-02-26 13:59:44 +01:00
Marek Bel
6c9dd4f272
Add filament ramming to eject filament.
2019-02-26 13:41:28 +01:00
Marek Bel
7a1b47c340
Convert functions mmu_eject_fil_0 to mmu_eject_fil_4 to template function.
2019-02-26 11:11:05 +01:00
Marek Bel
34e2495487
Convert mmu_load_to_nozzle_0 to mmu_load_to_nozzle_4 to template.
2019-02-26 10:32:10 +01:00
Marek Bel
d5c5ed55eb
Change formatting.
2019-02-25 11:12:39 +01:00
Marek Bel
8f5fbe569c
Merge branch 'MK3' into detect_bad_load
2019-02-25 10:41:26 +01:00
PavelSindler
8e3d52ee6d
fix compilation error for MK2.5, make code more readable
2019-02-22 17:15:40 +01:00
PavelSindler
26cab2911f
mmu stealth mode
2019-02-22 16:30:54 +01:00
Laurentiu
51827c578f
MESH_MEAS_NUM_X_POINTS constant correction to MESH_MEAS_NUM_Y_POINTS
2019-02-22 15:05:06 +02:00
Laurentiu
62875f2e95
MESH_MEAS_NUM_X_POINTS constant correction to MESH_MEAS_NUM_Y_POINTS
2019-02-22 14:35:48 +02:00
MRprusa3d
c0a8d87e9e
Merge remote-tracking branch 'my_remote/PFW-795' into PFW-795
2019-02-22 03:16:23 +01:00
MRprusa3d
be0ed46335
preHeat @ filament management
...
another funcionality III
2019-02-22 03:09:50 +01:00
PavelSindler
730e370e78
Merge pull request #1565 from PavelSindler/MK3_for_merging
...
version change
2019-02-21 19:17:03 +01:00
PavelSindler
da28773480
version change
2019-02-21 19:16:24 +01:00
MRprusa3d
e422cc1c26
Merge branch 'MK3' into PFW-795
2019-02-21 15:43:56 +01:00
MRprusa3d
ed93f1b7f0
preHeat @ filament management
...
another funcionality IIb
2019-02-21 15:27:22 +01:00
PavelSindler
16bb6c80c7
Merge pull request #1562 from PavelSindler/mmu_stop_print_fix
...
comments
2019-02-21 14:29:04 +01:00
PavelSindler
6ad5c07e6d
comments
2019-02-21 14:28:05 +01:00
MRprusa3d
323071f50a
preHeat @ filament management
...
another funcionality II
2019-02-21 13:20:29 +01:00
MRprusa3d
a54c68b874
preHeat @ filament management
...
another funcionality II
2019-02-21 04:45:44 +01:00
Marek Bel
8b858286ac
Document.
2019-02-21 02:30:01 +01:00
Marek Bel
326c8492b5
Move extruder forth and back after filament detected by sensor to detect bad load.
2019-02-21 01:19:26 +01:00
PavelSindler
1e729048dc
cmdqueue_reset fix
2019-02-21 00:14:49 +01:00
MRprusa3d
da0867cfc5
preHeat @ filament management
...
another funcionality
2019-02-20 03:01:33 +01:00
Laurentiu
afc86a1363
missing ;
2019-02-18 05:50:29 +02:00
PavelSindler
11d19879fc
Merge pull request #1533 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload / autoLoad / MMU
2019-02-15 17:45:38 +01:00
PavelSindler
9d76b6912c
merge new changes from upstream
2019-02-15 17:05:39 +01:00
PavelSindler
2b6668b853
merge MK3S branch into MK3
2019-02-15 16:42:40 +01:00
PavelSindler
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
PavelSindler
69ff37729e
whitespace
2019-02-15 14:19:30 +01:00
PavelSindler
0f791ce47f
mmu needs attention: idler error fix
2019-02-15 14:17:47 +01:00
MRprusa3d
0c1f9b5100
preHeat @ filament management
...
target temperature keeping
2019-02-15 02:25:44 +01:00
Laurentiu
4835b9b220
7x7 points mesh bed leveling
2019-02-14 10:57:58 +02:00
MRprusa3d
80c3420a12
Merge branch 'MK3' into PFW-210
2019-02-14 00:05:50 +01:00
MRprusa3d
ef1f82627e
preHeat @ filament load / unload / autoLoad / MMU
...
MMU options added
2019-02-13 23:53:00 +01:00
Marek Bel
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
Marek Bel
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
Marek Bel
daaec0ef04
Convert MmuCmd to enum class.
2019-02-13 17:12:35 +01:00
Marek Bel
8e23e7f322
Save some flash by using smaller type for filament.
2019-02-13 16:37:54 +01:00
Marek Bel
9e873ac0f7
Use enum for mmu_cmd instead of plain integer type.
2019-02-13 01:51:39 +01:00
Marek Bel
bb7eeef1f4
Define debug printf and puts functions to make code more readable.
2019-02-12 23:24:23 +01:00
Marek Bel
e1216934ef
Save flash by defining underlying type and omitting number value.
2019-02-12 21:53:11 +01:00
Marek Bel
3379fb4866
Convert mmu_state to enum.
2019-02-12 21:43:26 +01:00
PavelSindler
4c76393231
version change
2019-02-12 13:44:50 +01:00
PavelSindler
62500f0b55
version changed
2019-02-12 10:39:09 +01:00
Marek Bel
6c8d9c6fb4
Retry filament load on MMU load failure once.
2019-02-11 23:43:42 +01:00
Marek Bel
d33b24c281
Unload filament after MMU load failed so MMU unit can be controlled by its buttons.
2019-02-11 23:24:55 +01:00
PavelSindler
b85661309f
configuration change
2019-02-11 16:38:36 +01:00
PavelSindler
ccc542d74a
MK2.5 IR_SENSOR_PIN modified
2019-02-11 14:32:21 +01:00
PavelSindler
cd692f6be6
version change
2019-02-07 19:43:08 +01:00
PavelSindler
065d56b2c6
version change
2019-02-06 23:58:30 +01:00
PavelSindler
38b0e5439b
version change
2019-02-06 23:52:24 +01:00
MRprusa3d
b17a961241
MK2.5S
...
pin definition for filament sensor connection
2019-02-06 23:31:48 +01:00
PavelSindler
e028db7bf9
version change
2019-02-06 23:30:01 +01:00
PavelSindler
ff52499bdc
extr fan RPM measuring fix
2019-02-06 23:05:13 +01:00
PavelSindler
e432e258dc
extr fan RPM measuring fix
2019-02-06 22:56:10 +01:00
PavelSindler
22217a42f7
message change
2019-02-06 21:37:39 +01:00
PavelSindler
a85d8e7f97
message change
2019-02-06 21:36:21 +01:00
PavelSindler
d19c92bca8
welcome message changed
2019-02-06 19:41:17 +01:00
PavelSindler
de9c87c592
welcome message changed
2019-02-06 19:38:52 +01:00
Marek Bel
c704a4b7ab
Fix menu stack overrun.
2019-02-06 18:25:45 +01:00
PavelSindler
726d5aa3c3
typo fixed
2019-02-06 16:29:10 +01:00
PavelSindler
63c8a36185
typo fixed
2019-02-06 16:27:44 +01:00
PavelSindler
a220c97f94
Revert "variant files"
...
This reverts commit 850d3316b6
2019-02-06 16:19:30 +01:00
PavelSindler
2fe8e0670a
MK2 build fail fixed
2019-02-06 16:15:19 +01:00
PavelSindler
850d3316b6
variant files
2019-02-06 15:18:12 +01:00
PavelSindler
ef86c78f25
menu item text changed
2019-02-06 14:24:47 +01:00
PavelSindler
1ba046395e
fan measurements fix: keep fanSpeedSoftPwm = 255 during measurements, selftest changes
2019-02-06 12:37:18 +01:00
PavelSindler
27d002a46f
Merge remote-tracking branch 'robert/MK3-variants' into variants
2019-02-06 09:20:21 +01:00
PavelSindler
860e6f9994
Merge remote-tracking branch 'upstream/MK3' into variants
2019-02-06 09:19:38 +01:00
PavelSindler
fcb7dd90cf
Merge pull request #1505 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload / autoLoad
2019-02-06 09:14:03 +01:00
MRprusa3d
a53d150903
preHeat @ filament load / unload / autoLoad
...
autoLoad option added
2019-02-06 01:58:05 +01:00
Robert Pelnar
93d4128163
Fixed timer2 colission with arduino framework around "tone" function.
2019-02-05 19:08:57 +01:00
PavelSindler
62e253edd0
fanSpeed -> fanSpeedSoftPwm (fixes fan speed menu)
2019-02-05 18:21:44 +01:00
PavelSindler
903028e574
fix fan speed measuring for PWM = 255
2019-02-05 17:46:31 +01:00
PavelSindler
91b12ff64b
bed level correction menu fix (menu_item_edit for negative integers)
2019-02-05 16:49:29 +01:00
PavelSindler
f9298b37b8
fan check hotfix (selftest, measuring RPM, fan errors)
2019-02-05 04:02:38 +01:00
PavelSindler
ea20529945
merge changes from upstream
2019-02-04 15:23:39 +01:00
MRprusa3d
5a2df47077
minTemp
...
better stability for delay-cutting
2019-02-04 14:54:25 +01:00
PavelSindler
9a51a7be29
Merge branch 'bed_correction_fix' into variants
2019-02-04 12:47:06 +01:00
PavelSindler
0853ef5d06
Merge remote-tracking branch 'upstream/MK3' into variants
2019-02-04 12:45:28 +01:00
PavelSindler
b4f2dc3b5e
Merge remote-tracking branch 'robert/MK3-variants' into variants
2019-02-04 12:41:08 +01:00
PavelSindler
6d5a2ae816
Merge pull request #1499 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload
2019-02-04 12:37:42 +01:00
Robert Pelnar
d2a4cb4c49
Use _delay_ms instead of delay (fix - fast scrolling in sd card menu - temporary solution)
2019-02-04 12:20:07 +01:00
MRprusa3d
fff8fc8a48
preHeat @ filament load / unload
...
filament-list correction (PET missing)
2019-02-04 12:12:35 +01:00
PavelSindler
2f9ab7b185
Merge branch 'dev' into variants
2019-02-04 01:32:24 +01:00
Robert Pelnar
3244c37435
Conditional translation for fan control (FAN_SOFT_PWM), temporary disabled lcd backlight control
2019-02-04 01:32:04 +01:00
PavelSindler
036bd4eb46
Merge branch 'dev' into variants
2019-02-04 01:20:14 +01:00
PavelSindler
6bf8611afa
mintemp: delay cutting lines removed
2019-02-04 01:19:58 +01:00
PavelSindler
71e4459cc9
Merge branch 'dev' into variants
2019-02-04 01:14:11 +01:00
PavelSindler
fba207e0ec
crash detection: don't wait for heater if target temp = 0; new priting type
2019-02-04 01:13:46 +01:00
PavelSindler
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
PavelSindler
454a087fb3
Merge branch 'dev' into variants
2019-02-01 21:24:38 +01:00
PavelSindler
4444b155f1
M600: prevention of blob; massage changed when autoload is active
2019-02-01 21:08:34 +01:00
PavelSindler
97aaf919a3
Merge remote-tracking branch 'upstream/MK3' into dev
2019-02-01 18:12:59 +01:00
Robert Pelnar
79449a8eaf
Conditional translation for fan control (FAN_SOFT_PWM), temporary disabled lcd backlight control
2019-02-01 13:29:50 +01:00
PavelSindler
2cb3b99981
Merge branch 'dev' into variants
2019-01-31 18:04:38 +01:00
PavelSindler
4f67a9569c
dont show filament sensor in extruder info menu
2019-01-31 18:03:56 +01:00
PavelSindler
6342b6032c
Merge remote-tracking branch 'upstream/MK3' into variants
2019-01-31 10:18:41 +01:00
PavelSindler
491dbf5ebd
Merge pull request #1493 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload
2019-01-31 10:15:59 +01:00
MRprusa3d
921b6993ee
preHeat @ filament load / unload
2019-01-31 05:21:53 +01:00
PavelSindler
9926468c91
Merge remote-tracking branch 'upstream/MK3' into variants
2019-01-30 17:26:45 +01:00
PavelSindler
b24cd58a50
Merge pull request #1491 from XPila/MK3-bed_fast_pwm
...
HW pwm fix
2019-01-30 12:52:44 +01:00
Robert Pelnar
9890c60fe5
HW PWM fix
2019-01-30 00:06:12 +01:00
PavelSindler
bbdb2c1597
Merge branch 'dev' into variants
2019-01-29 15:34:56 +01:00
MRprusa3d
19fd05bb46
Merge pull request #1490 from PavelSindler/menu_update
...
menu update
2019-01-29 13:29:27 +01:00
PavelSindler
1fa9913029
include printers.h
2019-01-28 21:54:44 +01:00
PavelSindler
220437316b
Merge pull request #1485 from XPila/MK3-bed_fast_pwm
...
Mk3 bed fast pwm
2019-01-28 21:14:01 +01:00
PavelSindler
60acdd23c5
variants
2019-01-28 21:12:38 +01:00
PavelSindler
29e156b26d
printer types updated
2019-01-28 19:48:46 +01:00
PavelSindler
25d54d43aa
menu update
2019-01-28 19:41:02 +01:00
Marek Bel
6d2358125a
Fix Timer_test broken by conditional translation for SYSTEM_TIMER_2.
2019-01-28 19:29:31 +01:00
PavelSindler
dd4d8e1277
calibrate z endstop update
2019-01-28 19:23:19 +01:00
PavelSindler
af348aa8ba
compilation error fix: pin for LCD brightness
2019-01-28 17:56:44 +01:00
PavelSindler
83510ed489
check_for_ir_sensor
2019-01-28 17:27:16 +01:00
PavelSindler
8fe2d1de9a
Merge remote-tracking branch 'my_dev/MK3' into dev
2019-01-28 17:15:22 +01:00
PavelSindler
8f039263d5
variant files and version
2019-01-28 17:14:24 +01:00
PavelSindler
1742dbdb9e
Merge remote-tracking branch 'my_dev/MK3' into dev
2019-01-28 16:21:57 +01:00
PavelSindler
2ea34d21e7
Revert "Revert "Mk3 bed fast pwm""
2019-01-28 14:20:31 +01:00
Robert Pelnar
1b4e49b5ac
Fixed fancheck and include in TimerRemaining.h
...
this commit enables fast pwm mode for bed (SYSTEM_TIMER_2 definition uncomented)
fancheck fix verified with selftest
2019-01-28 12:57:33 +01:00
PavelSindler
0514306bed
selftest fixed
2019-01-28 11:09:41 +01:00
PavelSindler
7889305702
merging changes from upstream
2019-01-28 11:00:42 +01:00
PavelSindler
41f103c28f
Revert "Mk3 bed fast pwm"
2019-01-28 10:53:51 +01:00
PavelSindler
c6e6df404c
Merge pull request #1482 from mkbel/IR_fsens_selftest
...
Ir fsens selftest
2019-01-28 10:39:12 +01:00
Robert Pelnar
eea755496b
Conditional translation for SYSTEM_TIMER_2 because we want to have posibility to switch between old/new implementation.
...
Timing functions (millis, micros and delay) replaced in whole source, defined in Marlin.h.
This commit enables original implementation (SYSTEM_TIMER_2 undefined)
Verified with passed complete wizard process.
2019-01-27 22:48:51 +01:00
Robert Pelnar
9a1e914637
fix - bed heating durring selftest
2019-01-27 18:14:01 +01:00
Robert Pelnar
434a723151
Timing functions 'micros' and 'delay' replaced in whole source with 'micros2' and 'delay2'
2019-01-27 17:37:27 +01:00
Robert Pelnar
fc0b55b213
Timing functions micros2 and delay2 + fix of delay_keep_alive().
2019-01-27 17:23:53 +01:00
Marek Bel
aaa2670ef8
Remove redundant enum numbering.
2019-01-25 20:14:29 +01:00
Marek Bel
b167896c6d
Convert lcd_selftest_screen parameter int _step to enum class testScreen screen.
2019-01-25 20:00:12 +01:00
PavelSindler
ab2a25cd3f
Revert "Fast PWM for bed - newer set HEATER_BED_PIN to 1"
...
This reverts commit 50bcfae183
2019-01-25 18:38:46 +01:00
PavelSindler
31236e411e
Revert "Fast PWM for bed - set pwm value from soft_pwm_bed variable."
...
This reverts commit e612eb2a17
2019-01-25 18:38:36 +01:00
PavelSindler
76db58605b
Revert "Fast PWM for bed - timer2 used as system timer"
...
This reverts commit 0963c889f0
2019-01-25 18:37:23 +01:00
Marek Bel
6d1256eaad
Internationalize "Calibrating home".
2019-01-25 18:06:30 +01:00
PavelSindler
fc1491670f
mmu_idler_sensor_detected -> ir_sensor_detected
2019-01-25 18:03:05 +01:00
PavelSindler
6b6a3d7d5f
MMU_IR_SENSOR_PIN -> IR_SENSOR_PIN
2019-01-25 18:01:17 +01:00
PavelSindler
7e3a1c7d45
merge changes from upstream
2019-01-25 17:57:24 +01:00
PavelSindler
579fb42be2
Merge pull request #1480 from MRprusa3d/PFW-556
...
Pfw 556
2019-01-25 15:04:26 +01:00
PavelSindler
0d1a7a1774
Merge pull request #1479 from MRprusa3d/PFW-749
...
SD card menu
2019-01-25 14:32:12 +01:00
PavelSindler
661c40ef75
Merge pull request #1472 from mkbel/IR_fsens_selftest
...
Ir fsens selftest
2019-01-25 13:14:18 +01:00
Marek Bel
edc412697c
Increase selftest_irsensor() filament nozzle unload temperature to ABS.
...
Resume nozzle temperature immediately after unload.
2019-01-24 21:24:46 +01:00
Marek Bel
68ffa95aa9
Fix axis self-test progress visualization.
2019-01-24 21:06:03 +01:00
Marek Bel
1c4f3259ea
Increase heater check minimum expected temperature rises.
...
Bed increased from 3 to 10 K.
Nozzle increased from 10 to 30 K.
Measured rises with my MK3 printer:
Bed 26K,
Nozzle 73K.
2019-01-24 21:02:04 +01:00
Marek Bel
305598d7f6
Fix bed / nozzle test order and progress bar.
...
Known limitation:
Z progress shown in bed progress.
2019-01-24 20:03:37 +01:00
MRprusa3d
46e2bdaf62
Merge remote-tracking branch 'public_remote/MK3' into PFW-556
2019-01-24 19:39:34 +01:00
Marek Bel
22859800f0
Rearrange tests. Move hot end test to the end, to spare time in IR sensor test.
...
Known problems, hot end and bed is swapped. Bed progress indicator is painted to X axis test.
2019-01-24 19:22:36 +01:00
MRprusa3d
b2b65475df
SD card menu
...
SDcard-menu after card insertion
2019-01-24 17:32:57 +01:00
PavelSindler
6b1cf99066
conditional compilation updated
2019-01-24 16:14:02 +01:00
PavelSindler
da2c963893
conditional compilation improved: fsensor_autoload_check_stop() and fsensor_autoload_check_start(); M600 "filament not responding" error on printers with ir sensor fixed
2019-01-24 16:00:52 +01:00
PavelSindler
ad65024147
selftest: filament sensor check change
2019-01-24 13:57:52 +01:00
PavelSindler
f4e5c729ac
Merge pull request #1451 from mkbel/Tx_fix
...
Tx fix
2019-01-24 13:41:43 +01:00
PavelSindler
273554b9b0
Merge pull request #1470 from XPila/MK3-bed_fast_pwm
...
Mk3 bed fast pwm
2019-01-24 13:11:57 +01:00
PavelSindler
e0c1e4a02d
version which should on all printer versions: autoload, selftest, filament detection, filament sensors initialization, filament menus
2019-01-24 01:12:30 +01:00
PavelSindler
eec869b73a
Merge pull request #1477 from MRprusa3d/PFW-723
...
PID / manage_heater
2019-01-24 00:31:23 +01:00
MRprusa3d
15b45df9fb
PID / manage_heater
...
better build-warnings elimination
2019-01-23 20:14:40 +01:00
MRprusa3d
867182c266
minTemp
...
more user-proof solution
2019-01-23 18:50:13 +01:00
Robert Pelnar
c4d5b58c37
Merge remote-tracking branch 'upstream/MK3' into MK3-bed_fast_pwm
...
# Conflicts:
# Firmware/temperature.cpp
resolved
2019-01-23 17:04:41 +01:00
PavelSindler
54f8f4eb4d
Merge pull request #1460 from MRprusa3d/PFW-723
...
Pfw 723
2019-01-23 14:12:19 +01:00
Marek Bel
1d71c1a5d1
Update IR sensor selftest progress bar more frequently.
2019-01-22 19:02:42 +01:00
Marek Bel
97a4623800
Fix lcd_selftest_screen for small _progress_scale.
2019-01-22 19:01:55 +01:00
Marek Bel
9cda0b69b8
Update IR sensor selftest progress bar.
2019-01-22 18:23:00 +01:00
Marek Bel
3ff8a7c740
Unload filament by MMU unit in selftest_irsensor().
...
Known limitation:
If filament was not loaded to nozzle it is sticked completely out of MMU. To be fixed in MMU, as this problem can be reproduced also from printer menu - unload filament.
2019-01-22 14:54:06 +01:00
Marek Bel
c371a5ea65
Document.
2019-01-22 14:05:08 +01:00
Marek Bel
a92d9c782b
Add IR sensor test.
2019-01-22 11:29:55 +01:00
Marek Bel
f292a6ca7a
Refactor filament sensor selftest call.
2019-01-21 21:39:38 +01:00
Robert Pelnar
50bcfae183
Fast PWM for bed - newer set HEATER_BED_PIN to 1
2019-01-21 18:21:17 +01:00
MRprusa3d
2c0d62fbf7
PID / manage_heater
...
some small corrections
2019-01-21 18:20:40 +01:00
Robert Pelnar
e612eb2a17
Fast PWM for bed - set pwm value from soft_pwm_bed variable.
2019-01-21 18:14:19 +01:00
Robert Pelnar
0963c889f0
Fast PWM for bed - timer2 used as system timer
2019-01-21 17:57:07 +01:00
MRprusa3d
d7ac459da7
PID / manage_heater
...
build-warnings elimination
2019-01-20 01:23:15 +01:00
MRprusa3d
d9f8e4eb9e
PID / manage_heater
...
PSD regulator improvement
2019-01-17 02:57:08 +01:00
PavelSindler
ca8cb3784c
Merge pull request #1456 from mkbel/Fix_load_fail_current
...
Do not disable motor currents when print is paused due to mmu load er…
2019-01-16 12:49:38 +01:00
Marek Bel
3af1f81269
Do not disable motor currents when print is paused due to mmu load error.
2019-01-15 21:40:02 +01:00
Marek Bel
052ae323f8
Merge branch 'MK3' into prusa3d-DEV_MK3
2019-01-15 16:58:36 +01:00
Marek Bel
d09ff5c3e7
Remove commented out code.
2019-01-15 01:30:54 +01:00
Marek Bel
39b391314f
Document meaning of manage_response() move default parameter value.
2019-01-15 01:29:59 +01:00
Marek Bel
3b175459b1
Fix filament loaded to far and MMU idler never disengaged after Tx command on printer with idler sensor.
2019-01-15 01:28:51 +01:00
Marek Bel
2db42c8577
Merge branch 'MK3' into auto_deplete_2
2019-01-07 21:39:46 +01:00
Marek Bel
c080b899c3
Change filament number in T command to alternative if depleted and lcd_autoDepleteEnabled().
2019-01-04 22:32:48 +01:00
PavelSindler
7946cd7250
eeprom write nr. limitation
2019-01-04 22:23:11 +01:00
PavelSindler
02262ff7ca
mmu load fail: possibility to unload/eject filament from menu
2019-01-04 21:37:19 +01:00
Marek Bel
d89c03a0f1
Documentation.
2019-01-04 21:26:13 +01:00
Marek Bel
1a219b2372
Mark filament as depleted when detected by MMUv2 FINDA. Do not try to load filament if it is marked depleted, load next filament instead. Force user action when all filaments are marked as depleted.
2019-01-04 21:11:42 +01:00
PavelSindler
b7b7e9387f
do resend attempts before pausing print (mmu needs attention state) so the print would not be paused if T-code is not received correctly by mmu; prevent infinite loading
2019-01-04 21:07:52 +01:00
Marek Bel
a7128ffa04
Comment.
2019-01-04 19:56:15 +01:00
Marek Bel
92ff284f82
Remove redundant code.
2019-01-04 19:35:33 +01:00
Marek Bel
360a977520
Fix allDepleted(). Add tests.
2019-01-04 19:34:42 +01:00
Marek Bel
a309ec1b0b
Add filament auto deplete engine for multi-material prints with MMUv2.
2019-01-03 22:58:25 +01:00
MRprusa3d
4e300fd552
minTemp
...
safety heaters management during/after minTemp
2019-01-02 18:25:41 +01:00
Craig Link
52d81bb4d8
set array size correctly to 4
2018-12-31 17:51:16 -08:00
PavelSindler
3ab1daf722
MMU_DEBUG temporarily enabled
2018-12-21 23:17:32 +01:00
PavelSindler
88441f7f2f
scan power failures fix
2018-12-21 23:07:39 +01:00
PavelSindler
6ba86acebc
send A (abort) command to mmu only when loading phase of T-code
2018-12-21 22:33:01 +01:00
PavelSindler
e36e58f385
show sensor on/off temporarily changed to unlocalized strings
2018-12-21 21:28:57 +01:00
PavelSindler
688d4a8a82
missing defines in variant files
2018-12-21 21:05:54 +01:00
PavelSindler
ba57986b72
merge changes from upstream
2018-12-21 20:58:38 +01:00
PavelSindler
5462d451e1
show power failures in fail stats menu, shorter load to nozzle if idler sensor detected
2018-12-21 20:56:45 +01:00
PavelSindler
d1ca73597b
Merge pull request #1412 from XPila/V3_5
...
Repeat last MMU command after timeout
2018-12-21 20:53:24 +01:00
PavelSindler
d292e877df
load to nozzle shortened, sensor menu moved to support
2018-12-21 18:51:13 +01:00
PavelSindler
3c64bad1cb
initial version which works on old and new hw, initial version of idler sensor detection
2018-12-21 17:12:16 +01:00
PavelSindler
75523b1497
Merge pull request #1417 from PavelSindler/z_cal_endstops
...
version changed
2018-12-19 20:08:22 +01:00
PavelSindler
acbfe89f04
version changed
2018-12-19 20:07:18 +01:00
PavelSindler
b0fce9122e
Merge pull request #1416 from PavelSindler/z_cal_endstops
...
Z cal endstops and stop paused print fix
2018-12-19 19:46:27 +01:00
Robert Pelnar
f79137898a
Fix - move down after calibrate Z (PFW718)
2018-12-19 19:22:03 +01:00
PavelSindler
40fe52202d
stop paused print fix: saved_printing set to false when doing stop print
2018-12-19 19:20:09 +01:00
Robert Pelnar
b8c5b6259e
Fix - move down after calibrate Z (PFW718)
2018-12-19 14:40:10 +01:00
Robert Pelnar
c69d4aa914
Move 1mm down with disabled endstop after calibrate_z_auto (PFW718)
2018-12-19 13:43:49 +01:00
Robert Pelnar
16e5fb50dd
Remove M601 from queue before saving state (prevent infinite loop - PFW713)
2018-12-18 20:39:38 +01:00
Robert Pelnar
34f116b4d9
Move 1mm down with disabled endstop after calibrate_z_auto (PFW718)
2018-12-18 19:57:29 +01:00
PavelSindler
b5430c2968
M600: consume click
2018-12-18 19:10:02 +01:00
Robert Pelnar
75d31fd2cb
Repeat last MMU command after timeout
2018-12-18 18:47:54 +01:00
PavelSindler
880163dbcb
missing prototypes
2018-12-18 17:38:24 +01:00
PavelSindler
fc5d7e35ef
fail stats mmu function definitions
2018-12-18 17:35:41 +01:00
PavelSindler
11ab5dfd36
fail stats menu for mmu defined for MK2.5 version
2018-12-18 17:33:27 +01:00
PavelSindler
4543949cac
build without MMU_IDLER_SENSOR_PIN defined
2018-12-18 17:29:44 +01:00
PavelSindler
fc33affbda
temporary change
2018-12-18 17:24:29 +01:00
PavelSindler
2100376eb1
Merge remote-tracking branch 'upstream/MK3' into idler_sensor
2018-12-18 16:16:48 +01:00
PavelSindler
c782373f2d
comment
2018-12-18 16:09:10 +01:00
PavelSindler
7703125b2e
retry unload movements (T-codes, M702 C) if filament detected by idler sensor, then turn off stepper and wait, MMU_LOAD_TIME prolonged
2018-12-18 16:08:29 +01:00
PavelSindler
27c8612360
use just short movement for unloading filament
2018-12-17 21:25:07 +01:00
PavelSindler
cb1f6d2a0e
show sensor states in calibration menu
2018-12-14 19:43:26 +01:00
Robert Pelnar
927898151a
fix - tmc2130 conditional translation
2018-12-14 15:46:50 +01:00
Robert Pelnar
cfe83daf4a
Meshbed leveling fail - move 1mm outside of colission with disabled endstop
2018-12-14 15:32:47 +01:00
PavelSindler
e0bed71801
comments update
2018-12-13 17:01:45 +01:00
PavelSindler
bbba27c15f
idler state menu
2018-12-13 16:53:59 +01:00
PavelSindler
24ef6deeed
typo fixed
2018-12-13 16:43:40 +01:00
PavelSindler
9c4f086add
fixed statistics for MMU_FAIL
2018-12-13 01:09:21 +01:00
PavelSindler
df71398066
statistics fix
2018-12-13 00:43:27 +01:00
PavelSindler
a9829b6a1a
add statistics and idler sensor state
2018-12-13 00:12:00 +01:00
PavelSindler
665f1d7ffe
pause print after N continue loading attempts and wait for user, then start print and repeat last T-code
2018-12-12 23:36:50 +01:00
PavelSindler
29ecd4ec7a
duplicit T-codes execution improved, E-stepper movements when waiting for ok from mmu, continue loading function improved, eeprom: fail stats for mmu
2018-12-12 22:32:47 +01:00
Marek Bel
3d4cb8a994
Document gcode T.
2018-12-12 20:30:28 +01:00
PavelSindler
c256af0a1c
unknown filament added; the same T-code will be not executed twice in a row; continue loading
2018-12-12 14:50:55 +01:00
PavelSindler
e52e53d1eb
send continue loading commands periodically if initial load fails
2018-12-12 13:54:17 +01:00
PavelSindler
041ed172a0
Merge remote-tracking branch 'robert/MK3' into idler_sensor
2018-12-11 19:16:04 +01:00
PavelSindler
8af127870d
consume click
2018-12-11 15:59:44 +01:00
Joshua Hoblitt
3f96dea4f9
make all shell scripts executable
2018-12-10 07:09:03 -07:00
PavelSindler
6d6de67c3f
consume click
2018-12-07 18:31:30 +01:00
Robert Pelnar
35378769fd
MMU - idler sensor
2018-12-06 19:19:50 +01:00
Robert Pelnar
6157c3ab32
New filament sensor
2018-12-06 15:41:53 +01:00
Robert Pelnar
41b78187ca
LCD backlight - full brightnes at start
2018-12-06 15:27:05 +01:00
Robert Pelnar
cb334238cc
Slow PWM fan @ 62.5Hz
2018-12-06 15:18:07 +01:00
XPila
1948cb6310
Merge pull request #1369 from PavelSindler/M220_MK3
...
M220: possibility to backup/restore speed
2018-11-30 19:02:45 +01:00
PavelSindler
d1d4a8c58c
whitespace
2018-11-29 17:33:36 +01:00
PavelSindler
8e239ce76f
changed M220
2018-11-29 17:02:38 +01:00
PavelSindler
929e1de253
special variable for saving/restoring feedmultiply using M220
2018-11-29 17:02:10 +01:00
PavelSindler
839de141a3
resolving conflicts
2018-11-29 16:26:49 +01:00
PavelSindler
abf20ef6a2
merged changes from public upstream (Prusa-Firmware repository)
2018-11-29 13:46:58 +01:00
MRprusa3d
83a9f75abe
minTemp
...
correct minTemp detection @ MK2.5 & MK3
2018-11-28 23:43:16 +01:00
Marek Bel
38dacaf07a
Automate secondary language support build.
2018-11-26 20:24:24 +01:00
PavelSindler
90876453a7
Merge pull request #1357 from PavelSindler/MK3_for_merging
...
version change
2018-11-22 23:32:37 +01:00
PavelSindler
47d3535012
version change
2018-11-22 23:30:01 +01:00
PavelSindler
c1773c1aa4
Merge pull request #1356 from PavelSindler/MK3_for_merging
...
process serial line during pause
2018-11-22 23:07:07 +01:00
PavelSindler
85b23d1db6
process serial line during pause
2018-11-22 21:41:22 +01:00
PavelSindler
b3ab9d0ee0
Merge pull request #1354 from XPila/V3_5
...
Lang - final corrections
2018-11-22 19:03:30 +01:00
Robert Pelnar
e229f3343e
Lang - text "volume.init failed" removed from dictionary
2018-11-22 18:48:22 +01:00
Robert Pelnar
42f2a61416
Lang - text "TRIGGERED" removed from dictionary
2018-11-22 18:46:02 +01:00
Robert Pelnar
e9131542ca
Lang - text "Sleep..." removed from dictionary
2018-11-22 18:43:21 +01:00
Robert Pelnar
ddf898cb41
Lang - text "SD init fail" removed from dictionary
2018-11-22 18:41:00 +01:00
Robert Pelnar
3384dd8487
Lang - text "SD card ok" removed from dictionary
2018-11-22 18:39:35 +01:00
Robert Pelnar
72c7810641
Lang - text "Resend" removed from dictionary
2018-11-22 18:38:20 +01:00
Robert Pelnar
7426efac9b
Lang - text "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" removed from dictionary
2018-11-22 18:36:38 +01:00
Robert Pelnar
123bef636a
Lang - text "Printer halted. kill() called!" removed from dictionary
2018-11-22 18:33:15 +01:00
Robert Pelnar
123725edd1
Lang - duplicate text "Some problem encountered, Z-levelling enforced ..." removed
2018-11-22 18:30:53 +01:00
Robert Pelnar
0fceade481
Lang - text "PowerUp" removed from dictionary
2018-11-22 18:24:21 +01:00
Robert Pelnar
f0e3021d33
Lang - text "openRoot failed" removed from dictionary
2018-11-22 18:20:24 +01:00
Robert Pelnar
1cbb261707
Lang - text "open" removed from dictionary
2018-11-22 18:18:25 +01:00
Robert Pelnar
f4bbce4142
Lang - text "open failed, File: " removed from dictionary
2018-11-22 18:15:22 +01:00
Robert Pelnar
72d47eaeba
Lang - text "ok" removed from dictionary
2018-11-22 18:12:19 +01:00
Robert Pelnar
1568b94e87
Lang - text "No Checksum with line number, Last Line: " removed from dictionary
2018-11-22 18:09:07 +01:00
Robert Pelnar
fd3cd9b551
Lang - texts "Mxxx Invalid extruder " removed from dictionary
2018-11-22 18:06:10 +01:00
Robert Pelnar
fdf9734161
Lang - text "checksum mismatch, Last Line: " removed from dictionary
2018-11-22 17:59:43 +01:00
