Merge branch 'bugfix-2.1.x' into bugfix-2.1.x

MarlinFirmware · Dec 17, 2024 · 8d102d6 · 8d102d6
2 parents 3ec66c1 + 05e67a9
commit 8d102d6
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 46,240 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 "2024-12-16"
+//#define STRING_DISTRIBUTION_DATE "2024-12-17"
 
 /**
  * The protocol for communication to the host. Protocol indicates communication

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 "2024-12-16"
+  #define STRING_DISTRIBUTION_DATE "2024-12-17"
 #endif
 
 /**

diff --git a/Marlin/src/lcd/menu/menu_probe_level.cpp b/Marlin/src/lcd/menu/menu_probe_level.cpp
@@ -44,11 +44,9 @@
   #include "../../feature/babystep.h"
 #endif
 
-#if HAS_GRAPHICAL_TFT
+#if ALL(TOUCH_SCREEN, HAS_GRAPHICAL_TFT)
   #include "../tft/tft.h"
-  #if ENABLED(TOUCH_SCREEN)
-    #include "../tft/touch.h"
-  #endif
+  #include "../tft/touch.h"
 #endif
 
 #if ENABLED(LCD_BED_LEVELING) && ANY(PROBE_MANUALLY, MESH_BED_LEVELING)

diff --git a/Marlin/src/lcd/menu/menu_x_twist.cpp b/Marlin/src/lcd/menu/menu_x_twist.cpp
@@ -36,6 +36,11 @@
   #define XATC_Y_POSITION ((probe.max_y() - probe.min_y())/2)
 #endif
 
+#if ALL(TOUCH_SCREEN, HAS_GRAPHICAL_TFT)
+  #include "../tft/tft.h"
+  #include "../tft/touch.h"
+#endif
+
 void _goto_manual_move_z(const_float_t);
 
 float measured_z, z_offset;

diff --git a/buildroot/bin/build_all_examples b/buildroot/bin/build_all_examples
@@ -184,7 +184,7 @@ find -ds "$CBASE"/config/examples -type d -name 'Configuration.h' -o -name 'Conf
   ((CEXPORT)) && CARGS+=("-e" "$CEXPORT")
 
   # Build many environments? Add -m argument
-  ((NOFAIL)) && CARGS+=("-m")
+  ((MANY)) && CARGS+=("-m")
 
   # Continue on fail? Add -f argument
   ((NOFAIL)) && CARGS+=("-f")

diff --git a/buildroot/bin/build_example b/buildroot/bin/build_example
@@ -211,22 +211,23 @@ while ((1)); do
   # "Index out of range" can fail without an error
   ((MANY)) && ((ERR == 66)) && ERR=0 && break  # "index out of range"
 
-  # Short message reporting Error or Success
-  ((ERR)) && alrt "Failed ($ERR)" || annc "Success"
-
   set -e
 
   if [[ $ERR -gt 0 ]]; then
 
+    alrt "Failed ($ERR)"
+
     # Error? For --nofail simply log. Otherwise return the error.
     if [[ -n $NOFAIL ]]; then
-      date +"%F %T [FAIL] $CONFIG" >>./.pio/error-log.txt
+      date +"%F %T [FAIL] $CONFIG ($BUILDINDEX)" >>./.pio/error-log.txt
     else
       exit $ERR
     fi
 
   else
 
+    annc "Success"
+
     # Copy exports back to the configs
     if [[ -n $EXPNUM ]]; then
       annc "Exporting $EXPNUM"

diff --git a/buildroot/share/PlatformIO/scripts/signature.py b/buildroot/share/PlatformIO/scripts/signature.py
@@ -364,7 +364,7 @@ def tryint(key):
         with config_h.open('w') as outfile:
             filegrp = { 'Configuration.h':'config:basic', 'Configuration_adv.h':'config:advanced' }
             vers = build_defines["CONFIGURATION_H_VERSION"]
-            dt_string = datetime.now().strftime("%Y-%m-%d at %H:%M:%S")
+            dt_string = datetime.utcnow().strftime("%Y-%m-%d at %H:%M:%S")
 
             out_text = f'''/**
  * Config.h - Marlin Firmware distilled configuration