PavelSindler
|
ea20529945
|
merge changes from upstream
|
2019-02-04 15:23:39 +01:00 |
|
PavelSindler
|
c62564b2ca
|
Merge pull request #1500 from MRprusa3d/PFW-556
minTemp
|
2019-02-04 14:58:42 +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 |
|
Robert Pelnar
|
3cce433dcb
|
Merge remote-tracking branch 'upstream/MK3' into MK3-bed_fast_pwm
|
2019-01-28 22:42:20 +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 |
|
Robert Pelnar
|
d7c38382b4
|
Merge remote-tracking branch 'upstream/MK3' into MK3-bed_fast_pwm
|
2019-01-28 14:22:55 +01:00 |
|
PavelSindler
|
517f8481cc
|
Merge pull request #1488 from prusa3d/revert-1487-revert-1470-MK3-bed_fast_pwm
Revert "Revert "Mk3 bed fast pwm""
|
2019-01-28 14:20:54 +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
|
7a35d00901
|
Merge pull request #1487 from prusa3d/revert-1470-MK3-bed_fast_pwm
Revert "Mk3 bed fast pwm"
|
2019-01-28 10:54:08 +01:00 |
|