Skip to content

Fix toolchange return to status #16699

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

Merged
thinkyhead merged 6 commits into from
Jan 29, 2020
Merged

Fix toolchange return to status #16699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8b927a2
Fix binary protocol buffer overrun
thinkyhead Oct 8, 2019
b12fe74
Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marl…
InsanityAutomation Jan 3, 2020
cf9a8e1
Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marl…
InsanityAutomation Jan 19, 2020
2a9ecf4
Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marl…
InsanityAutomation Jan 28, 2020
c538184
Update tool_change.cpp
InsanityAutomation Jan 28, 2020
9148be4
Update tool_change.cpp
thinkyhead Jan 29, 2020
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
2 changes: 1 addition & 1 deletion Marlin/src/feature/binary_protocol.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ class BinaryStream {
uint8_t protocol() { return (meta >> 4) & 0xF; }
uint8_t type() { return meta & 0xF; }
void reset() { token = 0; sync = 0; meta = 0; size = 0; checksum = 0; }
uint8_t data[1];
uint8_t data[2];
};

union Footer {
Expand Down
4 changes: 4 additions & 0 deletions Marlin/src/module/tool_change.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,6 +821,10 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("No move (not homed)");
}

#if HAS_LCD_MENU
if (!no_move) ui.return_to_status();
#endif

#if ENABLED(DUAL_X_CARRIAGE)
const bool idex_full_control = dual_x_carriage_mode == DXC_FULL_CONTROL_MODE;
#else
Expand Down