Merge branch 'bugfix-2.1.x' into pr/27740

Author: thinkyhead

Marlin/Configuration.h

@@ -698,7 +698,7 @@
 #if ENABLED(PIDTEMP)
   //#define MIN_POWER 0           // Min power to improve PID stability (0..PID_MAX).
                                   // Get the power from the temperature report ('M105' => @:nnn) and try P*2-20 to P*2-10.
-  //#define PID_DEBUG             // Print PID debug data to the serial port. Use 'M303 D' to toggle activation.
+  //#define PID_DEBUG             // Print PID debug data to the serial port. Use 'M303 D' to enable/disable.
   //#define PID_PARAMS_PER_HOTEND // Use separate PID parameters for each extruder (useful for mismatched extruders)
                                   // Set/get with G-code: M301 E[extruder number, 0-2]
 
@@ -799,7 +799,7 @@
 #if ENABLED(PIDTEMPBED)
   //#define MIN_BED_POWER 0   // Min power to improve PID stability (0..MAX_BED_POWER).
                               // Get the power from the temperature report ('M105' => B@:nnn) and try P*2-20 to P*2-10.
-  //#define PID_BED_DEBUG     // Print Bed PID debug data to the serial port.
+  //#define PID_BED_DEBUG     // Print Bed PID debug data to the serial port. Use 'M303 D' to enable/disable.
 
   // 120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
   // from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
@@ -882,11 +882,10 @@
 #if ENABLED(PIDTEMPCHAMBER)
   #define MIN_CHAMBER_POWER 0 // Min power to improve PID stability. (0..MAX_CHAMBER_POWER)
                               // Get the power from the temperature report ('M105' => C@:nnn) and try P*2-20 to P*2-10.
-  //#define PID_CHAMBER_DEBUG // Print Chamber PID debug data to the serial port.
+  //#define PID_CHAMBER_DEBUG // Print Chamber PID debug data to the serial port. Use 'M303 D' to enable/disable.
 
   // Lasko "MyHeat Personal Heater" (200w) modified with a Fotek SSR-10DA to control only the heating element
   // and placed inside the small Creality printer enclosure tent.
-  //
   #define DEFAULT_chamberKp  37.04
   #define DEFAULT_chamberKi   1.40
   #define DEFAULT_chamberKd 655.17

Marlin/Configuration_adv.h

@@ -1342,20 +1342,20 @@
   //#define CALIBRATION_SCRIPT_PRE  "M117 Starting Auto-Calibration\nT0\nG28\nG12\nM117 Calibrating..."
   //#define CALIBRATION_SCRIPT_POST "M500\nM117 Calibration data saved"
 
-  #define CALIBRATION_FEEDRATE_SLOW             60    // mm/min
-  #define CALIBRATION_FEEDRATE_FAST           1200    // mm/min
-  #define CALIBRATION_FEEDRATE_TRAVEL         3000    // mm/min
+  #define CALIBRATION_FEEDRATE_SLOW             60    // (mm/min)
+  #define CALIBRATION_FEEDRATE_FAST           1200    // (mm/min)
+  #define CALIBRATION_FEEDRATE_TRAVEL         3000    // (mm/min)
 
   // The following parameters refer to the conical section of the nozzle tip.
-  #define CALIBRATION_NOZZLE_TIP_HEIGHT          1.0  // mm
-  #define CALIBRATION_NOZZLE_OUTER_DIAMETER      2.0  // mm
+  #define CALIBRATION_NOZZLE_TIP_HEIGHT          1.0  // (mm)
+  #define CALIBRATION_NOZZLE_OUTER_DIAMETER      2.0  // (mm)
 
   // Uncomment to enable reporting (required for "G425 V", but consumes flash).
   //#define CALIBRATION_REPORTING
 
   // The true location and dimension the cube/bolt/washer on the bed.
