3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,207 Commits 3 Branches 78 Tags 40 MiB
58351fb27a
Commit Graph

221 Commits

Author SHA1 Message Date
Marek Bel
bf1a55ab02 Add mmu_continue_loading blocking variant and use it for usb printing, so that "ok" is not returned to the controller in case MMU load failed. 
Known limitation: MMU load failed is not handled properly if it happens again after user clicked printer button to continue print.
 2019-04-04 18:15:37 +02:00
PavelSindler
fbe68cb287 variables scope changed 2019-03-21 19:37:34 +01:00
PavelSindler
c05561d6b1
Merge pull request #1607 from PavelSindler/7x7 
7x7 mbl and switching mmu modes
 2019-03-15 19:55:15 +01:00
Marek Bel
ffe45bdef3 Disable mmu filament cutter feature. 2019-03-15 03:38:37 +01:00
PavelSindler
80ef2686ae mmu mode switching fix 2019-03-14 18:17:40 +01:00
PavelSindler
b20d9171b6 Merge remote-tracking branch 'upstream/MK3' into 7x7 2019-03-12 11:47:17 +01:00
PavelSindler
c9cff11732
Merge pull request #1593 from MRprusa3d/PFW-647 
mode switching, G-code unification
 2019-03-12 11:40:43 +01:00
PavelSindler
819a91ab1e switching stealth/normal mode for mmu in settings menu and tune menu 2019-03-11 12:33:22 +01:00
PavelSindler
141b78c048 number of Z-probes defualt value changed from 4 to 3, mmu stealth mode switch in settings menu 2019-03-10 16:03:46 +01:00
MRprusa3d
20a03d703d G-code unification 
"FSENSOR_RECOVER" ->-> "PRUSA fsensor_recover"
 2019-03-05 13:36:13 +01:00
Marek Bel
f161d3ade4 Change formatting. 2019-03-04 22:17:43 +01:00
Marek Bel
b2255c8be9 Preheat nozzle before loading filament in M600 (change filament) gcode. 
This fixes problem of not heating the nozzle when retrying load after MMU load failed.
 2019-03-04 22:00:24 +01:00
mkbel
27f69bb761
Merge pull request #1570 from PavelSindler/mmu_stealth_mode 
mmu stealth mode
 2019-03-04 17:09:11 +01:00
PavelSindler
7f92d73a40 MMU_STEALTH_MODE -> MMU_FORCE_STEALTH_MODE; activate_stealth_mode() function update 2019-03-04 17:04:22 +01:00
Marek Bel
22500970ba Remove commented out code, fix formatting. 2019-03-01 16:18:16 +01:00
PavelSindler
85c208f9f4
Merge branch 'MK3' into bad_load_cut 2019-03-01 14:55:55 +01:00
PavelSindler
22c0d6e230
Merge pull request #1577 from mkbel/add_cut 
Add MMU cut filament
 2019-03-01 14:53:12 +01:00
PavelSindler
e14e4be94e
Merge pull request #1575 from mkbel/add_ramming_eject 
Add filament ramming to eject filament.
 2019-03-01 14:21:23 +01:00
PavelSindler
0db721b244
Merge pull request #1559 from mkbel/detect_bad_load 
Move extruder forth and back after filament detected by sensor to det…
 2019-03-01 14:21:04 +01:00
Marek Bel
02a692c5d9 Store cutter enable state in EEPROM. 2019-02-27 17:34:03 +01:00
Marek Bel
4a4eb9962c Cut filament when cutter is enabled and MMU load fails. 2019-02-27 10:42:26 +01:00
MRprusa3d
2f1e968563 "lcd_update_enable()" replacement 2019-02-26 23:17:52 +01:00
Marek Bel
a67645fda6 Merge branch 'add_cut' into bad_load_cut 2019-02-26 18:35:55 +01:00
Marek Bel
815231bc26 Add MMU cut filament menu. 2019-02-26 17:58:00 +01:00
Marek Bel
6c9dd4f272 Add filament ramming to eject filament. 2019-02-26 13:41:28 +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
Marek Bel
8f5fbe569c Merge branch 'MK3' into detect_bad_load 2019-02-25 10:41:26 +01:00
PavelSindler
8e3d52ee6d fix compilation error for MK2.5, make code more readable 2019-02-22 17:15:40 +01:00
PavelSindler
26cab2911f mmu stealth mode 2019-02-22 16:30:54 +01:00
MRprusa3d
ed93f1b7f0 preHeat @ filament management 
another funcionality IIb
 2019-02-21 15:27:22 +01:00
