Commit Graph

2230 Commits

Author SHA1 Message Date
Rob McKenzie ec8844d744 Upstream Merging 2018-11-14 16:14:15 +10:00
Rob McKenzie 2c6c976fe3 Merging Prusa 3.5.0-RC1 Upstream 2018-11-14 13:06:34 +10:00
Rob McKenzie a43afffbde 3-FSensorBuild: 2018-11-14 05:36:50 +10:00
Rob McKenzie 6d12234031 Timing Testing and cleaning 2018-11-14 05:36:12 +10:00
PavelSindler 0398c3c26b
Merge pull request #1335 from PavelSindler/T_codes
version change
2018-11-13 17:49:26 +01:00
PavelSindler 51c80352e8 version change 2018-11-13 17:48:42 +01:00
PavelSindler 51b4858a87
Merge pull request #1334 from XPila/V3_5
PFW658 - disable extruder motor while changing filament with mmu2 (pr…
2018-11-13 16:10:24 +01:00
XPila c41b045ea7
Merge pull request #1333 from PavelSindler/T_codes
T-code fix
2018-11-13 16:09:52 +01:00
Robert Pelnar bfc343c7c5 PFW658 - disable extruder motor while changing filament with mmu2 (prevents extruder motor overheating) 2018-11-13 16:04:46 +01:00
PavelSindler 15d0b083ed whitespace 2018-11-13 15:58:21 +01:00
PavelSindler 17a1049f23 T-codes fix 2018-11-13 15:56:19 +01:00
PavelSindler f297e72864
Merge pull request #1332 from XPila/V3_5
Fix PFW657 - filament runout detection is not working after autoload …
2018-11-13 14:10:11 +01:00
Robert Pelnar d886ba1100 Fix PFW657 - filament runout detection is not working after autoload disabled from menu. 2018-11-13 14:05:15 +01:00
XPila 3d97d81734
Merge pull request #1329 from PavelSindler/M600_load_fil_message
M600 filament load progress bar changes
2018-11-12 20:52:06 +01:00
PavelSindler 27db32cbd0
Merge pull request #1331 from XPila/V3_5
M907 fix - value in mA (PFW655)
2018-11-12 20:49:09 +01:00
Robert Pelnar 41b885c537 M907 fix - value in mA (PFW) 2018-11-12 20:39:25 +01:00
PavelSindler 077697785a
Merge pull request #1330 from MRprusa3d/PFW-656
MMU module adjustment
2018-11-12 20:19:37 +01:00
MRprusa3d 5e8e96b5d7 MMU module adjustment
MMU module conditional compilation adjustment for MMU v1
2018-11-12 20:09:54 +01:00
PavelSindler 32da5bc039 progress bar time counted from feedrate and E - distance 2018-11-12 19:55:53 +01:00
PavelSindler f4c1e7924f M600: show progress bar during first filament load 2018-11-12 18:35:06 +01:00
TheZeroBeast 6b5747750a
Heater Safety When Failed to load/unload 2018-11-11 20:17:57 +10:00
Rob McKenzie 20e854d336 premade hex included 2018-11-11 09:18:55 +10:00
TheZeroBeast fa37c28b11
version and bn update 2018-11-10 22:43:39 +10:00
TheZeroBeast 3caaa01eb4
Merge pull request #14 from TheZeroBeast/MMU-MK3-FSensorBuild-Patch1
Mmu mk3 f sensor build patch1
2018-11-10 22:41:42 +10:00
Rob McKenzie 37b70d50e2 c0 timing update 2018-11-10 22:20:28 +10:00
Rob McKenzie 3a89cce04f Further #8 fix, wasn't checking sensor when M600 active, tested working now. 2018-11-10 16:25:15 +10:00
PavelSindler 0f02f9a4e3
Merge pull request #1324 from PavelSindler/MK3_for_merging
version change
2018-11-09 19:56:06 +01:00
PavelSindler 10a81ea768 version change 2018-11-09 19:16:53 +01:00
mkbel 3189fcb8de
Merge pull request #1323 from PavelSindler/MK3_for_merging
resume print fix: never disable steppers when preheating nozzle
2018-11-09 18:45:26 +01:00
PavelSindler 5931d15566 whitespace 2018-11-09 18:31:28 +01:00
PavelSindler c991c8b314 resume print fix: wait for heater() never disable steppers 2018-11-09 18:29:35 +01:00
Rob McKenzie c8f5809e1e remove .orig 2018-11-10 01:41:33 +10:00
Rob McKenzie 91ca177a88 format.sh 2018-11-10 01:40:15 +10:00
XPila 10b79e918b
Merge pull request #1321 from PavelSindler/M600_load_fix
M600 load messages synchronization fixed
2018-11-09 15:40:00 +01:00
PavelSindler 22cf2c6b6b M600 load messages synchronization fixed 2018-11-09 15:31:44 +01:00
PavelSindler 7022373885
Merge pull request #1320 from XPila/V3_5
localization - lang-export.sh + po files + tmc2130_print_currents fixed (M913)
2018-11-09 15:27:43 +01:00
Robert Pelnar 3afebcc9cc tmc2130_print_currents fixed (for obsolete M913) 2018-11-09 15:20:25 +01:00
Robert Pelnar 31ce725828 lang-export.sh - script for generating po and pot files from dictionaries
+generated po and pot files.
2018-11-09 14:48:27 +01:00
Robert Pelnar d9eac401c5 Removed old po and pot files 2018-11-09 14:40:47 +01:00
PavelSindler 5f166374ab
Merge pull request #1319 from XPila/V3_5
Fix PFW651 - cannot upload MK3 languages with slic3r (firmware compil…
2018-11-09 13:10:51 +01:00
TheZeroBeast c2c2fd3d2f
Fixes issue #8
Fixes issue #8 on https://github.com/TheZeroBeast/MM-control-01/issues/8

Cleared filamentLoaded bool when MMU Ejecting filament.
2018-11-09 21:28:34 +10:00
Robert Pelnar 6c13225f49 Fix PFW651 - cannot upload MK3 languages with slic3r (firmware compiled on linux arduino 1.8.5 + lto) 2018-11-09 10:45:16 +01:00
Rob McKenzie ebbed236a0 Fixed 2130 init for homing mid print. 2018-11-09 01:04:02 +10:00
Rob McKenzie 4b4e400875 Testing proceeding, small idler sync issue when recovering from failed unload 2018-11-08 22:25:30 +10:00
PavelSindler 0e7fb26dc5
Merge pull request #1316 from MRprusa3d/PFW-635
MeshBed Levelling Fail IV
2018-11-08 10:18:08 +01:00
PavelSindler 6d59f88a8e
Merge pull request #1315 from MRprusa3d/PFW-639
Bed PowerMonitor III
2018-11-08 10:08:31 +01:00
MRprusa3d ccb58ae7c9 Revert "MeshBed Levelling Fail IV"
This reverts commit bd554df02e.
2018-11-08 04:02:32 +01:00
MRprusa3d bd554df02e MeshBed Levelling Fail IV 2018-11-08 03:54:05 +01:00
MRprusa3d fd45dd64dc Bed PowerMonitor III 2018-11-08 03:32:00 +01:00
Rob McKenzie 8d79f21ba3 Further work on comms. 2018-11-08 03:54:54 +10:00