revert ISR changes. rename prepareForStop to noMoreCommands

gin66 · Apr 30, 2024 · 1ef4030 · 1ef4030
1 parent efe5589
commit 1ef4030
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 29 deletions.
diff --git a/src/StepperISR.cpp b/src/StepperISR.cpp
@@ -326,7 +326,7 @@ void StepperQueue::_initVars() {
   dirHighCountsUp = true;
 #if defined(ARDUINO_ARCH_AVR)
   _isRunning = false;
-  _prepareForStop = false;
+  _noMoreCommands = false;
 #endif
 #if defined(SUPPORT_ESP32)
   _isRunning = false;

diff --git a/src/StepperISR.h b/src/StepperISR.h
@@ -88,10 +88,10 @@ class StepperQueue {
   SUPPORT_DIR_TOGGLE_PIN_MASK _dirTogglePinMask;
 #endif
 #if defined(SUPPORT_AVR)
-  volatile bool _prepareForStop;
+  volatile bool _noMoreCommands;
   volatile bool _isRunning;
   inline bool isRunning() { return _isRunning; }
-  inline bool isReadyForCommands() { return !_prepareForStop; }
+  inline bool isReadyForCommands() { return true; }
   enum channels channel;
 #endif
 #if defined(SUPPORT_SAM)

diff --git a/src/StepperISR_avr.cpp b/src/StepperISR_avr.cpp
@@ -12,10 +12,12 @@
 // Toggle      is 0   1
 // Disconnect  is 0   0
 //
+#define Stepper_OneToZero(T, X) TCCR##T##A = TCCR##T##A & ~_BV(COM##T##X##0)
 #define Stepper_Zero(T, X) \
   TCCR##T##A = (TCCR##T##A | _BV(COM##T##X##1)) & ~_BV(COM##T##X##0)
 #define Stepper_Toggle(T, X) \
   TCCR##T##A = (TCCR##T##A | _BV(COM##T##X##0)) & ~_BV(COM##T##X##1)
+#define Stepper_One(T, X) TCCR##T##A |= _BV(COM##T##X##1) | _BV(COM##T##X##0)
 #define Stepper_Disconnect(T, X) \
   TCCR##T##A &= ~(_BV(COM##T##X##1) | _BV(COM##T##X##0))
 #define Stepper_IsOne(T, X)                                  \
@@ -143,41 +145,65 @@ void StepperQueue::init(uint8_t queue_num, uint8_t step_pin) {
       /* disable compare interrupt */                                         \
       DisableCompareInterrupt(T, CHANNEL);                                    \
       fas_queue_##CHANNEL._isRunning = false;                                 \
-      fas_queue_##CHANNEL._prepareForStop = false;                            \
+      fas_queue_##CHANNEL._noMoreCommands = false;                            \
       exitStepperISR();                                                       \
       return;                                                                 \
     }                                                                         \
     struct queue_entry* e = &fas_queue_##CHANNEL.entry[rp & QUEUE_LEN_MASK];  \
-    /* There is a risk, that the new compare time is delayed by one cycle */  \
-    uint16_t ticks = e->ticks;                                                \
-    /* Clear output bit by another compare event */                           \
-    ForceCompare(T, CHANNEL);                                                 \
-    if (e->steps == 0) {                                                      \
-      /* mo more steps with this queue entry */                               \
-      if (TEST_NOT_REPEATING_ENTRY) {                                         \
-        rp++;                                                                 \
-        fas_queue_##CHANNEL.read_idx = rp;                                    \
-        e = &fas_queue_##CHANNEL.entry[rp & QUEUE_LEN_MASK];                  \
+    /* There is a risk, that this new compare time is delayed by one cycle */ \
+    OCR##T##CHANNEL += e->ticks;                                              \
+    if (Stepper_IsOneIfOutput(T, CHANNEL)) {                                  \
+      /* Clear output bit by another compare event */                         \
+      Stepper_OneToZero(T, CHANNEL);                                          \
+      ForceCompare(T, CHANNEL);                                               \
+      if (e->steps-- > 1) {                                                   \
+        /* perform another step with this queue entry */                      \
+        Stepper_One(T, CHANNEL);                                              \
+        exitStepperISR();                                                     \
+        return;                                                               \
       }                                                                       \
-      Stepper_Zero(T, CHANNEL);                                               \
-      if (rp != fas_queue_##CHANNEL.next_write_idx) {                         \
-        /* command in queue */                                                \
-        if (e->toggle_dir) {                                                  \
-           Stepper_ToggleDirection(CHANNEL);                                  \
-        }                                                                     \
-        if (e->steps != 0) {                                                  \
-           Stepper_Toggle(T, CHANNEL);                                        \
-           e->steps--;                                                        \
+    } else if (fas_queue_##CHANNEL._noMoreCommands) {                         \
+      /* new command received after running out of commands */                \
+      /* if this new command requires a step, then this step would be lost    \
+       */                                                                     \
+      fas_queue_##CHANNEL._noMoreCommands = false;                            \
+      if (e->toggle_dir) {                                                    \
+        Stepper_ToggleDirection(CHANNEL);                                     \
+      }                                                                       \
+      if (e->steps > 0) {                                                     \
+        /* That's the problem, so generate a step */                          \
+        Stepper_One(T, CHANNEL);                                              \
+        ForceCompare(T, CHANNEL);                                             \
+        /* Use a high time of 3us */                                          \
+        delayMicroseconds(3);                                                 \
+        /* Clear output bit by another toggle */                              \
+        Stepper_OneToZero(T, CHANNEL);                                        \
+        ForceCompare(T, CHANNEL);                                             \
+        if (e->steps-- > 1) {                                                 \
+          /* perform another step with this queue entry */                    \
+          Stepper_One(T, CHANNEL);                                            \
+          exitStepperISR();                                                   \
+          return;                                                             \
         }                                                                     \
-      } else {                                                                \
-        /* queue empty: wait this command to complete, then disconnect */     \
-        fas_queue_##CHANNEL._prepareForStop = true;                           \
       }                                                                       \
     }                                                                         \
-    else {                                                                    \
-      e->steps--;                                                             \
+    if (TEST_NOT_REPEATING_ENTRY) {                                           \
+      rp++;                                                                   \
+    }                                                                         \
+    fas_queue_##CHANNEL.read_idx = rp;                                        \
+    if (rp != fas_queue_##CHANNEL.next_write_idx) {                           \
+      /* command in queue */                                                  \
+      e = &fas_queue_##CHANNEL.entry[rp & QUEUE_LEN_MASK];                    \
+      if (e->toggle_dir) {                                                    \
+        Stepper_ToggleDirection(CHANNEL);                                     \
+      }                                                                       \
+      if (e->steps != 0) {                                                    \
+        Stepper_One(T, CHANNEL);                                              \
+      }                                                                       \
+    } else {                                                                  \
+      /* queue is empty, so wait this command to complete, then disconnect */ \
+      fas_queue_##CHANNEL._noMoreCommands = true;                             \
     }                                                                         \
-    OCR##T##CHANNEL += ticks;                                                 \
     exitStepperISR();                                                         \
   }