MRprusa3d
a54c68b874 preHeat @ filament management 
another funcionality II
 2019-02-21 04:45:44 +01:00
Marek Bel
8b858286ac Document. 2019-02-21 02:30:01 +01:00
Marek Bel
326c8492b5 Move extruder forth and back after filament detected by sensor to detect bad load. 2019-02-21 01:19:26 +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
PavelSindler
9d76b6912c merge new changes from upstream 2019-02-15 17:05:39 +01:00
PavelSindler
69ff37729e whitespace 2019-02-15 14:19:30 +01:00
PavelSindler
0f791ce47f mmu needs attention: idler error fix 2019-02-15 14:17:47 +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
a5437cb15b Resend MMU T commands only. 
This solves problem with unload repeated if unload takes too long, second ok reply then triggers Wait end and resumes print.
 2019-02-13 22:29:29 +01:00
Marek Bel
a4032e437e Add MMU wait command after MMU load failed. Resume print when MMU wait command returns OK. 2019-02-13 21:28:21 +01:00
Marek Bel
daaec0ef04 Convert MmuCmd to enum class. 2019-02-13 17:12:35 +01:00
Marek Bel
8e23e7f322 Save some flash by using smaller type for filament. 2019-02-13 16:37:54 +01:00
Marek Bel
9e873ac0f7 Use enum for mmu_cmd instead of plain integer type. 2019-02-13 01:51:39 +01:00
Marek Bel
bb7eeef1f4 Define debug printf and puts functions to make code more readable. 2019-02-12 23:24:23 +01:00
Marek Bel
e1216934ef Save flash by defining underlying type and omitting number value. 2019-02-12 21:53:11 +01:00
Marek Bel
3379fb4866 Convert mmu_state to enum. 2019-02-12 21:43:26 +01:00
Marek Bel
6c8d9c6fb4 Retry filament load on MMU load failure once. 2019-02-11 23:43:42 +01:00
Marek Bel
d33b24c281 Unload filament after MMU load failed so MMU unit can be controlled by its buttons. 2019-02-11 23:24:55 +01:00
PavelSindler
9926468c91 Merge remote-tracking branch 'upstream/MK3' into variants 2019-01-30 17:26:45 +01:00
PavelSindler
83510ed489 check_for_ir_sensor 2019-01-28 17:27:16 +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
Robert Pelnar
434a723151 Timing functions 'micros' and 'delay' replaced in whole source with 'micros2' and 'delay2' 2019-01-27 17:37:27 +01:00
PavelSindler
fc1491670f mmu_idler_sensor_detected -> ir_sensor_detected 2019-01-25 18:03:05 +01:00
PavelSindler
6b6a3d7d5f MMU_IR_SENSOR_PIN -> IR_SENSOR_PIN 2019-01-25 18:01:17 +01:00
PavelSindler
7e3a1c7d45 merge changes from upstream 2019-01-25 17:57:24 +01:00
PavelSindler
661c40ef75
Merge pull request #1472 from mkbel/IR_fsens_selftest 
Ir fsens selftest
 2019-01-25 13:14:18 +01:00
PavelSindler
f4e5c729ac
Merge pull request #1451 from mkbel/Tx_fix 
Tx fix
 2019-01-24 13:41:43 +01:00
PavelSindler
e0c1e4a02d version which should on all printer versions: autoload, selftest, filament detection, filament sensors initialization, filament menus 2019-01-24 01:12:30 +01:00
Marek Bel
c371a5ea65 Document. 2019-01-22 14:05:08 +01:00
Marek Bel
a92d9c782b Add IR sensor test. 2019-01-22 11:29:55 +01:00
PavelSindler
ca8cb3784c
Merge pull request #1456 from mkbel/Fix_load_fail_current 
Do not disable motor currents when print is paused due to mmu load er…
 2019-01-16 12:49:38 +01:00
