Finished Timer IRQ abstraction

Core/Include/Reg/SHAL_TIM_CALLBACK.h

@@ -2,25 +2,25 @@
 // Created by Luca on 8/28/2025.
 //
 
-#ifndef SHMINGO_HAL_SHAL_TIMER_CALLBACK_H
+#ifndef SHMINGO_HAL_SHAL_TIM_CALLBACK_H
-#define SHMINGO_HAL_SHAL_TIMER_CALLBACK_H
+#define SHMINGO_HAL_SHAL_TIM_CALLBACK_H
 
 #include "SHAL_TIM_REG.h"
 
 #define DEFINE_TIMER_IRQ(key, irq_handler)                \
 extern "C" void irq_handler(void) {                       \
-    auto tim_reg = getTimerRegister(key)                  \
+    auto tim_reg = getTimerRegister(key);                 \
     if (tim_reg->SR & TIM_SR_UIF) {                       \
         tim_reg->SR &= ~TIM_SR_UIF; /* clear flag */      \
         auto cb = timer_callbacks[static_cast<int>(key)]; \
         if (cb) cb();                                     \
-    }                                                     \
+    };                                               \
-}
+};
 
 typedef void (*TimerCallback)(); //Typedef for callback function
 
-static TimerCallback timer_callbacks[static_cast<int>(Timer_Key::NUM_TIMERS)] = {nullptr}; //Timer IRQ Callback table
+[[maybe_unused]] static TimerCallback timer_callbacks[static_cast<int>(Timer_Key::NUM_TIMERS)] = {nullptr}; //Timer IRQ Callback table
 
 void registerTimerCallback(Timer_Key key, TimerCallback callback);
 
-#endif //SHMINGO_HAL_SHAL_TIMER_CALLBACK_H
+#endif //SHMINGO_HAL_SHAL_TIM_CALLBACK_H

Core/Include/Reg/SHAL_TIM_REG.h

