Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix manual move with MKS H43 #21511

Merged
merged 19 commits into from
Apr 9, 2021
Merged

Fix manual move with MKS H43 #21511

Changes from 17 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
aa595f5
Merge pull request #1 from MarlinFirmware/bugfix-2.0.x
makerbase-mks May 11, 2020
d5d325c
Merge pull request #2 from MarlinFirmware/bugfix-2.0.x
makerbase-mks May 13, 2020
d8d5c0f
Merge pull request #4 from MarlinFirmware/bugfix-2.0.x
makerbase-mks May 14, 2020
a1055dd
Merge pull request #6 from MarlinFirmware/bugfix-2.0.x
makerbase-mks May 18, 2020
8b349b1
Merge pull request #7 from MarlinFirmware/bugfix-2.0.x
makerbase-mks May 22, 2020
8c42e50
Merge pull request #14 from MarlinFirmware/bugfix-2.0.x
makerbase-mks Jun 27, 2020
626ed70
Merge pull request #15 from MarlinFirmware/bugfix-2.0.x
makerbase-mks Jul 1, 2020
80a2552
Merge pull request #16 from MarlinFirmware/bugfix-2.0.x
MKS-Sean Jul 2, 2020
1f7bbbd
Merge pull request #36 from MarlinFirmware/bugfix-2.0.x
MKS-Sean Dec 31, 2020
b499a24
Merge pull request #44 from MarlinFirmware/bugfix-2.0.x
solawc Mar 6, 2021
c18642a
Merge pull request #45 from MarlinFirmware/bugfix-2.0.x
solawc Mar 8, 2021
953ea35
Merge pull request #46 from MarlinFirmware/bugfix-2.0.x
solawc Mar 11, 2021
eb4d1de
Merge pull request #47 from MarlinFirmware/bugfix-2.0.x
solawc Mar 17, 2021
1b5dc86
Merge pull request #48 from MarlinFirmware/bugfix-2.0.x
solawc Mar 26, 2021
77d0c9d
Merge pull request #50 from MarlinFirmware/bugfix-2.0.x
solawc Apr 2, 2021
fa67764
fix ex bug
solawc Apr 2, 2021
54ab8f4
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/21511
thinkyhead Apr 6, 2021
a645c08
Try queue.inject with custom G-code
thinkyhead Apr 6, 2021
383a903
FilamentSpeed => FilamentSpeed_mm_s
thinkyhead Apr 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Marlin/src/lcd/extui/lib/dgus/mks/DGUSScreenHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1199,9 +1199,9 @@ void DGUSScreenHandler::GetManualFilamentSpeed(DGUS_VP_Variable &var, void *val_

void DGUSScreenHandler::MKS_FilamentLoadUnload(DGUS_VP_Variable &var, void *val_ptr, const int filamentDir) {
#if EITHER(HAS_MULTI_HOTEND, SINGLENOZZLE)
char buf[40];
uint8_t swap_tool = 0;
#endif
char buf[40];

#if HAS_HOTEND
uint8_t hotend_too_cold = 0;
Expand Down Expand Up @@ -1251,6 +1251,12 @@ void DGUSScreenHandler::MKS_FilamentLoadUnload(DGUS_VP_Variable &var, void *val_
queue.enqueue_one_now(buf);
queue.enqueue_now_P(PSTR("G90"));
}
#else
queue.enqueue_now_P(PSTR("T1"));
thinkyhead marked this conversation as resolved.
Show resolved Hide resolved
queue.enqueue_now_P(PSTR("G91"));
snprintf_P(buf, 40, PSTR("G1 E%d F%d"), (int)distanceFilament * filamentDir, FilamentSpeed * 60);
queue.enqueue_one_now(buf);
queue.enqueue_now_P(PSTR("G90"));
thinkyhead marked this conversation as resolved.
Show resolved Hide resolved
#endif
}

Expand Down