From 9b45f342ee8ec1765cc564ffb811755c366cc50c Mon Sep 17 00:00:00 2001 From: thinkyhead Date: Wed, 29 Jan 2020 00:07:02 +0000 Subject: [PATCH 1/3] [cron] Bump distribution date (2020-01-29) --- Marlin/src/inc/Version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h index cf531930af..9eeb6dbcee 100644 --- a/Marlin/src/inc/Version.h +++ b/Marlin/src/inc/Version.h @@ -42,7 +42,7 @@ * version was tagged. */ #ifndef STRING_DISTRIBUTION_DATE - #define STRING_DISTRIBUTION_DATE "2020-01-28" + #define STRING_DISTRIBUTION_DATE "2020-01-29" #endif /** From 9bb8176d341e769af5080cc22a45a433d75b8318 Mon Sep 17 00:00:00 2001 From: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com> Date: Wed, 29 Jan 2020 01:06:06 -0500 Subject: [PATCH 2/3] Fix Toolchange (!no_move) return to status (#16699) --- Marlin/src/feature/binary_protocol.h | 2 +- Marlin/src/module/tool_change.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Marlin/src/feature/binary_protocol.h b/Marlin/src/feature/binary_protocol.h index 0025fbe138..8e69ab7a75 100644 --- a/Marlin/src/feature/binary_protocol.h +++ b/Marlin/src/feature/binary_protocol.h @@ -242,7 +242,7 @@ public: 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 { diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp index 324b979570..b42722b87c 100644 --- a/Marlin/src/module/tool_change.cpp +++ b/Marlin/src/module/tool_change.cpp @@ -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 From a5f72330fb760287673b7724f304fdc24b3b90a4 Mon Sep 17 00:00:00 2001 From: thinkyhead Date: Thu, 30 Jan 2020 00:06:48 +0000 Subject: [PATCH 3/3] [cron] Bump distribution date (2020-01-30) --- Marlin/src/inc/Version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h index 9eeb6dbcee..4b933d0327 100644 --- a/Marlin/src/inc/Version.h +++ b/Marlin/src/inc/Version.h @@ -42,7 +42,7 @@ * version was tagged. */ #ifndef STRING_DISTRIBUTION_DATE - #define STRING_DISTRIBUTION_DATE "2020-01-29" + #define STRING_DISTRIBUTION_DATE "2020-01-30" #endif /**