From 3b495eb49335c7d979e57e5760e3dd32ee5ef82c Mon Sep 17 00:00:00 2001
From: Mihail Dumitrescu <mihai.dumitresq@gmail.com>
Date: Mon, 11 Dec 2023 15:33:48 +0200
Subject: [PATCH 1/2] Fully guard multistepping code in
 Stepper::pulse_phase_isr().

---
 Marlin/src/module/stepper.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index ba4030f0d627..2580cb3c352d 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -1722,7 +1722,7 @@ void Stepper::isr() {
 #if MINIMUM_STEPPER_PULSE_NS || MAXIMUM_STEPPER_RATE
   #define ISR_PULSE_CONTROL 1
 #endif
-#if ISR_PULSE_CONTROL && DISABLED(I2S_STEPPER_STREAM)
+#if ISR_PULSE_CONTROL && MULTISTEPPING_LIMIT > 1 && DISABLED(I2S_STEPPER_STREAM)
   #define ISR_MULTI_STEPS 1
 #endif
 
@@ -1771,11 +1771,9 @@ void Stepper::pulse_phase_isr() {
   // Just update the value we will get at the end of the loop
   step_events_completed += events_to_do;
 
+  TERN_(ISR_PULSE_CONTROL, USING_TIMED_PULSE());
   // Take multiple steps per interrupt (For high speed moves)
-  #if ISR_MULTI_STEPS
-    bool firstStep = true;
-    USING_TIMED_PULSE();
-  #endif
+  TERN_(ISR_MULTI_STEPS, bool firstStep = true);
 
   // Direct Stepping page?
   const bool is_page = current_block->is_page();
@@ -2080,7 +2078,7 @@ void Stepper::pulse_phase_isr() {
     TERN_(I2S_STEPPER_STREAM, i2s_push_sample());
 
     // TODO: need to deal with MINIMUM_STEPPER_PULSE_NS over i2s
-    #if ISR_MULTI_STEPS
+    #if ISR_PULSE_CONTROL
       START_TIMED_PULSE();
       AWAIT_HIGH_PULSE();
     #endif

From 7b5ef2fe1c0ff378282531b60ed94787e35e2b82 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 15 Jun 2024 17:59:49 -0500
Subject: [PATCH 2/2] tweak style

---
 Marlin/src/module/stepper.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 2580cb3c352d..b62ba331960f 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -1772,8 +1772,11 @@ void Stepper::pulse_phase_isr() {
   step_events_completed += events_to_do;
 
   TERN_(ISR_PULSE_CONTROL, USING_TIMED_PULSE());
-  // Take multiple steps per interrupt (For high speed moves)
-  TERN_(ISR_MULTI_STEPS, bool firstStep = true);
+
+  // Take multiple steps per interrupt. For high speed moves.
+  #if ENABLED(ISR_MULTI_STEPS)
+    bool firstStep = true;
+  #endif
 
   // Direct Stepping page?
   const bool is_page = current_block->is_page();