refactor: move StepperISR to fas_queue/stepper_queue.*

gin66 · gin66 · commit 966c2e4f3984 · 2026-03-01T00:44:09.000+01:00
Rename and move StepperISR.h/cpp to fas_queue/stepper_queue.h/cpp for
better organization. Update all includes across the codebase and
simplify CMakeLists.txt INCLUDE_DIRS to just src/.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 idf_component_register(
-    SRC_DIRS "src" "src/pd_esp32" "src/fas_ramp" "src/log2"
-    INCLUDE_DIRS "src" "src/pd_esp32" "src/fas_ramp" "src/log2"
+    SRC_DIRS "src" "src/pd_esp32" "src/fas_ramp" "src/log2" "src/fas_queue"
+    INCLUDE_DIRS "src"
     REQUIRES 
         esp_driver_gpio
         esp_driver_rmt
diff --git a/extras/tests/pc_based/Makefile b/extras/tests/pc_based/Makefile
@@ -18,11 +18,12 @@ ramp_helper: ramp_helper.o $(LIB_O)
 ramp_helper.o: ramp_helper.cpp $(SRC_LIB_H) stubs.h
 	g++ -c $(CXXFLAGS) -o $@ $<
 
-LIB_H=FastAccelStepper.h log2/Log2Representation.h log2/Log2RepresentationConst.h StepperISR.h \
+LIB_H=FastAccelStepper.h log2/Log2Representation.h log2/Log2RepresentationConst.h \
+	  fas_queue/stepper_queue.h fas_queue/queue.h fas_queue/base.h \
 	  fas_ramp/RampGenerator.h fas_ramp/RampControl.h fas_ramp/RampCalculator.h \
-	  fas_arch/common.h fas_queue/base.h pd_test/test_queue.h
+	  fas_arch/common.h pd_test/test_queue.h
 LIB_O=FastAccelStepper.o Log2Representation.o StepperISR_test.o \
-	  RampGenerator.o RampControl.o RampCalculator.o StepperISR.o
+	  RampGenerator.o RampControl.o RampCalculator.o stepper_queue.o
 
 SRC_LIB_H=$(addprefix $(PRJ_ROOT)/src/,$(LIB_H))
 
@@ -53,7 +54,7 @@ RampControl.o: $(PRJ_ROOT)/src/fas_ramp/RampControl.cpp $(SRC_LIB_H)
 RampCalculator.o: $(PRJ_ROOT)/src/fas_ramp/RampCalculator.cpp $(SRC_LIB_H)
 	$(COMPILE.cpp) $< -o $@
 
-StepperISR.o: $(PRJ_ROOT)/src/StepperISR.cpp $(SRC_LIB_H)
+stepper_queue.o: $(PRJ_ROOT)/src/fas_queue/stepper_queue.cpp $(SRC_LIB_H)
 	$(COMPILE.cpp) $< -o $@
 
 StepperISR_test.o: StepperISR_test.cpp $(SRC_LIB_H)
diff --git a/extras/tests/pc_based/StepperISR_test.cpp b/extras/tests/pc_based/StepperISR_test.cpp
@@ -1,4 +1,4 @@
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 
 #include "FastAccelStepper.h"
 
diff --git a/extras/tests/pc_based/off_test_15.cpp b/extras/tests/pc_based/off_test_15.cpp
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 
 #include "FastAccelStepper.h"
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 
 char TCCR1A;
 char TCCR1B;
diff --git a/extras/tests/pc_based/ramp_helper.cpp b/extras/tests/pc_based/ramp_helper.cpp
@@ -4,7 +4,7 @@
 #include <stdint.h>
 
 #include "FastAccelStepper.h"
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 
 char TCCR1A;
 char TCCR1B;
diff --git a/extras/tests/pc_based/test_01.cpp b/extras/tests/pc_based/test_01.cpp
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 
 #include "FastAccelStepper.h"
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 
 char TCCR1A;
 char TCCR1B;
diff --git a/extras/tests/pc_based/test_02.cpp b/extras/tests/pc_based/test_02.cpp
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 
 #include "FastAccelStepper.h"
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 
 char TCCR1A;
 char TCCR1B;
diff --git a/extras/tests/pc_based/test_04.cpp b/extras/tests/pc_based/test_04.cpp
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 
 #include "FastAccelStepper.h"
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 
 char TCCR1A;
 char TCCR1B;
diff --git a/extras/tests/pc_based/test_05.cpp b/extras/tests/pc_based/test_05.cpp
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 
 #include "FastAccelStepper.h"
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 
 char TCCR1A;
 char TCCR1B;
diff --git a/extras/tests/pc_based/test_06.cpp b/extras/tests/pc_based/test_06.cpp
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 
 #include "FastAccelStepper.h"
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 
 char TCCR1A;
 char TCCR1B;
diff --git a/extras/tests/pc_based/test_07.cpp b/extras/tests/pc_based/test_07.cpp
@@ -4,7 +4,7 @@
 #include <cinttypes>
 
 #include "FastAccelStepper.h"
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 
 char TCCR1A;
 char TCCR1B;
diff --git a/extras/tests/pc_based/test_08.cpp b/extras/tests/pc_based/test_08.cpp
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 
 #include "FastAccelStepper.h"
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 
 char TCCR1A;
 char TCCR1B;
diff --git a/extras/tests/pc_based/test_09.cpp b/extras/tests/pc_based/test_09.cpp
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 
 #include "FastAccelStepper.h"
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 
 char TCCR1A;
 char TCCR1B;
diff --git a/extras/tests/pc_based/test_10.cpp b/extras/tests/pc_based/test_10.cpp
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 
 #include "FastAccelStepper.h"
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 
 char TCCR1A;
 char TCCR1B;
diff --git a/extras/tests/pc_based/test_11.cpp b/extras/tests/pc_based/test_11.cpp
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 
 #include "FastAccelStepper.h"
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 
 char TCCR1A;
 char TCCR1B;
diff --git a/extras/tests/pc_based/test_12.cpp b/extras/tests/pc_based/test_12.cpp
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 
 #include "FastAccelStepper.h"
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 
 char TCCR1A;
 char TCCR1B;
diff --git a/extras/tests/pc_based/test_13.cpp b/extras/tests/pc_based/test_13.cpp
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 
 #include "FastAccelStepper.h"
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 
 char TCCR1A;
 char TCCR1B;
diff --git a/extras/tests/pc_based/test_14.cpp b/extras/tests/pc_based/test_14.cpp
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 
 #include "FastAccelStepper.h"
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 
 char TCCR1A;
 char TCCR1B;
diff --git a/extras/tests/pc_based/test_15.cpp b/extras/tests/pc_based/test_15.cpp
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 
 #include "FastAccelStepper.h"
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 
 char TCCR1A;
 char TCCR1B;
diff --git a/extras/tests/pc_based/test_16.cpp b/extras/tests/pc_based/test_16.cpp
@@ -4,7 +4,7 @@
 #include <inttypes.h>
 
 #include "FastAccelStepper.h"
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 
 char TCCR1A;
 char TCCR1B;
diff --git a/extras/tests/pc_based/test_17.cpp b/extras/tests/pc_based/test_17.cpp
@@ -7,7 +7,7 @@
 uint16_t debug_part_size = 31;  // Default for PC tests
 
 #include "FastAccelStepper.h"
-// #include "StepperISR.h"
+// #include "fas_queue/stepper_queue.h"
 
 void inject_fill_interrupt(int mark) {}
 void noInterrupts() {}
diff --git a/extras/tests/pc_based/test_19.cpp b/extras/tests/pc_based/test_19.cpp
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 
 #include "FastAccelStepper.h"
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 
 char TCCR1A;
 char TCCR1B;
diff --git a/extras/tests/pc_based/test_20.cpp b/extras/tests/pc_based/test_20.cpp
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 
 #include "FastAccelStepper.h"
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 
 char TCCR1A;
 char TCCR1B;
diff --git a/src/FastAccelStepper.cpp b/src/FastAccelStepper.cpp
@@ -1,5 +1,5 @@
 #include "FastAccelStepper.h"
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 
 // This define in order to not shoot myself.
 #ifndef TEST
diff --git a/src/FastAccelStepper_idf4_esp32_pcnt.cpp b/src/FastAccelStepper_idf4_esp32_pcnt.cpp
@@ -1,4 +1,4 @@
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 #if defined(SUPPORT_ESP32_PULSE_COUNTER) && (ESP_IDF_VERSION_MAJOR == 4)
 
 uint32_t sig_idx[SUPPORT_ESP32_PULSE_COUNTER] = {
diff --git a/src/FastAccelStepper_idf5_esp32_pcnt.cpp b/src/FastAccelStepper_idf5_esp32_pcnt.cpp
@@ -1,4 +1,4 @@
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 #if defined(SUPPORT_ESP32_PULSE_COUNTER) && (ESP_IDF_VERSION_MAJOR == 5)
 
 // Why the hell, does espressif think, that the unit and channel id are not
diff --git a/src/fas_queue/stepper_queue.cpp b/src/fas_queue/stepper_queue.cpp
@@ -1,6 +1,6 @@
 #include <stdint.h>
 
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 
 AqeResultCode StepperQueue::addQueueEntry(const struct stepper_command_s* cmd,
                                           bool start) {
diff --git a/src/fas_queue/stepper_queue.h b/src/fas_queue/stepper_queue.h
diff --git a/src/fas_ramp/RampCalculator.cpp b/src/fas_ramp/RampCalculator.cpp
@@ -2,7 +2,7 @@
 
 #include <math.h>
 
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 
 #ifdef TEST_TIMING
 // This module has only one purpose:
diff --git a/src/fas_ramp/RampControl.cpp b/src/fas_ramp/RampControl.cpp
@@ -1,7 +1,7 @@
 #include <stdint.h>
 
 #include "FastAccelStepper.h"
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 
 #include "fas_ramp/RampControl.h"
 #include "fas_arch/common.h"
diff --git a/src/fas_ramp/RampGenerator.cpp b/src/fas_ramp/RampGenerator.cpp
@@ -2,7 +2,7 @@
 
 #include "FastAccelStepper.h"
 #include "fas_ramp/RampGenerator.h"
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 
 // This define in order to not shoot myself.
 #ifndef TEST
diff --git a/src/pd_avr/avr_queue.cpp b/src/pd_avr/avr_queue.cpp
@@ -1,5 +1,5 @@
 #if defined(ARDUINO_ARCH_AVR)
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 
 // T is the timer module number 0,1,2,3...
 // X is the Channel name A or B
diff --git a/src/pd_esp32/StepperISR_esp32xx_rmt.cpp b/src/pd_esp32/StepperISR_esp32xx_rmt.cpp
@@ -1,4 +1,4 @@
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 #if defined(SUPPORT_ESP32_RMT)
 
 #if (PART_SIZE & 1) != 0
diff --git a/src/pd_esp32/StepperISR_idf4_esp32_mcpwm_pcnt.cpp b/src/pd_esp32/StepperISR_idf4_esp32_mcpwm_pcnt.cpp
@@ -1,4 +1,4 @@
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 #if defined(SUPPORT_ESP32_MCPWM_PCNT) && (ESP_IDF_VERSION_MAJOR == 4)
 
 #define DEFAULT_TIMER_H_L_TRANSITION 160
diff --git a/src/pd_esp32/StepperISR_idf4_esp32_rmt.cpp b/src/pd_esp32/StepperISR_idf4_esp32_rmt.cpp
@@ -1,4 +1,4 @@
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 #if defined(HAVE_ESP32_RMT) && (ESP_IDF_VERSION_MAJOR == 4)
 
 // #define TEST_MODE
diff --git a/src/pd_esp32/StepperISR_idf4_esp32c3_rmt.cpp b/src/pd_esp32/StepperISR_idf4_esp32c3_rmt.cpp
@@ -1,4 +1,4 @@
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 #if defined(HAVE_ESP32C3_RMT) && (ESP_IDF_VERSION_MAJOR == 4)
 
 // #define TEST_MODE
diff --git a/src/pd_esp32/StepperISR_idf4_esp32s3_rmt.cpp b/src/pd_esp32/StepperISR_idf4_esp32s3_rmt.cpp
@@ -1,4 +1,4 @@
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 #if defined(HAVE_ESP32S3_RMT) && (ESP_IDF_VERSION_MAJOR == 4)
 
 // #define TEST_MODE
diff --git a/src/pd_esp32/StepperISR_idf5_esp32_rmt.cpp b/src/pd_esp32/StepperISR_idf5_esp32_rmt.cpp
@@ -1,4 +1,4 @@
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 #if defined(SUPPORT_ESP32_RMT_V2)
 
 // #define TEST_MODE
diff --git a/src/pd_esp32/esp32_queue.cpp b/src/pd_esp32/esp32_queue.cpp
@@ -1,4 +1,4 @@
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 
 #if defined(SUPPORT_ESP32)
 
diff --git a/src/pd_pico/pico_queue.cpp b/src/pd_pico/pico_queue.cpp
@@ -1,4 +1,4 @@
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 
 #if defined(SUPPORT_RP_PICO)
 #include <FreeRTOS.h>
diff --git a/src/pd_sam/sam_queue.cpp b/src/pd_sam/sam_queue.cpp
@@ -1,4 +1,4 @@
-#include "StepperISR.h"
+#include "fas_queue/stepper_queue.h"
 
 #if defined(ARDUINO_ARCH_SAM)
 const bool enabled = false;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "StepperISR.h"`
	`1`	`+#include "fas_queue/stepper_queue.h"`
`2`	`2`
`3`	`3`	`#include "FastAccelStepper.h"`
`4`	`4`