Skip to content

Commit bac7ac7

Browse files
committed
πŸ› Fix Teensy 4.x stepper timing (#28169)
πŸ§‘β€πŸ’» Timer general cleanup 🩹 Teensy 4.x timer mods
1 parent ef75098 commit bac7ac7

13 files changed

Lines changed: 90 additions & 54 deletions

File tree

β€ŽMarlin/src/HAL/AVR/timers.hβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ FORCE_INLINE void HAL_timer_start(const uint8_t timer_num, const uint32_t) {
109109
* (otherwise, characters will be lost due to UART overflow).
110110
* Then: Stepper, Endstops, Temperature, and -finally- all others.
111111
*/
112-
#define HAL_timer_isr_prologue(TIMER_NUM)
113-
#define HAL_timer_isr_epilogue(TIMER_NUM)
112+
inline void HAL_timer_isr_prologue(const uint8_t) {}
113+
inline void HAL_timer_isr_epilogue(const uint8_t) {}
114114

115115
/* 18 cycles maximum latency */
116116
#ifndef HAL_STEP_TIMER_ISR

β€ŽMarlin/src/HAL/DUE/timers.hβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,4 +125,4 @@ FORCE_INLINE static void HAL_timer_isr_prologue(const uint8_t timer_num) {
125125
pConfig->pTimerRegs->TC_CHANNEL[pConfig->channel].TC_SR;
126126
}
127127

128-
#define HAL_timer_isr_epilogue(TIMER_NUM)
128+
inline void HAL_timer_isr_epilogue(const uint8_t) {}

β€ŽMarlin/src/HAL/ESP32/timers.hβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,5 +131,5 @@ void HAL_timer_enable_interrupt(const uint8_t timer_num);
131131
void HAL_timer_disable_interrupt(const uint8_t timer_num);
132132
bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
133133

134-
#define HAL_timer_isr_prologue(TIMER_NUM)
135-
#define HAL_timer_isr_epilogue(TIMER_NUM)
134+
inline void HAL_timer_isr_prologue(const uint8_t) {}
135+
inline void HAL_timer_isr_epilogue(const uint8_t) {}

β€ŽMarlin/src/HAL/LINUX/timers.hβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,5 +93,5 @@ void HAL_timer_enable_interrupt(const uint8_t timer_num);
9393
void HAL_timer_disable_interrupt(const uint8_t timer_num);
9494
bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
9595

96-
#define HAL_timer_isr_prologue(TIMER_NUM)
97-
#define HAL_timer_isr_epilogue(TIMER_NUM)
96+
inline void HAL_timer_isr_prologue(const uint8_t) {}
97+
inline void HAL_timer_isr_epilogue(const uint8_t) {}

β€ŽMarlin/src/HAL/LPC1768/timers.hβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,4 +170,4 @@ FORCE_INLINE static void HAL_timer_isr_prologue(const uint8_t timer_num) {
170170
}
171171
}
172172

173-
#define HAL_timer_isr_epilogue(TIMER_NUM)
173+
inline void HAL_timer_isr_epilogue(const uint8_t) {}

β€ŽMarlin/src/HAL/SAMD51/timers.hβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,4 +140,4 @@ FORCE_INLINE static void HAL_timer_isr_prologue(const uint8_t timer_num) {
140140
}
141141
}
142142

143-
#define HAL_timer_isr_epilogue(timer_num)
143+
inline void HAL_timer_isr_epilogue(const uint8_t) {}

β€ŽMarlin/src/HAL/STM32/timers.hβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,5 +120,5 @@ FORCE_INLINE static void HAL_timer_set_compare(const uint8_t timer_num, const ha
120120
}
121121
}
122122

123-
#define HAL_timer_isr_prologue(TIMER_NUM)
124-
#define HAL_timer_isr_epilogue(TIMER_NUM)
123+
inline void HAL_timer_isr_prologue(const uint8_t) {}
124+
inline void HAL_timer_isr_epilogue(const uint8_t) {}

β€ŽMarlin/src/HAL/STM32F1/timers.hβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ FORCE_INLINE static void HAL_timer_isr_prologue(const uint8_t timer_num) {
186186
}
187187
}
188188

189-
#define HAL_timer_isr_epilogue(TIMER_NUM)
189+
inline void HAL_timer_isr_epilogue(const uint8_t) {}
190190

191191
// No command is available in framework to turn off ARPE bit, which is turned on by default in libmaple.
192192
// Needed here to reset ARPE=0 for stepper timer

β€ŽMarlin/src/HAL/TEENSY31_32/timers.hβ€Ž

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ typedef uint32_t hal_timer_t;
7474
#define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(TEMP_TIMER_NUM)
7575

7676
#ifndef HAL_STEP_TIMER_ISR
77-
#define HAL_STEP_TIMER_ISR() extern "C" void ftm0_isr() //void TC3_Handler()
77+
#define HAL_STEP_TIMER_ISR() extern "C" void ftm0_isr()
7878
#endif
7979
#ifndef HAL_TEMP_TIMER_ISR
80-
#define HAL_TEMP_TIMER_ISR() extern "C" void ftm1_isr() //void TC4_Handler()
80+
#define HAL_TEMP_TIMER_ISR() extern "C" void ftm1_isr()
8181
#endif
8282

8383
void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency);
@@ -110,4 +110,4 @@ void HAL_timer_disable_interrupt(const uint8_t timer_num);
110110
bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
111111

112112
void HAL_timer_isr_prologue(const uint8_t timer_num);
113-
#define HAL_timer_isr_epilogue(TIMER_NUM)
113+
inline void HAL_timer_isr_epilogue(const uint8_t) {}

β€ŽMarlin/src/HAL/TEENSY35_36/timers.hβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,4 +109,4 @@ void HAL_timer_disable_interrupt(const uint8_t timer_num);
109109
bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
110110

111111
void HAL_timer_isr_prologue(const uint8_t timer_num);
112-
#define HAL_timer_isr_epilogue(TIMER_NUM)
112+
inline void HAL_timer_isr_epilogue(const uint8_t) {}

0 commit comments

Comments
Β (0)