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