USE_FREEZE_PIN => NO_FREEZE_PIN

DerAndere1 · DerAndere1 · commit c02cb9f949d9 · 2026-01-04T22:38:09.000+01:00
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
@@ -2801,8 +2801,8 @@
  *
  * Adds support for commands:
  *  S000 : Report State and Position while moving.
- *  P000 : Instant Pause / Hold while moving.
- *  R000 : Resume from Pause / Hold.
+ *  P000 : Instant Pause / Hold while moving. Requires FREEZE_FEATURE for soft deceleration.
+ *  R000 : Resume from Pause / Hold. Requires FREEZE_FEATURE for soft acceleration.
  *
  * - During Hold all Emergency Parser commands are available, as usual.
  * - Enable NANODLP_Z_SYNC and NANODLP_ALL_AXIS for move command end-state reports.
@@ -4433,13 +4433,15 @@
 
 /**
  * Freeze / unfreeze functionality
- * Potentially useful for rapid stop that allows being resumed.
- * Rapidly decelerates and halts movement at FREEZE_JERK.
+ * Soft feed hold that keeps power available and does not stop the spindle can be initiated with command P000 (requires REALTIME_REPORTING_COMMANDS and EMERGENCY_PARSER) or by using a FREEZE_PIN.
+ * Decelerates and halts movement at FREEZE_JERK.
+ * Motion can be resumed with command R000 (requires REALTIME_REPORTING_COMMANDS and EMERGENCY_PARSER) or by using the FREEZE_PIN
  * NOTE: Controls Laser PWM but does NOT pause Spindle, Fans, Heaters or other devices.
  * @section freeze
  */
 //#define FREEZE_FEATURE
 #if ENABLED(FREEZE_FEATURE)
