⛙ Merge w/Marlin

classicrocker883 · classicrocker883 · commit ad03c3337f2e · 2025-12-06T20:42:25.000-05:00
diff --git a/Marlin/src/HAL/GD32_MFL/timers.h b/Marlin/src/HAL/GD32_MFL/timers.h
@@ -34,8 +34,8 @@
 #define MF_TIMER_TEMP     1
 #define MF_TIMER_PULSE    MF_TIMER_STEP
 
-#define hal_timer_t         uint32_t
-#define HAL_TIMER_TYPE_MAX  UINT16_MAX
+typedef uint32_t hal_timer_t;
+#define HAL_TIMER_TYPE_MAX hal_timer_t(UINT16_MAX)
 
 extern uint32_t GetStepperTimerClkFreq();
 
diff --git a/Marlin/src/HAL/HC32/timers.h b/Marlin/src/HAL/HC32/timers.h
@@ -27,7 +27,7 @@
 //
 typedef Timer0 *timer_channel_t;
 typedef uint16_t hal_timer_t;
-#define HAL_TIMER_TYPE_MAX 0xFFFFU
+#define HAL_TIMER_TYPE_MAX hal_timer_t(UINT16_MAX)
 
 //
 // Timer instances
diff --git a/Marlin/src/HAL/NATIVE_SIM/timers.h b/Marlin/src/HAL/NATIVE_SIM/timers.h
@@ -36,7 +36,7 @@
 #endif
 
 typedef uint64_t hal_timer_t;
-#define HAL_TIMER_TYPE_MAX 0xFFFF'FFFF'FFFF'FFFFULL
+#define HAL_TIMER_TYPE_MAX hal_timer_t(UINT64_MAX)
 
 #define HAL_TIMER_RATE         ((SystemCoreClock) / 4)  // frequency of timers peripherals
 
diff --git a/Marlin/src/HAL/RP2040/timers.h b/Marlin/src/HAL/RP2040/timers.h
@@ -41,7 +41,7 @@
 #define _HAL_TIMER_ISR(T)  __HAL_TIMER_ISR(T)
 
 typedef uint64_t hal_timer_t;
-#define HAL_TIMER_TYPE_MAX 0xFFFF'FFFF'FFFF'FFFFULL
+#define HAL_TIMER_TYPE_MAX hal_timer_t(UINT64_MAX)
 
 #define HAL_TIMER_RATE         (1'000'000ULL)  // fixed value as we use a microsecond timesource
 #ifndef MF_TIMER_STEP
diff --git a/Marlin/src/HAL/SAMD21/timers.h b/Marlin/src/HAL/SAMD21/timers.h
@@ -33,7 +33,7 @@
 // --------------------------------------------------------------------------
 
 typedef uint32_t hal_timer_t;
-#define HAL_TIMER_TYPE_MAX 0xFFFFFFFFUL
+#define HAL_TIMER_TYPE_MAX hal_timer_t(UINT32_MAX)
 
 #define HAL_TIMER_RATE      F_CPU   // frequency of timers peripherals
 
diff --git a/Marlin/src/HAL/STM32F1/timers.h b/Marlin/src/HAL/STM32F1/timers.h
@@ -40,7 +40,7 @@
  */
 
 typedef uint16_t hal_timer_t;