Marek Bel
3af1f81269 Do not disable motor currents when print is paused due to mmu load error. 2019-01-15 21:40:02 +01:00
Marek Bel
d09ff5c3e7 Remove commented out code. 2019-01-15 01:30:54 +01:00
Marek Bel
3b175459b1 Fix filament loaded to far and MMU idler never disengaged after Tx command on printer with idler sensor. 2019-01-15 01:28:51 +01:00
Marek Bel
2db42c8577 Merge branch 'MK3' into auto_deplete_2 2019-01-07 21:39:46 +01:00
PavelSindler
7946cd7250 eeprom write nr. limitation 2019-01-04 22:23:11 +01:00
PavelSindler
02262ff7ca mmu load fail: possibility to unload/eject filament from menu 2019-01-04 21:37:19 +01:00
Marek Bel
d89c03a0f1 Documentation. 2019-01-04 21:26:13 +01:00
Marek Bel
1a219b2372 Mark filament as depleted when detected by MMUv2 FINDA. Do not try to load filament if it is marked depleted, load next filament instead. Force user action when all filaments are marked as depleted. 2019-01-04 21:11:42 +01:00
PavelSindler
b7b7e9387f do resend attempts before pausing print (mmu needs attention state) so the print would not be paused if T-code is not received correctly by mmu; prevent infinite loading 2019-01-04 21:07:52 +01:00
PavelSindler
88441f7f2f scan power failures fix 2018-12-21 23:07:39 +01:00
PavelSindler
6ba86acebc send A (abort) command to mmu only when loading phase of T-code 2018-12-21 22:33:01 +01:00
PavelSindler
ba57986b72 merge changes from upstream 2018-12-21 20:58:38 +01:00
PavelSindler
5462d451e1 show power failures in fail stats menu, shorter load to nozzle if idler sensor detected 2018-12-21 20:56:45 +01:00
PavelSindler
d292e877df load to nozzle shortened, sensor menu moved to support 2018-12-21 18:51:13 +01:00
PavelSindler
3c64bad1cb initial version which works on old and new hw, initial version of idler sensor detection 2018-12-21 17:12:16 +01:00
Robert Pelnar
75d31fd2cb Repeat last MMU command after timeout 2018-12-18 18:47:54 +01:00
PavelSindler
4543949cac build without MMU_IDLER_SENSOR_PIN defined 2018-12-18 17:29:44 +01:00
PavelSindler
fc33affbda temporary change 2018-12-18 17:24:29 +01:00
PavelSindler
7703125b2e retry unload movements (T-codes, M702 C) if filament detected by idler sensor, then turn off stepper and wait, MMU_LOAD_TIME prolonged 2018-12-18 16:08:29 +01:00
PavelSindler
27c8612360 use just short movement for unloading filament 2018-12-17 21:25:07 +01:00
PavelSindler
24ef6deeed typo fixed 2018-12-13 16:43:40 +01:00
PavelSindler
9c4f086add fixed statistics for MMU_FAIL 2018-12-13 01:09:21 +01:00
PavelSindler
df71398066 statistics fix 2018-12-13 00:43:27 +01:00
PavelSindler
a9829b6a1a add statistics and idler sensor state 2018-12-13 00:12:00 +01:00
PavelSindler
665f1d7ffe pause print after N continue loading attempts and wait for user, then start print and repeat last T-code 2018-12-12 23:36:50 +01:00
PavelSindler
29ecd4ec7a duplicit T-codes execution improved, E-stepper movements when waiting for ok from mmu, continue loading function improved, eeprom: fail stats for mmu 2018-12-12 22:32:47 +01:00
PavelSindler
c256af0a1c unknown filament added; the same T-code will be not executed twice in a row; continue loading 2018-12-12 14:50:55 +01:00
PavelSindler
e52e53d1eb send continue loading commands periodically if initial load fails 2018-12-12 13:54:17 +01:00
Robert Pelnar
35378769fd MMU - idler sensor 2018-12-06 19:19:50 +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
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
PavelSindler
22cf2c6b6b M600 load messages synchronization fixed 2018-11-09 15:31:44 +01:00
Marek Bel
e95c2ad592 Display auto deplete as not available if filament sensor is disabled. 2018-11-05 17:43:07 +01: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
PavelSindler
d18013e5a2 manage response now contains showing nozzle temperature and possibility to resume saved nozzle temperature 2018-11-02 19:31:10 +01:00