Commit Graph

2992 Commits

Author SHA1 Message Date
PavelSindler
e028db7bf9 version change 2019-02-06 23:30:01 +01:00
PavelSindler
9ad453bb2b
Merge pull request #1509 from PavelSindler/dev2
message change
2019-02-06 23:24:30 +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
8d74f580d2
Merge pull request #1508 from prusa3d/revert-1507-MK3
Revert "Dictionaries and po files updated"
2019-02-06 20:36:05 +01:00
PavelSindler
22493c6a3c
Revert "Dictionaries and po files updated" 2019-02-06 20:35:47 +01:00
PavelSindler
2c11391159
Merge pull request #1507 from XPila/MK3
Dictionaries and po files updated
2019-02-06 20:13:36 +01:00
Robert Pelnar
f9d6d0802a po files updated 2019-02-06 20:08:29 +01:00
Robert Pelnar
00ab95179f Dictionaries updated 2019-02-06 19:58:07 +01:00
PavelSindler
166f886203
Merge pull request #1506 from PavelSindler/dev2
sw pwm for print fan, bed hw pwm, fsensor changes...
2019-02-06 19:46:00 +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
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