Commit Graph

2230 Commits

Author SHA1 Message Date
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
PavelSindler 3cccb125f7
Merge pull request #1313 from MRprusa3d/PFW-639
Bed PowerMonitor II
2018-11-07 13:50:50 +01:00
MRprusa3d 4ae857136d Bed PowerMonitor II 2018-11-07 13:38:39 +01:00
PavelSindler b80a0edac0
Merge pull request #1312 from mkbel/fix_long_press_modal
Fix long press modal
2018-11-07 10:28:24 +01:00
PavelSindler a5bbc75035
Merge pull request #1309 from mkbel/fix_1st_lay_cal
PFW-634 Move T<nr> code just before extrude code to properly load fil…
2018-11-07 10:28:13 +01:00
PavelSindler dafa647871
Merge pull request #1310 from XPila/V3_5
Localization
2018-11-07 10:27:23 +01:00
Rob McKenzie 726326e755 . 2018-11-07 17:41:20 +10:00
Marek Bel b4d4bfa667 Do not declare extern class in .cpp file, include appropriate header. 2018-11-06 20:54:53 +01:00
Marek Bel 95b0506284 Make lcd_long_press_active private. 2018-11-06 20:48:28 +01:00
Marek Bel 676434111e Disable long press handler in modal dialogs (LCD update disabled). 2018-11-06 20:43:19 +01: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
Robert Pelnar 065a4e0232 Added missing strings (not translated) to dictionaries using lang-add.sh 2018-11-06 16:40:09 +01:00
Robert Pelnar 77fa893699 lang-add.sh fixed ('[' and ']' chars must be prefixed with '\' for grep) 2018-11-06 16:23:01 +01: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
Marek Bel 02e31433f4 PFW-634 Move T<nr> code just before extrude code to properly load filament in first layer calibration with MMUv2. 2018-11-06 15:46:37 +01:00
Robert Pelnar d3546175b3 removed unused texts and fixed dictionaries 2018-11-06 15:45:41 +01:00
Robert Pelnar 9a68501039 MK2 variants compilable 2018-11-06 14:17:43 +01:00
PavelSindler c3bdd21fa5
Merge pull request #1308 from MRprusa3d/PFW-635
MeshBed Leveling Fail II
2018-11-06 10:47:03 +01:00
Rob McKenzie e81af1a06e comms work 2018-11-06 17:59:44 +10:00
MRprusa3d 46b2c93d60 MeshBed Leveling Fail III 2018-11-06 01:44:53 +01:00
MRprusa3d 9953518681 MeshBed Leveling Fail II 2018-11-06 01:28:47 +01:00
PavelSindler 908fffc19a
Merge pull request #1306 from PavelSindler/fsensor_q
filament quality measurements disabled
2018-11-05 19:14:34 +01:00
PavelSindler 0a6ca7ffd0
Merge pull request #1305 from XPila/V3_5
PFW643 - removed M910-M918, implemented M907
2018-11-05 19:14:19 +01:00
PavelSindler 0d3fd60ed3
Merge pull request #1304 from mkbel/add_autodeplete_tune
Add autodeplete setting into tune menu.
2018-11-05 19:13:59 +01:00
PavelSindler 89ad02ac8c filament quality measurements disabled 2018-11-05 18:37:36 +01:00
Marek Bel 50f9bf06be Save 74B of flash memory. 2018-11-05 18:02:46 +01:00
Marek Bel e95c2ad592 Display auto deplete as not available if filament sensor is disabled. 2018-11-05 17:43:07 +01:00
Robert Pelnar d6b5f5a1c7 PFW643 - removed M910-M918, implemented M907 2018-11-05 16:15:27 +01:00
TheZeroBeast afec270fe6
. 2018-11-06 01:15:14 +10:00
Marek Bel ef5be690fb Add autodeplete setting into tune menu. 2018-11-05 13:54:22 +01:00
TheZeroBeast 35f85c00d0
Starting implementation of serial ACK verification for each MMU-CMD 2018-11-05 21:30:05 +10:00
PavelSindler 7e43b15b54
Merge pull request #1303 from PavelSindler/m600_idler
M600: move extruder to the left to make space for idler opening
2018-11-05 10:38:51 +01:00
PavelSindler 78775e2f87
Merge pull request #1302 from PavelSindler/wizard_improvements
Wizard improvements
2018-11-05 10:38:41 +01:00
PavelSindler 688c10247e
Merge pull request #1291 from XPila/MK3-new_bs
lang update
2018-11-05 10:38:29 +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 2619c6f7a1
Merge pull request #1283 from PavelSindler/crashdet_cancel
canceling print after crash detection sets saved_priting flag to false
2018-11-05 10:37:51 +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
PavelSindler aeeb2af0a4 whitespace 2018-11-05 00:15:36 +01:00
PavelSindler b058ec7120 whitespace 2018-11-05 00:14:16 +01:00
PavelSindler 934b76ade3 wait message added 2018-11-05 00:12:46 +01:00
PavelSindler 3d24f5437c leave Z move menu (hotfix) 2018-11-04 23:44:29 +01:00
PavelSindler daef0eeb67
Merge pull request #1297 from MRprusa3d/PFW-635
MeshBed Leveling Fail
2018-11-04 23:33:29 +01:00
mkbel e177c2b669
Merge pull request #1295 from PavelSindler/feedrate_change
choosing filament from T? menu changes feedrate fixed
2018-11-04 23:13:03 +01:00