3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,585 Commits 3 Branches 78 Tags 40 MiB
22c0d6e230
Commit Graph

629 Commits

Author SHA1 Message Date
PavelSindler
22c0d6e230
Merge pull request #1577 from mkbel/add_cut 
Add MMU cut filament
 2019-03-01 14:53:12 +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
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
MRprusa3d
be0ed46335 preHeat @ filament management 
another funcionality III
 2019-02-22 03:09:50 +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
MRprusa3d
da0867cfc5 preHeat @ filament management 
another funcionality
 2019-02-20 03:01:33 +01: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
MRprusa3d
0c1f9b5100 preHeat @ filament management 
target temperature keeping
 2019-02-15 02:25:44 +01: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
9e873ac0f7 Use enum for mmu_cmd instead of plain integer type. 2019-02-13 01:51:39 +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
726d5aa3c3 typo fixed 2019-02-06 16:29:10 +01:00
PavelSindler
2fe8e0670a MK2 build fail fixed 2019-02-06 16:15:19 +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
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
PavelSindler
f9298b37b8 fan check hotfix (selftest, measuring RPM, fan errors) 2019-02-05 04:02:38 +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
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
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
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
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
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
29e156b26d printer types updated 2019-01-28 19:48:46 +01:00
PavelSindler
25d54d43aa menu update 2019-01-28 19:41:02 +01:00
PavelSindler
dd4d8e1277 calibrate z endstop update 2019-01-28 19:23:19 +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
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