Commit Graph

2124 Commits

Author SHA1 Message Date
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 594b769e68 Revert "Merge remote-tracking branch 'origin/MMU-MK3-FSensorBuild-Patch1' into MMU-MK3-FSensorBuild-Patch1"
This reverts commit 6584dfe872.
2018-11-08 01:12:50 +10:00
Rob McKenzie 6584dfe872 Merge remote-tracking branch 'origin/MMU-MK3-FSensorBuild-Patch1' into MMU-MK3-FSensorBuild-Patch1 2018-11-08 01:09:30 +10:00
TheZeroBeast bd8b7bd9fb Revert "Added command MMU => MK3 requesting to look for load"
This reverts commit bb379d4fbf.
2018-11-08 01:09:03 +10:00
TheZeroBeast bb379d4fbf
Added command MMU => MK3 requesting to look for load 2018-11-08 01:06:37 +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
TheZeroBeast afec270fe6
. 2018-11-06 01:15:14 +10:00
TheZeroBeast 35f85c00d0
Starting implementation of serial ACK verification for each MMU-CMD 2018-11-05 21:30:05 +10: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
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
TheZeroBeast 5beb4c683d
Pending Testing - Recover from filament loaded at boot 2018-11-02 13:53:42 +10:00
TheZeroBeast cff6e6e4c5
Implemented MK3-FSensor on MMU Unload
and started booting with filament loaded recovery
2018-11-02 10:42:57 +10:00
TheZeroBeast 4a52683ad1
Updated fsensor_check_autoload( 2018-10-29 13:07:07 +10:00
TheZeroBeast 4f98fa1a64
Updated manage_inactivity 2018-10-29 13:05:18 +10: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
TheZeroBeast 65b5ca51b3
Merge pull request #12 from prusa3d/MK3
Merge Upstream
2018-10-29 06:10:35 +10:00
PavelSindler 6a82af487e
Merge pull request #1278 from XPila/MK3-new_bs
New lang - fixed french langcode and comparsion in lang-clean script
2018-10-26 13:18:48 +02:00
mkbel 16c2f6fe8e
Merge pull request #1279 from PavelSindler/turn_on_FINDA
mmu2: filament senor (FINDA) menu fix
2018-10-25 21:53:11 +02:00
PavelSindler a9317b4d36 upstream/MK3 merge 2018-10-25 21:46:32 +02: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
mkbel f7cd0ffbb0
Merge pull request #1280 from PavelSindler/MK3_dev_merging_update
Mk3 dev merge into MK3
2018-10-25 21:40:49 +02:00
PavelSindler 0e0dbad871 #ifdef __cplusplus added to allow including to .c file 2018-10-25 21:06:37 +02:00
PavelSindler 01529f18d2 upstream/MK3 merge 2018-10-25 20:57:27 +02:00
PavelSindler a6a81c6ea6 mmu2: filament senor (FINDA) can be switched ON/OFF from menu without dependency on pat9125 state 2018-10-25 18:26:26 +02:00
Robert Pelnar d301aa0e8c New lang - fixed french langcode and comparsion in lang-clean script 2018-10-25 18:16:36 +02:00
PavelSindler 2566ae0b08
Merge pull request #1264 from XPila/MK3-new_bs
New lang,  arduino 1.8.5
2018-10-23 19:22:46 +02:00
Robert Pelnar 7e9eaf0f4b New lang, arduino 1.8.5 - disable multilanguage support by default 2018-10-23 17:32:52 +02:00
PavelSindler bd8ca8d652 removed redefinition of functions in fsensor.cpp 2018-10-22 20:51:44 +02:00
PavelSindler d1de9fff60 mmu_loop: missing return added 2018-10-22 20:38:32 +02:00
PavelSindler d005005e22 Merge remote-tracking branch 'upstream/3_4_2' into 3_4_2_branch_merging 2018-10-22 20:33:38 +02:00
PavelSindler 940f436a5f merge MK3_dev into MK3 2018-10-22 20:25:29 +02:00
XPila be9f921153
Merge pull request #1268 from PavelSindler/3_4_2
MK2.5 MMU sw reset at setup function
2018-10-19 18:03:03 +02:00
PavelSindler bc247ca02c MK2.5 sw reset at setup function 2018-10-19 17:54:48 +02:00
Robert Pelnar ac18eb67c0 New lang, arduino 1.8.5 - boot_app debug output
+ variable _uartout linkage fix
+ DEBUG_DCODE5
2018-10-18 16:20:14 +02:00
Robert Pelnar 563052d015 New lang, arduino 1.8.5 - language.c - DEBUG_SEC_LANG fix 2018-10-18 15:39:08 +02:00