@@ -7,7 +7,8 @@
 enum class Bus {
     AHB,
     APB1,
-    APB2
+    APB2,
+    INVALID
 };
 
 struct RCC_Peripheral {
@@ -23,9 +24,11 @@ enum class Timer_Key { //For STM32F072
     S_TIM14,
     S_TIM15,
     S_TIM16,
-    S_TIM17
+    S_TIM17,
+    NUM_TIMERS
 };
 
+
 //Get timer peripheral struct including bus register, enable mask, timer mask
 constexpr RCC_Peripheral getTimerRCC(Timer_Key t) {
     switch(t) {
@@ -36,6 +39,7 @@ constexpr RCC_Peripheral getTimerRCC(Timer_Key t) {
         case Timer_Key::S_TIM15: return {Bus::APB2, &RCC->APB2ENR, RCC_APB2ENR_TIM15EN};
         case Timer_Key::S_TIM16: return {Bus::APB2, &RCC->APB2ENR, RCC_APB2ENR_TIM16EN};
         case Timer_Key::S_TIM17: return {Bus::APB2, &RCC->APB2ENR, RCC_APB2ENR_TIM17EN};
+        case Timer_Key::NUM_TIMERS: return {Bus::INVALID, nullptr, 0};;
     }
 
     return {Bus::APB2, &RCC->APB2ENR, RCC_APB2ENR_TIM1EN};
@@ -51,6 +55,7 @@ constexpr volatile TIM_TypeDef* getTimerRegister(Timer_Key t) {
         case Timer_Key::S_TIM15:  return TIM15;
         case Timer_Key::S_TIM16:  return TIM16;
         case Timer_Key::S_TIM17:  return TIM17;
+        case Timer_Key::NUM_TIMERS: return nullptr;
     }
     return TIM1;
 }
@@ -64,6 +69,7 @@ constexpr IRQn_Type getIRQn(Timer_Key t) {
         case Timer_Key::S_TIM15: return TIM15_IRQn;
         case Timer_Key::S_TIM16: return TIM16_IRQn;
         case Timer_Key::S_TIM17: return TIM17_IRQn;
+        case Timer_Key::NUM_TIMERS: return TIM1_BRK_UP_TRG_COM_IRQn;
     }
     return TIM1_BRK_UP_TRG_COM_IRQn;
 }

Core/Include/SHAL_TIM.h

@@ -2,8 +2,7 @@
 #define SHAL_TIM_H
 
 #include "SHAL_TIM_REG.h"
-
+#include "SHAL_TIM_CALLBACK.h"
-
 
 class Timer {
 public:
@@ -16,12 +15,20 @@ public:
     //Stops the counter
     void stop();
 
+    //Set prescaler value
     void setPrescaler(uint16_t presc);
 
+    //Set auto reload register
     void setARR(uint16_t arr);
 
+    //Enable interrupts
     void enableInterrupt();
 
+    //Set timer IRQ callback function
+    void setCallbackFunc(TimerCallback callback){
+        registerTimerCallback(timer, callback);
+    }
+
 private:
 
     Timer_Key timer;

Core/Src/Reg/SHAL_TIM.cpp

@@ -11,6 +11,8 @@ Timer::Timer(Timer_Key t) : timer(t), timer_reg(getTimerRegister(t)){
 
 void Timer::start() {
     timer_reg->CR1 |= TIM_CR1_CEN;
+    timer_reg->EGR |= TIM_EGR_UG; //load prescaler reg and ARR
+    enableInterrupt();
 }
 
 void Timer::stop() {

Core/Src/Reg/SHAL_TIM_CALLBACK.cpp

@@ -2,7 +2,15 @@
 // Created by Luca on 8/28/2025.
 //
 
-#include "SHAL_TIMER_CALLBACK.h"
+#include "SHAL_TIM_CALLBACK.h"
+
+DEFINE_TIMER_IRQ(Timer_Key::S_TIM1, TIM1_BRK_UP_TRG_COM_IRQHandler)
+DEFINE_TIMER_IRQ(Timer_Key::S_TIM2, TIM2_IRQHandler)
+DEFINE_TIMER_IRQ(Timer_Key::S_TIM3, TIM3_IRQHandler)
+DEFINE_TIMER_IRQ(Timer_Key::S_TIM14, TIM14_IRQHandler)
+DEFINE_TIMER_IRQ(Timer_Key::S_TIM15, TIM15_IRQHandler)
+DEFINE_TIMER_IRQ(Timer_Key::S_TIM16, TIM16_IRQHandler)
+DEFINE_TIMER_IRQ(Timer_Key::S_TIM17, TIM17_IRQHandler)
 
 void registerTimerCallback(Timer_Key key, TimerCallback callback){
     timer_callbacks[static_cast<int>(key)] = callback;

Core/Src/main.cpp

@@ -1,16 +1,6 @@
 #include "SHAL.h"
 #include "stm32f0xx.h"
 
-volatile int prev_button = false;
-volatile int curr_button = false;
-
-extern "C" void TIM2_IRQHandler(void){
-	if(TIM2->SR & TIM_SR_UIF){
-		TIM2->SR &= ~TIM_SR_UIF;
-		GPIOA->ODR ^= (1 << 4);
-	}
-}
-
 extern "C" void EXTI0_1_IRQHandler(void) {
     if (EXTI->PR & (1 << 0)) {   //Check pending flag
         EXTI->PR |= (1 << 0);    //Clear it by writing 1
@@ -18,16 +8,24 @@ extern "C" void EXTI0_1_IRQHandler(void) {
     }
 }
 
+void tim2Handler(){
+    GPIOA->ODR ^= (1 << 4);
+}
+
 int main() {
     RCC->AHBENR |= RCC_AHBENR_GPIOAEN;
     RCC->AHBENR |= RCC_AHBENR_GPIOBEN;
 
-    RCC->APB1ENR |= RCC_APB1ENR_TIM2EN;
+    auto timer2 = Timer(Timer_Key::S_TIM2);
+
+    timer2.setPrescaler(8000 - 1);
+    timer2.setARR(250 - 1);
+    timer2.setCallbackFunc(tim2Handler);
+    timer2.start();
+
 
     RCC->APB2ENR |= RCC_APB2ENR_SYSCFGEN; // Enable SYSCFG clock (needed for EXTI)
 
-    TIM2->EGR |= TIM_EGR_UG;   //Force update to load PSC/ARR
-
     GPIOA->MODER &= ~(0b11 << (4 * 2));
     GPIOA->MODER |= (0b1 << (4 * 2));
 
@@ -37,21 +35,12 @@ int main() {
     GPIOB->MODER &= ~(0x3 << (0 * 2));
     GPIOB->MODER |=  (0x0 << (0 * 2));
 
-    TIM2->PSC = 8000 - 1; //8MHz base, prescaler
-    TIM2->ARR = 500 - 1; //500ms, auto reload register
-
     SYSCFG->EXTICR[0] &= ~SYSCFG_EXTICR1_EXTI0; // Clear EXTI0 mapping
     SYSCFG->EXTICR[0] |= SYSCFG_EXTICR1_EXTI0_PB; // Map PA0 -> EXTI0
 
     EXTI->IMR |= (1 << 0);   // Unmask EXTI0
     EXTI->RTSR |= (1 << 0);  // Trigger on rising edge
 
-
-    TIM2->DIER |= TIM_DIER_UIE; //Interrupt register
-    TIM2->CR1 |= TIM_CR1_CEN; //Counter enable
-
-
-    NVIC_EnableIRQ(TIM2_IRQn);
     NVIC_EnableIRQ(EXTI0_1_IRQn); // EXTI lines 0 and 1 share an IRQ vector
 
     __enable_irq();