Commit Graph

106 Commits

Author SHA1 Message Date
Rob McKenzie 2c6c976fe3 Merging Prusa 3.5.0-RC1 Upstream 2018-11-14 13:06:34 +10:00
Rob McKenzie 6d12234031 Timing Testing and cleaning 2018-11-14 05:36:12 +10: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
Robert Pelnar bfc343c7c5 PFW658 - disable extruder motor while changing filament with mmu2 (prevents extruder motor overheating) 2018-11-13 16:04:46 +01:00
MRprusa3d 5e8e96b5d7 MMU module adjustment
MMU module conditional compilation adjustment for MMU v1
2018-11-12 20:09:54 +01:00
TheZeroBeast 6b5747750a
Heater Safety When Failed to load/unload 2018-11-11 20:17:57 +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
Rob McKenzie 91ca177a88 format.sh 2018-11-10 01:40:15 +10:00
PavelSindler 22cf2c6b6b M600 load messages synchronization fixed 2018-11-09 15:31:44 +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
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
Rob McKenzie 8d79f21ba3 Further work on comms. 2018-11-08 03:54:54 +10:00
TheZeroBeast 4a4a10575c
Added command MMU => MK3 requesting to look for load 2018-11-08 01:15:40 +10:00
Rob McKenzie 726326e755 . 2018-11-07 17:41:20 +10:00
Rob McKenzie b9cfa89fc4 . 2018-11-07 03:31:33 +10:00
Rob McKenzie 3d7841f3aa Comms ACK working for new FS command
Added FS command to MMU when filament is sensed at MK3 FSensor
2018-11-07 03:29:39 +10:00
TheZeroBeast 2c084d4fd9
case 20: mod 2018-11-07 01:18:32 +10:00
TheZeroBeast 4e21d7482c
added mmu_loop case 20: 2018-11-07 01:01:16 +10:00
Rob McKenzie e81af1a06e comms work 2018-11-06 17:59:44 +10:00
Marek Bel e95c2ad592 Display auto deplete as not available if filament sensor is disabled. 2018-11-05 17:43:07 +01:00
TheZeroBeast 35f85c00d0
Starting implementation of serial ACK verification for each MMU-CMD 2018-11-05 21:30:05 +10:00
PavelSindler 0a2ad97bc6
Merge pull request #1290 from PavelSindler/mmu_improvements
mmu improvements: load to nozzle, gcodes for single material mode, M600 fix
2018-11-05 10:38:05 +01:00
Rob McKenzie dbac1c7159 formatting 2018-11-05 11:32:41 +10:00
Rob McKenzie 54a69d7444 added MK3 Versioning and link to MMU2-FW 2018-11-05 11:19:45 +10:00
MacBookPro 537db0ee12 stability improovements, speed reduced for load. 2018-11-03 23:50:40 +10:00
MacBookPro 1f1b72f3bb fixed first load failing due to def being extruder 0 instead of -10. e.g. something other than one of the extruder values 2018-11-03 13:25:19 +10:00
MacBookPro bdfe509bc3 push some unload fixes 2018-11-03 08:51:57 +10:00
PavelSindler d18013e5a2 manage response now contains showing nozzle temperature and possibility to resume saved nozzle temperature 2018-11-02 19:31:10 +01:00
MacBookPro b5d6642e10 Rolled back to working without unload sense and hedged recover from filament at boot for now 2018-11-02 22:39:01 +10:00
MacBookPro 6c56deae4f move files, I'm so tired LOL 2018-11-02 19:25:43 +10:00
PavelSindler 1342c312a0 use feedrate 200mm/min for final feed (faster and better filament sensor function), show default welcome message when load is finished 2018-11-01 16:51:18 +01:00
PavelSindler 96ce324b7c load to nozzle improved, unified feedrate and E-distance for final feed used in load filament function, M600 etc. 2018-11-01 16:29:09 +01:00
PavelSindler e80af46503 load to nozzle and Tx and Tc codes: intial version 2018-10-31 21:48:05 +01:00
TheZeroBeast c5236c84df
Updated mmu_loop() Case 3: 2018-10-29 12:30:50 +10:00
TheZeroBeast 8fd41841c8
Updated Case 3: 2018-10-29 09:19:11 +10:00
TheZeroBeast 94a52e8d58
Initiale upload 2018-10-29 09:03:53 +10:00
mkbel cdb06c65f3
Merge pull request #1275 from PavelSindler/3_4_2_branch_merging
3_4_2 branch merging into MK3
2018-10-25 21:45:51 +02:00
PavelSindler d1de9fff60 mmu_loop: missing return added 2018-10-22 20:38:32 +02:00
PavelSindler bc247ca02c MK2.5 sw reset at setup function 2018-10-19 17:54:48 +02:00
PavelSindler b8f92fdfa9 MK2.5 printers set mmu to stealth mode (using Mx code), required mmu2 buildnr can be different for MK2.5 and MK3 printers 2018-10-18 02:44:16 +02:00
Marek Bel ab2d350ed1 Don't enable lcd update in lcd_show_fullscreen_message_and_wait_P(). Don't show menu in wizard when ejecting filament. 2018-09-17 21:23:13 +02:00
Marek Bel a687b8e64a Don't enable lcd update inside mmu_eject_filament(). 2018-09-17 17:12:36 +02:00
Marek Bel de2100ac7b Merge branch 'MK3' into MK3_dev 2018-09-12 15:22:12 +02:00
PavelSindler 1bb9e9ed92 MMU_DEBUG 2018-09-10 20:39:28 +02:00
PavelSindler 6fa798aa83 init 2018-09-10 20:08:13 +02:00
Marek Bel 0e50c388af Save 1K flash memory. 2018-09-06 15:06:46 +02:00
Marek Bel 0d99dc0a3f PFW-543 Add filament ramming when unloading filament with MMU. 2018-09-06 15:06:33 +02:00
PavelSindler ed43913c5c
Merge pull request #1099 from mkbel/fix_compiler_warnings
Fix compiler warnings
2018-09-05 16:53:51 +02:00