SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix Toolchange (!no_move) return to status (#16699)

Browse source
This commit is contained in:
InsanityAutomation 2020-01-29 01:06:06 -05:00 committed by GitHub
parent 9b45f342ee
commit 9bb8176d34
Signed by: GitHub
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/feature/binary_protocol.h
View file

@ -242,7 +242,7 @@ public:
uint8_t protocol() { return (meta >> 4) & 0xF; } uint8_t protocol() { return (meta >> 4) & 0xF; }
uint8_t type() { return meta & 0xF; } uint8_t type() { return meta & 0xF; }
void reset() { token = 0; sync = 0; meta = 0; size = 0; checksum = 0; } void reset() { token = 0; sync = 0; meta = 0; size = 0; checksum = 0; }
uint8_t data[1]; uint8_t data[2];
}; };
union Footer { union Footer {

4
Marlin/src/module/tool_change.cpp
View file

@ -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 (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) #if ENABLED(DUAL_X_CARRIAGE)
const bool idex_full_control = dual_x_carriage_mode == DXC_FULL_CONTROL_MODE; const bool idex_full_control = dual_x_carriage_mode == DXC_FULL_CONTROL_MODE;
#else #else