-#define HAL_TIMER_TYPE_MAX 0xFFFFU
+#define HAL_TIMER_TYPE_MAX hal_timer_t(UINT16_MAX)
 
 #define HAL_TIMER_RATE uint32_t(F_CPU)  // frequency of timers peripherals
 
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
@@ -723,7 +723,7 @@ void Marlin::manage_inactivity(const bool no_stepper_sleep/*=false*/) {
     // handle delayed move timeout
     if (delayed_move_time && ELAPSED(ms, delayed_move_time) && isRunning()) {
       // travel moves have been received so enact them
-      delayed_move_time = 0xFFFFFFFFUL; // force moves to be done
+      delayed_move_time = UINT32_MAX; // force moves to be done
       destination = current_position;
       prepare_line_to_destination();
       planner.synchronize();
diff --git a/Marlin/src/inc/Conditionals-1-axes.h b/Marlin/src/inc/Conditionals-1-axes.h
@@ -53,14 +53,6 @@
 #else
   #undef EXTRUDERS
   #define EXTRUDERS 0
-  #undef TEMP_SENSOR_0
-  #undef TEMP_SENSOR_1
-  #undef TEMP_SENSOR_2
-  #undef TEMP_SENSOR_3
-  #undef TEMP_SENSOR_4
-  #undef TEMP_SENSOR_5
-  #undef TEMP_SENSOR_6
-  #undef TEMP_SENSOR_7
   #undef SINGLENOZZLE
   #undef SWITCHING_EXTRUDER
   #undef MECHANICAL_SWITCHING_EXTRUDER
@@ -222,6 +214,52 @@
   #undef HOTEND_OFFSET_Z
 #endif
 
+// Clean up unused temperature sensors and sub-options
+#define UNUSED_TEMP_SENSOR(N) (!TEMP_SENSOR_##N || N >= HOTENDS)
+#if UNUSED_TEMP_SENSOR(0)
+  #undef TEMP_SENSOR_0
+#endif
+#if UNUSED_TEMP_SENSOR(1)
+  #undef TEMP_SENSOR_1
+#endif
+#if UNUSED_TEMP_SENSOR(2)
+  #undef TEMP_SENSOR_2
+#endif
+#if UNUSED_TEMP_SENSOR(3)
+  #undef TEMP_SENSOR_3
+#endif
+#if UNUSED_TEMP_SENSOR(4)
+  #undef TEMP_SENSOR_4
+#endif
+#if UNUSED_TEMP_SENSOR(5)
+  #undef TEMP_SENSOR_5
+#endif
+#if UNUSED_TEMP_SENSOR(6)
+  #undef TEMP_SENSOR_6
+#endif
+#if UNUSED_TEMP_SENSOR(7)
+  #undef TEMP_SENSOR_7
+#endif
+#if !TEMP_SENSOR_BED
+  #undef TEMP_SENSOR_BED
+#endif
+#if !TEMP_SENSOR_CHAMBER
+  #undef TEMP_SENSOR_CHAMBER
+#endif
+#if !TEMP_SENSOR_PROBE
+  #undef TEMP_SENSOR_PROBE
+#endif
+#if !TEMP_SENSOR_REDUNDANT
+  #undef TEMP_SENSOR_REDUNDANT
+#endif
+#if !TEMP_SENSOR_BOARD
+  #undef TEMP_SENSOR_BOARD
+#endif
+#if !TEMP_SENSOR_SOC
+  #undef TEMP_SENSOR_SOC
+#endif
+#undef UNUSED_TEMP_SENSOR
+
 /**
  * Number of Linear Axes (e.g., XYZIJKUVW)
  * All the logical axes except for the tool (E) axis
diff --git a/Marlin/src/inc/Conditionals-3-etc.h b/Marlin/src/inc/Conditionals-3-etc.h
@@ -40,48 +40,17 @@
 // Remove irrelevant Configuration.h settings
 //
 
-// Clean up unused temperature sensors and sub-options
-
-#define UNUSED_TEMP_SENSOR(N) (!TEMP_SENSOR_##N || N >= HOTENDS)
-#if UNUSED_TEMP_SENSOR(0)
-  #undef TEMP_SENSOR_0
-#endif
-#if UNUSED_TEMP_SENSOR(1)
-  #undef TEMP_SENSOR_1
-#endif
-#if UNUSED_TEMP_SENSOR(2)
-  #undef TEMP_SENSOR_2
-#endif
-#if UNUSED_TEMP_SENSOR(3)
-  #undef TEMP_SENSOR_3
-#endif
-#if UNUSED_TEMP_SENSOR(4)
-  #undef TEMP_SENSOR_4
-#endif
-#if UNUSED_TEMP_SENSOR(5)
-  #undef TEMP_SENSOR_5
-#endif
-#if UNUSED_TEMP_SENSOR(6)
-  #undef TEMP_SENSOR_6
-#endif
-#if UNUSED_TEMP_SENSOR(7)
-  #undef TEMP_SENSOR_7
-#endif
-#undef UNUSED_TEMP_SENSOR
-
 #if !HAS_HOTEND
   #undef PREHEAT_1_TEMP_HOTEND
   #undef PREHEAT_2_TEMP_HOTEND
 #endif
 #if !TEMP_SENSOR_BED
-  #undef TEMP_SENSOR_BED
   #undef THERMAL_PROTECTION_BED
   #undef MAX_BED_POWER
   #undef PREHEAT_1_TEMP_BED
   #undef PREHEAT_2_TEMP_BED
 #endif
 #if !TEMP_SENSOR_CHAMBER
-  #undef TEMP_SENSOR_CHAMBER
   #undef THERMAL_PROTECTION_CHAMBER
   #undef MAX_CHAMBER_POWER
   #undef PREHEAT_1_TEMP_CHAMBER
@@ -91,18 +60,6 @@
   #undef TEMP_SENSOR_COOLER
   #undef THERMAL_PROTECTION_COOLER
 #endif
-#if !TEMP_SENSOR_PROBE
-  #undef TEMP_SENSOR_PROBE
-#endif
-#if !TEMP_SENSOR_REDUNDANT
-  #undef TEMP_SENSOR_REDUNDANT
-#endif
-#if !TEMP_SENSOR_BOARD
-  #undef TEMP_SENSOR_BOARD
-#endif
-#if !TEMP_SENSOR_SOC
-  #undef TEMP_SENSOR_SOC
-#endif
 #if !SOFT_PWM_SCALE
   #undef SOFT_PWM_SCALE
 #endif
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 "2025-12-05"
+  #define STRING_DISTRIBUTION_DATE "2025-12-06"
 #endif
 
 /**
diff --git a/Marlin/src/module/ft_motion.cpp b/Marlin/src/module/ft_motion.cpp
@@ -302,10 +302,8 @@ void FTMotion::init() {
     switch (type) {
       default:
       case TrajectoryType::TRAPEZOIDAL: currentGenerator = &trapezoidalGenerator; break;
-      #if ENABLED(FTM_POLYS)
-        case TrajectoryType::POLY5: currentGenerator = &poly5Generator; break;
-        case TrajectoryType::POLY6: currentGenerator = &poly6Generator; break;
-      #endif
+      case TrajectoryType::POLY5:       currentGenerator = &poly5Generator;       break;
+      case TrajectoryType::POLY6:       currentGenerator = &poly6Generator;       break;
     }
   }
 
diff --git a/Marlin/src/module/ft_motion.h b/Marlin/src/module/ft_motion.h
@@ -238,7 +238,7 @@ class FTMotion {
       static TrajectoryType trajectoryType;
       static TrajectoryGenerator* currentGenerator;
     #else
-      static constexpr TrajectoryGenerator *currentGenerator = trapezoidalGenerator;
+      static constexpr TrajectoryGenerator *currentGenerator = &trapezoidalGenerator;
     #endif
 
     #if FTM_HAS_LIN_ADVANCE
diff --git a/Marlin/src/module/ft_motion/stepping.h b/Marlin/src/module/ft_motion/stepping.h
@@ -26,12 +26,11 @@
 //
 // uint64-free equivalent of: ((uint64_t)a * b) >> 16
 //
-FORCE_INLINE constexpr uint32_t a_times_b_shift_16(uint32_t a, uint32_t b) {
-  uint32_t hi = a >> 16;
-  uint32_t lo = a & 0xFFFFu;
+FORCE_INLINE constexpr uint32_t a_times_b_shift_16(const uint32_t a, const uint32_t b) {
+  const uint32_t hi = a >> 16, lo = a & 0x0000FFFF;
   return (hi * b) + ((lo * b) >> 16);
 }
-#define FTM_NEVER (UINT16_MAX)                                       // Reserved number to indicate "no ticks in this frame" (FRAME_TICKS_FP+1 would work too)
+#define FTM_NEVER uint32_t(UINT16_MAX)                               // Reserved number to indicate "no ticks in this frame" (FRAME_TICKS_FP+1 would work too)
 constexpr uint32_t FRAME_TICKS = STEPPER_TIMER_RATE / FTM_FS;        // Timer ticks in a frame
 static_assert(FRAME_TICKS < FTM_NEVER, "(STEPPER_TIMER_RATE / FTM_FS) must be < 2^16 (otherwise fixed-point numbers exceed uint16 vars).");
 constexpr uint32_t FTM_Q_INT = 32u - __builtin_clz(FRAME_TICKS + 1); // Bits to represent the max value (duration of a frame, +1 one for FTM_NEVER).
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
@@ -1828,7 +1828,7 @@ float get_move_distance(const xyze_pos_t &diff OPTARG(HAS_ROTATIONAL_AXES, bool
             // This is a travel move (with no extrusion)
             // Skip it, but keep track of the current position
             // (so it can be used as the start of the next non-travel move)
-            if (delayed_move_time != 0xFFFFFFFFUL) {
+            if (delayed_move_time != UINT32_MAX) {
               current_position = destination;
               NOLESS(raised_parked_position.z, destination.z);
               delayed_move_time = millis() + 1000UL;
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
@@ -3258,7 +3258,7 @@ void Planner::refresh_acceleration_rates() {
     if (TERN1(DISTINCT_E_FACTORS, i < E_AXIS || i == E_AXIS_N(active_extruder)))
       NOLESS(highest_rate, max_acceleration_steps_per_s2[i]);
   }
-  acceleration_long_cutoff = 4294967295UL / highest_rate; // 0xFFFFFFFFUL
+  acceleration_long_cutoff = UINT32_MAX / highest_rate;
   TERN_(HAS_LINEAR_E_JERK, recalculate_max_e_jerk());
 }
 
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
@@ -1579,7 +1579,7 @@ void Stepper::isr() {
   // Program timer compare for the maximum period, so it does NOT
   // flag an interrupt while this ISR is running - So changes from small
   // periods to big periods are respected and the timer does not reset to 0
-  HAL_timer_set_compare(MF_TIMER_STEP, hal_timer_t(HAL_TIMER_TYPE_MAX));
+  HAL_timer_set_compare(MF_TIMER_STEP, HAL_TIMER_TYPE_MAX);
 
   // Count of ticks for the next ISR
   hal_timer_t next_isr_ticks = 0;
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
@@ -353,6 +353,7 @@ PGMSTR(str_t_heating_failed, STR_T_HEATING_FAILED);
   #define CHECK_MAXTEMP_(N,M,S) static_assert( \
     S >= 998 || M <= _MAX(TT_NAME(S)[0].celsius, TT_NAME(S)[COUNT(TT_NAME(S)) - 1].celsius) - (HOTEND_OVERSHOOT), \
     "HEATER_" STRINGIFY(N) "_MAXTEMP (" STRINGIFY(M) ") is too high for thermistor_" STRINGIFY(S) ".h with HOTEND_OVERSHOOT=" STRINGIFY(HOTEND_OVERSHOOT) ".");
+  // This solution requires TEMP_SENSOR_* for all HOTENDS to be defined or compile fails
   #define CHECK_MAXTEMP(N) TERN(TEMP_SENSOR_##N##_IS_THERMISTOR, CHECK_MAXTEMP_, CODE_0)(N, HEATER_##N##_MAXTEMP, TEMP_SENSOR_##N)
   REPEAT(HOTENDS, CHECK_MAXTEMP)
 
diff --git a/Marlin/src/pins/stm32g0/pins_BTT_SKRAT_V1_0.h b/Marlin/src/pins/stm32g0/pins_BTT_SKRAT_V1_0.h
@@ -182,10 +182,10 @@
 #ifndef TEMP_BED_PIN
   #define TEMP_BED_PIN                      PB2   // TB
 #endif
-#ifndef TEMP_SENSOR_PROBE
+#ifndef TEMP_PROBE_PIN
   #define TEMP_PROBE_PIN                    PA1   // TH2
 #endif
-#ifndef TEMP_SENSOR_CHAMBER
+#ifndef TEMP_CHAMBER_PIN
   #define TEMP_CHAMBER_PIN                  PA0   // TH3
 #endif
 
diff --git a/buildroot/share/PlatformIO/scripts/configuration.py b/buildroot/share/PlatformIO/scripts/configuration.py
@@ -3,7 +3,7 @@
 # configuration.py
 # Apply options from config.ini to the existing Configuration headers
 #
-import re, os, shutil, configparser, datetime
+import re, os, shutil, subprocess, configparser, datetime
 from pathlib import Path
 
 verbose = 0
@@ -147,9 +147,9 @@ def fetch_example(url):
 
     # Find a suitable fetch command
     if shutil.which("curl") is not None:
-        fetch = "curl -L -s -S -f -o"
+        fetch = ["curl", "-L", "-s", "-S", "-f", "-o"]
     elif shutil.which("wget") is not None:
-        fetch = "wget -q -O"
+        fetch = ["wget", "-q", "-O"]
     else:
         blab("Couldn't find curl or wget", -1)
         #blab("Couldn't find curl or wget", 0)
@@ -169,7 +169,7 @@ def fetch_example(url):
         "_Bootscreen.h",
         "_Statusscreen.h"
     ):
-        if os.system(f"{fetch} wgot {url}/{fn} >/dev/null 2>&1") == 0:
+        if subprocess.call(fetch + ["wgot", f"{url}/{fn}"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) == 0:
             shutil.move("wgot", config_path(fn))
             gotfile = True
             blab(f"Fetched {fn}", 2)