-  #define CALIBRATION_OBJECT_CENTER     { 264.0, -22.0,  -2.0 } // mm
-  #define CALIBRATION_OBJECT_DIMENSIONS {  10.0,  10.0,  10.0 } // mm
+  #define CALIBRATION_OBJECT_CENTER     { 264.0, -22.0,  -2.0 } // (mm)
+  #define CALIBRATION_OBJECT_DIMENSIONS {  10.0,  10.0,  10.0 } // (mm)
 
   // Comment out any sides which are unreachable by the probe. For best
   // auto-calibration results, all sides must be reachable.

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 "2025-04-01"
+//#define STRING_DISTRIBUTION_DATE "2025-04-02"
 
 /**
  * The protocol for communication to the host. Protocol indicates communication

Marlin/src/HAL/GD32_MFL/MinSerial.cpp

@@ -95,7 +95,7 @@ static void MinSerialBegin() {
       volatile uint32_t ICER[32];
     };
     NVICMin *nvicBase = (NVICMin*)0xE000E100;
-  
+
     SBI32(nvicBase->ICER[nvicIndex >> 5], nvicIndex & 0x1F);
 
     // We require memory barriers to properly disable interrupts

Marlin/src/HAL/GD32_MFL/SDCard.h

@@ -160,12 +160,12 @@ class CardDMA {
     info->csd.device_size = (static_cast<uint32_t>(csd_bytes[6] & 0x03U) << 10U) |
                  (static_cast<uint32_t>(csd_bytes[7]) << 2U) |
                  (static_cast<uint32_t>((csd_bytes[8] & 0xC0U) >> 6U));
-    info->csd.device_size_multiplier = static_cast<uint8_t>((csd_bytes[9] & 0x03U) << 1U | 
+    info->csd.device_size_multiplier = static_cast<uint8_t>((csd_bytes[9] & 0x03U) << 1U |
                                  (csd_bytes[10] & 0x80U) >> 7U);
 
     info->block_size = static_cast<uint32_t>(1 << info->csd.read_block_length);
-    info->capacity = static_cast<uint32_t>((info->csd.device_size + 1U) * 
-            (1U << (info->csd.device_size_multiplier + 2U)) * 
+    info->capacity = static_cast<uint32_t>((info->csd.device_size + 1U) *
+            (1U << (info->csd.device_size_multiplier + 2U)) *
             info->block_size);
   }
 
@@ -175,15 +175,15 @@ class CardDMA {
                  static_cast<uint32_t>(csd_bytes[9]);
 
     info->block_size = BLOCK_SIZE;
-    info->capacity = static_cast<uint32_t>((info->csd.device_size + 1U) * 
+    info->capacity = static_cast<uint32_t>((info->csd.device_size + 1U) *
             BLOCK_SIZE * KILOBYTE);
   }
 
   void process_common_csd_tail(Card_Info* info, const uint8_t* csd_bytes) {
-    info->csd.sector_size = static_cast<uint8_t>(((csd_bytes[9] & 0x3FU) << 1U) | 
+    info->csd.sector_size = static_cast<uint8_t>(((csd_bytes[9] & 0x3FU) << 1U) |
                           (csd_bytes[10] & 0x80U) >> 7U);
     info->csd.speed_factor = static_cast<uint8_t>((csd_bytes[11] & 0x1CU) >> 2U);
-    info->csd.write_block_length = static_cast<uint8_t>(((csd_bytes[11] & 0x03U) << 2U) | 
+    info->csd.write_block_length = static_cast<uint8_t>(((csd_bytes[11] & 0x03U) << 2U) |
                               ((csd_bytes[12] & 0xC0U) >> 6U));
     info->csd.checksum = static_cast<uint8_t>((csd_bytes[15] & 0xFEU) >> 1U);
   }

Marlin/src/HAL/GD32_MFL/timers.cpp

@@ -97,10 +97,10 @@ uint32_t GetStepperTimerClkFreq() {
 
 /**
  * @brief Starts a hardware timer
- * 
+ *
  * If the timer is not already initialized, this function will initialize it with the given frequency.
  * The timer is started immediately after initialization
- * 
+ *
  * @param timer The timer base index to start
  * @param frequency The frequency at which the timer should run
  * @return None
@@ -137,7 +137,7 @@ void HAL_timer_start(const uint8_t timer_number, const uint32_t frequency) {
 
 /**
  * @brief Enables the interrupt for the specified timer
- * 
+ *
  * @param handle The timer handle for which to enable the interrupt
  * @return None
  */
@@ -154,7 +154,7 @@ void HAL_timer_enable_interrupt(const uint8_t timer_number) {
 
 /**
  * @brief Disables the interrupt for the specified timer
- * 
+ *
  * @param handle The timer handle for which to disable the interrupt
  * @return None
  */
@@ -168,7 +168,7 @@ void HAL_timer_disable_interrupt(const uint8_t timer_number) {
 
 /**
  * @brief Checks if the interrupt is enabled for the specified timer
- * 
+ *
  * @param handle The timer handle to check
  * @return True if the interrupt is enabled, false otherwise
  */

Marlin/src/HAL/GD32_MFL/timers.h

@@ -123,8 +123,8 @@ FORCE_INLINE static hal_timer_t HAL_timer_get_count(const uint8_t timer_number)
 
   GeneralTimer& timer = (timer_number == MF_TIMER_STEP) ? Step_Timer : Temp_Timer;
 
-  return (timer_number == MF_TIMER_STEP || timer_number == MF_TIMER_TEMP) 
-         ? timer.getCounter(TimerFormat::TICK) 
+  return (timer_number == MF_TIMER_STEP || timer_number == MF_TIMER_TEMP)
+         ? timer.getCounter(TimerFormat::TICK)
          : 0U;
 }
 

Marlin/src/inc/Version.h

@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2025-04-01"
+  #define STRING_DISTRIBUTION_DATE "2025-04-02"
 #endif
 
 /**