+  //NO_FREEZE_PIN             // Don't use FREEZE_PIN, only commands P000 and R000 
   //#define FREEZE_PIN   -1   // Override the default (KILL) pin here
   #define FREEZE_JERK     2   // (mm/s) Completely halt when motion has decelerated below this value
   #define FREEZE_STATE  LOW   // State of pin indicating freeze
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
@@ -1229,7 +1229,7 @@ void setup() {
     #endif
   #endif
 
-  #if ENABLED(USE_FREEZE_PIN)
+  #if ENABLED(FREEZE_FEATURE) && DISABLED(NO_FREEZE_PIN)
     SETUP_LOG("FREEZE_PIN");
     #if FREEZE_STATE
       SET_INPUT_PULLDOWN(FREEZE_PIN);
diff --git a/Marlin/src/feature/e_parser.cpp b/Marlin/src/feature/e_parser.cpp
@@ -1,10 +1,6 @@
 /**
- * Marlin2ForPipetBot [https://github.com/DerAndere1/Marlin]
- * Copyright 2019 - 2026 DerAndere and other Marlin2ForPipetBot authors [https://github.com/DerAndere1/Marlin]
- *
- * Based on:
  * Marlin 3D Printer Firmware
- * Copyright (c) 2020 - 2025 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/feature/e_parser.h b/Marlin/src/feature/e_parser.h
@@ -1,10 +1,6 @@
 /**
- * Marlin2ForPipetBot [https://github.com/DerAndere1/Marlin]
- * Copyright 2019 - 2026 DerAndere and other Marlin2ForPipetBot authors [https://github.com/DerAndere1/Marlin]
- *
- * Based on:
  * Marlin 3D Printer Firmware
- * Copyright (c) 2020 - 2025 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/Marlin/src/inc/Conditionals-5-post.h b/Marlin/src/inc/Conditionals-5-post.h
@@ -3049,7 +3049,7 @@
 #endif
 
 // User Interface
-#if ENABLED(USE_FREEZE_PIN) && !PIN_EXISTS(FREEZE) && PIN_EXISTS(KILL)
+#if ENABLED(FREEZE_FEATURE) && DISABLED(NO_FREEZE_PIN) && !PIN_EXISTS(FREEZE) && PIN_EXISTS(KILL)
   #define FREEZE_PIN KILL_PIN
   #define FREEZE_STOLE_KILL_PIN_WARNING 1
 #elif PIN_EXISTS(KILL) && TERN1(HAS_FREEZE_PIN, KILL_PIN != FREEZE_PIN)
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
@@ -581,10 +581,10 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
  */
 #if ENABLED(FREEZE_FEATURE) && !defined(FREEZE_JERK)
   #error "FREEZE_FEATURE requires FREEZE_JERK."
-#elif ENABLED(USE_FREEZE_PIN) && !(defined(FREEZE_PIN)&& defined(FREEZE_STATE))
-  #error "USE_FREEZE_PIN requires FREEZE_PIN and FREEZE_STATE."
-#elif ENABLED(FREEZE_FEATURE) && !(defined(REALTIME_REPORTING_COMMANDS))
-  #error "FREEZE_FEATURE requires REALTIME_REPORTING_COMMANDS or USE_FREEZE_PIN"
+#elif ENABLED(FREEZE_FEATURE) && DISABLED(NO_FREEZE_PIN) && !(defined(FREEZE_PIN) && defined(FREEZE_STATE))
+  #error "FREEZE_FEATURE requires FREEZE_PIN and FREEZE_STATE."
+#elif ENABLED(NO_FREEZE_PIN) && !(defined(REALTIME_REPORTING_COMMANDS))
+  #error "NO_FREEZE_PIN requires REALTIME_REPORTING_COMMANDS"
 #endif
 
 /**
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
@@ -2436,7 +2436,7 @@ bool Planner::_populate_block(
   #if HAS_STANDARD_MOTION
     block->acceleration_steps_per_s2 = accel;
     #if DISABLED(S_CURVE_ACCELERATION)
-      block->acceleration_rate = (uint32_t)(accel * (float(_BV32(24)) / (STEPPER_TIMER_RATE)));
+      block->acceleration_rate = uint32_t(accel * (float(_BV32(24)) / (STEPPER_TIMER_RATE)));
     #elif ENABLED(FREEZE_FEATURE)
       // No need to waste time calculating the linear acceleration rate until the freeze_pin is triggered, leave this 0
       block->acceleration_rate = 0;
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
@@ -249,12 +249,12 @@ typedef struct PlannerBlock {
   #if ANY(S_CURVE_ACCELERATION, SMOOTH_LIN_ADVANCE)
     uint32_t cruise_rate,                   // The actual cruise rate to use, between end of the acceleration phase and start of deceleration phase
              acceleration_time,             // Acceleration time and deceleration time in STEP timer counts
-             deceleration_time,
-             acceleration_time_inverse,     // Inverse of acceleration and deceleration periods, expressed as integer. Scale depends on CPU being used
-             deceleration_time_inverse;
+             deceleration_time;
   #endif
-
-  #if DISABLED(S_CURVE_ACCELERATION) || ENABLED(FREEZE_FEATURE)
+  #if ENABLED(S_CURVE_ACCELERATION)
+    uint32_t acceleration_time_inverse,     // Inverse of acceleration and deceleration periods, expressed as integer. Scale depends on CPU being used
+             deceleration_time_inverse;
+    #elif ENABLED(HAS_STANDARD_MOTION)
     uint32_t acceleration_rate;             // Acceleration rate in (2^24 steps)/timer_ticks*s
   #endif
 
diff --git a/buildroot/tests/DUE b/buildroot/tests/DUE
@@ -8,11 +8,12 @@ set -e
 
 restore_configs
 opt_set MOTHERBOARD BOARD_RAMPS4DUE_EFB \
-        TEMP_SENSOR_0 -2 TEMP_SENSOR_BED 2 TEMP_SENSOR_CHAMBER 3 \
-        TEMP_CHAMBER_PIN 6 HEATER_CHAMBER_PIN 45 \
-        E0_AUTO_FAN_PIN 8 FANMUX0_PIN 53 FREEZE_PIN 17 \
-        EXTRUDER_AUTO_FAN_SPEED 100 \
-        GRID_MAX_POINTS_X 16 BACKLASH_MEASUREMENT_FEEDRATE 600 \
+         LCD_LANGUAGE bg \
+        TEMP_SENSOR_0 -2 TEMP_SENSOR_BED 2 \
+        GRID_MAX_POINTS_X 16 \
+        E0_AUTO_FAN_PIN 8 FANMUX0_PIN 53 EXTRUDER_AUTO_FAN_SPEED 100 \
+        TEMP_SENSOR_CHAMBER 3 TEMP_CHAMBER_PIN 6 HEATER_CHAMBER_PIN 45 \
+        BACKLASH_MEASUREMENT_FEEDRATE 600 \
         TRAMMING_POINT_XY '{{20,20},{20,20},{20,20},{20,20},{20,20}}' TRAMMING_POINT_NAME_5 '"Point 5"'
 opt_enable S_CURVE_ACCELERATION FREEZE_FEATURE EEPROM_SETTINGS GCODE_MACROS GCODE_MACROS_IN_EEPROM \
            FIX_MOUNTED_PROBE Z_SAFE_HOMING CODEPENDENT_XY_HOMING \
