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
25d54d43aa
menu update
2019-01-28 19:41:02 +01:00
6d2358125a
Fix Timer_test broken by conditional translation for SYSTEM_TIMER_2.
2019-01-28 19:29:31 +01:00
dd4d8e1277
calibrate z endstop update
2019-01-28 19:23:19 +01:00
af348aa8ba
compilation error fix: pin for LCD brightness
2019-01-28 17:56:44 +01:00
83510ed489
check_for_ir_sensor
2019-01-28 17:27:16 +01:00
8fe2d1de9a
Merge remote-tracking branch 'my_dev/MK3' into dev
2019-01-28 17:15:22 +01:00
8f039263d5
variant files and version
2019-01-28 17:14:24 +01:00
1742dbdb9e
Merge remote-tracking branch 'my_dev/MK3' into dev
2019-01-28 16:21:57 +01:00
2ea34d21e7
Revert "Revert "Mk3 bed fast pwm""
2019-01-28 14:20:31 +01:00
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
0514306bed
selftest fixed
2019-01-28 11:09:41 +01:00
7889305702
merging changes from upstream
2019-01-28 11:00:42 +01:00
41f103c28f
Revert "Mk3 bed fast pwm"
2019-01-28 10:53:51 +01:00
c6e6df404c
Merge pull request #1482 from mkbel/IR_fsens_selftest
...
Ir fsens selftest
2019-01-28 10:39:12 +01:00
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
9a1e914637
fix - bed heating durring selftest
2019-01-27 18:14:01 +01:00
434a723151
Timing functions 'micros' and 'delay' replaced in whole source with 'micros2' and 'delay2'
2019-01-27 17:37:27 +01:00
fc0b55b213
Timing functions micros2 and delay2 + fix of delay_keep_alive().
2019-01-27 17:23:53 +01:00
aaa2670ef8
Remove redundant enum numbering.
2019-01-25 20:14:29 +01:00
b167896c6d
Convert lcd_selftest_screen parameter int _step to enum class testScreen screen.
2019-01-25 20:00:12 +01:00
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
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
76db58605b
Revert "Fast PWM for bed - timer2 used as system timer"
...
This reverts commit 0963c889f0
2019-01-25 18:37:23 +01:00
6d1256eaad
Internationalize "Calibrating home".
2019-01-25 18:06:30 +01:00
fc1491670f
mmu_idler_sensor_detected -> ir_sensor_detected
2019-01-25 18:03:05 +01:00
6b6a3d7d5f
MMU_IR_SENSOR_PIN -> IR_SENSOR_PIN
2019-01-25 18:01:17 +01:00
7e3a1c7d45
merge changes from upstream
2019-01-25 17:57:24 +01:00
579fb42be2
Merge pull request #1480 from MRprusa3d/PFW-556
...
Pfw 556
2019-01-25 15:04:26 +01:00
0d1a7a1774
Merge pull request #1479 from MRprusa3d/PFW-749
...
SD card menu
2019-01-25 14:32:12 +01:00
661c40ef75
Merge pull request #1472 from mkbel/IR_fsens_selftest
...
Ir fsens selftest
2019-01-25 13:14:18 +01:00
edc412697c
Increase selftest_irsensor() filament nozzle unload temperature to ABS.
...
Resume nozzle temperature immediately after unload.
2019-01-24 21:24:46 +01:00
68ffa95aa9
Fix axis self-test progress visualization.
2019-01-24 21:06:03 +01:00
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
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
46e2bdaf62
Merge remote-tracking branch 'public_remote/MK3' into PFW-556
2019-01-24 19:39:34 +01:00
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
b2b65475df
SD card menu
...
SDcard-menu after card insertion
2019-01-24 17:32:57 +01:00
6b1cf99066
conditional compilation updated
2019-01-24 16:14:02 +01:00
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
ad65024147
selftest: filament sensor check change
2019-01-24 13:57:52 +01:00
f4e5c729ac
Merge pull request #1451 from mkbel/Tx_fix
...
Tx fix
2019-01-24 13:41:43 +01:00
273554b9b0
Merge pull request #1470 from XPila/MK3-bed_fast_pwm
...
Mk3 bed fast pwm
2019-01-24 13:11:57 +01:00
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
eec869b73a
Merge pull request #1477 from MRprusa3d/PFW-723
...
PID / manage_heater
2019-01-24 00:31:23 +01:00
15b45df9fb
PID / manage_heater
...
better build-warnings elimination
2019-01-23 20:14:40 +01:00
867182c266
minTemp
...
more user-proof solution
2019-01-23 18:50:13 +01:00
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
54f8f4eb4d
Merge pull request #1460 from MRprusa3d/PFW-723
...
Pfw 723
2019-01-23 14:12:19 +01:00
1d71c1a5d1
Update IR sensor selftest progress bar more frequently.
2019-01-22 19:02:42 +01:00
97a4623800
Fix lcd_selftest_screen for small _progress_scale.
2019-01-22 19:01:55 +01:00
9cda0b69b8
Update IR sensor selftest progress bar.
2019-01-22 18:23:00 +01:00
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
c371a5ea65
Document.
2019-01-22 14:05:08 +01:00
a92d9c782b
Add IR sensor test.
2019-01-22 11:29:55 +01:00
f292a6ca7a
Refactor filament sensor selftest call.
2019-01-21 21:39:38 +01:00
50bcfae183
Fast PWM for bed - newer set HEATER_BED_PIN to 1
2019-01-21 18:21:17 +01:00
2c0d62fbf7
PID / manage_heater
...
some small corrections
2019-01-21 18:20:40 +01:00
e612eb2a17
Fast PWM for bed - set pwm value from soft_pwm_bed variable.
2019-01-21 18:14:19 +01:00
0963c889f0
Fast PWM for bed - timer2 used as system timer
2019-01-21 17:57:07 +01:00
d7ac459da7
PID / manage_heater
...
build-warnings elimination
2019-01-20 01:23:15 +01:00
d9f8e4eb9e
PID / manage_heater
...
PSD regulator improvement
2019-01-17 02:57:08 +01:00
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
3af1f81269
Do not disable motor currents when print is paused due to mmu load error.
2019-01-15 21:40:02 +01:00
052ae323f8
Merge branch 'MK3' into prusa3d-DEV_MK3
2019-01-15 16:58:36 +01:00
d09ff5c3e7
Remove commented out code.
2019-01-15 01:30:54 +01:00
39b391314f
Document meaning of manage_response() move default parameter value.
2019-01-15 01:29:59 +01:00
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
2db42c8577
Merge branch 'MK3' into auto_deplete_2
2019-01-07 21:39:46 +01:00
c080b899c3
Change filament number in T command to alternative if depleted and lcd_autoDepleteEnabled().
2019-01-04 22:32:48 +01:00
7946cd7250
eeprom write nr. limitation
2019-01-04 22:23:11 +01:00
02262ff7ca
mmu load fail: possibility to unload/eject filament from menu
2019-01-04 21:37:19 +01:00
d89c03a0f1
Documentation.
2019-01-04 21:26:13 +01:00
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
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
a7128ffa04
Comment.
2019-01-04 19:56:15 +01:00
92ff284f82
Remove redundant code.
2019-01-04 19:35:33 +01:00
360a977520
Fix allDepleted(). Add tests.
2019-01-04 19:34:42 +01:00
a309ec1b0b
Add filament auto deplete engine for multi-material prints with MMUv2.
2019-01-03 22:58:25 +01:00
4e300fd552
minTemp
...
safety heaters management during/after minTemp
2019-01-02 18:25:41 +01:00
3ab1daf722
MMU_DEBUG temporarily enabled
2018-12-21 23:17:32 +01:00
88441f7f2f
scan power failures fix
2018-12-21 23:07:39 +01:00
6ba86acebc
send A (abort) command to mmu only when loading phase of T-code
2018-12-21 22:33:01 +01:00
e36e58f385
show sensor on/off temporarily changed to unlocalized strings
2018-12-21 21:28:57 +01:00
688d4a8a82
missing defines in variant files
2018-12-21 21:05:54 +01:00
ba57986b72
merge changes from upstream
2018-12-21 20:58:38 +01:00
5462d451e1
show power failures in fail stats menu, shorter load to nozzle if idler sensor detected
2018-12-21 20:56:45 +01:00
d1ca73597b
Merge pull request #1412 from XPila/V3_5
...
Repeat last MMU command after timeout
2018-12-21 20:53:24 +01:00
d292e877df
load to nozzle shortened, sensor menu moved to support
2018-12-21 18:51:13 +01:00
3c64bad1cb
initial version which works on old and new hw, initial version of idler sensor detection
2018-12-21 17:12:16 +01:00
75523b1497
Merge pull request #1417 from PavelSindler/z_cal_endstops
...
version changed
2018-12-19 20:08:22 +01:00
acbfe89f04
version changed
2018-12-19 20:07:18 +01:00
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
f79137898a
Fix - move down after calibrate Z (PFW718)
2018-12-19 19:22:03 +01:00
40fe52202d
stop paused print fix: saved_printing set to false when doing stop print
2018-12-19 19:20:09 +01:00
b8c5b6259e
Fix - move down after calibrate Z (PFW718)
2018-12-19 14:40:10 +01:00
c69d4aa914
Move 1mm down with disabled endstop after calibrate_z_auto (PFW718)
2018-12-19 13:43:49 +01:00
16e5fb50dd
Remove M601 from queue before saving state (prevent infinite loop - PFW713)
2018-12-18 20:39:38 +01:00
34f116b4d9
Move 1mm down with disabled endstop after calibrate_z_auto (PFW718)
2018-12-18 19:57:29 +01:00
b5430c2968
M600: consume click
2018-12-18 19:10:02 +01:00
75d31fd2cb
Repeat last MMU command after timeout
2018-12-18 18:47:54 +01:00
880163dbcb
missing prototypes
2018-12-18 17:38:24 +01:00
fc5d7e35ef
fail stats mmu function definitions
2018-12-18 17:35:41 +01:00
11ab5dfd36
fail stats menu for mmu defined for MK2.5 version
2018-12-18 17:33:27 +01:00
4543949cac
build without MMU_IDLER_SENSOR_PIN defined
2018-12-18 17:29:44 +01:00
fc33affbda
temporary change
2018-12-18 17:24:29 +01:00
PavelSindler
PavelSindler
MRprusa3d
Robert Pelnar
MRprusa3d
Marek Bel