PavelSindler
|
e6ac75f6a1
|
Merge pull request #1061 from mkbel/MK3_dev
Merge branch 'MK3' into MK3_dev
|
2018-08-24 16:27:07 +02:00 |
|
Marek Bel
|
050a7c41d0
|
Fix "Check MMU. Fix the issue and then press button on MMU unit." shown instead of "Loading filament 1".
|
2018-08-24 03:49:51 +02:00 |
|
Marek Bel
|
3c9047c9cd
|
Remove usage of global variable tmp_extruder in mmu_M600_load_filament. For automatic load filament, use mmu_extruder value as filament previously selected.
|
2018-08-23 23:34:45 +02:00 |
|
Marek Bel
|
54138407dd
|
Encapsulate MMU internal state.
|
2018-08-23 23:34:38 +02:00 |
|
Marek Bel
|
f1c51502fd
|
Merge branch 'MK3' into MK3_dev
|
2018-08-23 23:28:20 +02:00 |
|
Marek Bel
|
142bf28dc2
|
Clear communication buffer when sending load filament command to MMU.
This fixes PFW-517 in the moment, when the problem with not displaying "Loading filament 1" to "Loading filament 5" has appeared for the first time.
|
2018-08-23 22:05:56 +02:00 |
|
PavelSindler
|
a81b8dbd61
|
remove manage_heater
|
2018-08-22 16:09:38 +02:00 |
|
PavelSindler
|
d2aeb40bee
|
manage response function update
|
2018-08-22 15:46:36 +02:00 |
|
PavelSindler
|
f99196a7a0
|
fix reseting during filament change
|
2018-08-22 11:09:12 +02:00 |
|
Marek Bel
|
3b3d6ab472
|
Merge branch 'MK3' into MK3_dev
|
2018-08-21 17:56:34 +02:00 |
|
Robert Pelnar
|
315bfc43dd
|
MMU communication fix
|
2018-08-21 16:41:01 +02:00 |
|
Robert Pelnar
|
94423e6f7e
|
MMU communication - mmu_ready
|
2018-08-20 20:53:53 +02:00 |
|
Marek Bel
|
ac62117d6b
|
Merge remote-tracking branch 'prusa3d/MK3' into MK3_dev
|
2018-08-13 19:38:55 +02:00 |
|
Robert Pelnar
|
8409a26594
|
Live adjust Z - display zero in case of invalid calibration status (same logic in babystep_load and _lcd_babystep)
|
2018-08-10 19:55:50 +02:00 |
|
Marek Bel
|
d94a1c5952
|
Merge remote-tracking branch 'prusa3d/MK3' into MK3_dev
|
2018-08-09 21:26:33 +02:00 |
|
Robert Pelnar
|
796079bb08
|
MMU2 communication - connection after reset, fw versions, state machine
+removed debug log from tmc2130
|
2018-08-09 17:43:43 +02:00 |
|
Robert Pelnar
|
10cc077ee4
|
mmu_enabled = true removed
|
2018-08-08 21:05:25 +02:00 |
|
Robert Pelnar
|
310751397c
|
line endings + fixed declaration
|
2018-08-08 20:11:57 +02:00 |
|
Robert Pelnar
|
23e5cea5d0
|
MMU - code cleaning (modularity)
M403 set filament type
hardware reset
|
2018-08-08 18:58:03 +02:00 |
|
Robert Pelnar
|
9e09efc9f4
|
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
conflicts + fix
|
2018-08-07 20:55:08 +02:00 |
|
Robert Pelnar
|
71f1a1f6db
|
MMU - communication, check after start, code cleaning
|
2018-08-07 20:37:59 +02:00 |
|
Marek Bel
|
548f4cb1fa
|
Fix compiler warning sketch/mmu.cpp:32:6: warning: unused parameter 'extr' [-Wunused-parameter]
|
2018-08-07 15:01:49 +02:00 |
|
PavelSindler
|
0c2d0bebce
|
merge with upstream fix
|
2018-08-03 19:14:17 +02:00 |
|
Robert Pelnar
|
468873ec68
|
MMU2 - removed conditional translation for SNMM_V2, new module mmu
|
2018-08-02 18:54:00 +02:00 |
|