Merge branch 'bugfix-2.0.x' into pr/24084

MarlinFirmware · May 17, 2022 · 2e8d0c1 · 2e8d0c1
2 parents 1357e3a + 7894cd9
commit 2e8d0c1
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 13 deletions.
diff --git a/Marlin/Version.h b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-05-14"
+//#define STRING_DISTRIBUTION_DATE "2022-05-17"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.

diff --git a/Marlin/src/HAL/DUE/HAL.h b/Marlin/src/HAL/DUE/HAL.h
@@ -115,8 +115,8 @@ typedef Servo hal_servo_t;
 //
 // Interrupts
 //
-#define sei() noInterrupts()
-#define cli() interrupts()
+#define sei() interrupts()
+#define cli() noInterrupts()
 
 #define CRITICAL_SECTION_START()  const bool _irqon = hal.isr_state(); hal.isr_off()
 #define CRITICAL_SECTION_END()    if (_irqon) hal.isr_on()

diff --git a/Marlin/src/HAL/DUE/HAL_MinSerial.cpp → Marlin/src/HAL/DUE/MinSerial.cpp b/Marlin/src/HAL/DUE/HAL_MinSerial.cpp → Marlin/src/HAL/DUE/MinSerial.cpp
@@ -25,7 +25,7 @@
 
 #if ENABLED(POSTMORTEM_DEBUGGING)
 
-#include "../shared/HAL_MinSerial.h"
+#include "../shared/MinSerial.h"
 
 #include <stdarg.h>
 

diff --git a/Marlin/src/HAL/LPC1768/HAL_MinSerial.cpp → Marlin/src/HAL/LPC1768/MinSerial.cpp b/Marlin/src/HAL/LPC1768/HAL_MinSerial.cpp → Marlin/src/HAL/LPC1768/MinSerial.cpp
@@ -26,7 +26,7 @@
 
 #if ENABLED(POSTMORTEM_DEBUGGING)
 
-#include "../shared/HAL_MinSerial.h"
+#include "../shared/MinSerial.h"
 #include <debug_frmwrk.h>
 
 static void TX(char c) { _DBC(c); }

diff --git a/Marlin/src/HAL/STM32/HAL_MinSerial.cpp → Marlin/src/HAL/STM32/MinSerial.cpp b/Marlin/src/HAL/STM32/HAL_MinSerial.cpp → Marlin/src/HAL/STM32/MinSerial.cpp
@@ -28,7 +28,7 @@
 
 #if ENABLED(POSTMORTEM_DEBUGGING)
 
-#include "../shared/HAL_MinSerial.h"
+#include "../shared/MinSerial.h"
 #include "watchdog.h"
 
 /* Instruction Synchronization Barrier */

diff --git a/Marlin/src/HAL/STM32F1/HAL_MinSerial.cpp → Marlin/src/HAL/STM32F1/MinSerial.cpp b/Marlin/src/HAL/STM32F1/HAL_MinSerial.cpp → Marlin/src/HAL/STM32F1/MinSerial.cpp
@@ -26,7 +26,7 @@
 
 #if ENABLED(POSTMORTEM_DEBUGGING)
 
-#include "../shared/HAL_MinSerial.h"
+#include "../shared/MinSerial.h"
 #include "watchdog.h"
 
 #include <libmaple/usart.h>

diff --git a/Marlin/src/HAL/shared/HAL_MinSerial.cpp → Marlin/src/HAL/shared/MinSerial.cpp b/Marlin/src/HAL/shared/HAL_MinSerial.cpp → Marlin/src/HAL/shared/MinSerial.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "HAL_MinSerial.h"
+#include "MinSerial.h"
 
 #if ENABLED(POSTMORTEM_DEBUGGING)
 

diff --git a/Marlin/src/HAL/shared/HAL_MinSerial.h → Marlin/src/HAL/shared/MinSerial.h b/Marlin/src/HAL/shared/HAL_MinSerial.h → Marlin/src/HAL/shared/MinSerial.h
diff --git a/Marlin/src/HAL/shared/backtrace/backtrace.cpp b/Marlin/src/HAL/shared/backtrace/backtrace.cpp
@@ -25,7 +25,7 @@
 #include "unwinder.h"
 #include "unwmemaccess.h"
 
-#include "../HAL_MinSerial.h"
+#include "../MinSerial.h"
 #include <stdarg.h>
 
 // Dump a backtrace entry

diff --git a/Marlin/src/HAL/shared/cpu_exception/exception_arm.cpp b/Marlin/src/HAL/shared/cpu_exception/exception_arm.cpp
@@ -54,7 +54,7 @@
 
 #include "exception_hook.h"
 #include "../backtrace/backtrace.h"
-#include "../HAL_MinSerial.h"
+#include "../MinSerial.h"
 
 #define HW_REG(X)  (*((volatile unsigned long *)(X)))
 

diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
@@ -290,7 +290,7 @@
 #define NUMERIC_SIGNED(a)   (NUMERIC(a) || (a) == '-' || (a) == '+')
 #define DECIMAL_SIGNED(a)   (DECIMAL(a) || (a) == '-' || (a) == '+')
 #define COUNT(a)            (sizeof(a)/sizeof(*a))
-#define ZERO(a)             memset(a,0,sizeof(a))
+#define ZERO(a)             memset((void*)a,0,sizeof(a))
 #define COPY(a,b) do{ \
     static_assert(sizeof(a[0]) == sizeof(b[0]), "COPY: '" STRINGIFY(a) "' and '" STRINGIFY(b) "' types (sizes) don't match!"); \
     memcpy(&a[0],&b[0],_MIN(sizeof(a),sizeof(b))); \

diff --git 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 "2022-05-14"
+  #define STRING_DISTRIBUTION_DATE "2022-05-17"
 #endif
 
 /**

diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -166,6 +166,7 @@ void _goto_manual_move(const_float_t scale) {
   ui.defer_status_screen();
   ui.manual_move.menu_scale = scale;
   ui.goto_screen(_manual_move_func_ptr);
+  thermalManager.set_menu_cold_override(true);
 }
 
 void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int8_t eindex=active_extruder) {
@@ -228,7 +229,7 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
         ui.goto_screen([]{
           MenuItem_confirm::select_screen(
             GET_TEXT(MSG_BUTTON_PROCEED), GET_TEXT(MSG_BACK),
-            [] { _goto_menu_move_distance_e(); thermalManager.set_menu_cold_override(true); }, nullptr,
+            _goto_menu_move_distance_e, nullptr,
             GET_TEXT(MSG_HOTEND_TOO_COLD), (const char *)nullptr, PSTR("!")
           );
         });