Refactored timer object

Author: P-R-O-C-H-Y

cores/esp32/esp32-hal-timer.c

@@ -107,29 +107,66 @@ void timerEnd(hw_timer_t timer_handle){
         log_e("Failed to destroy GPTimer, error num=%d", err);
     } 
 }
-
-bool IRAM_ATTR timerFnWrapper(hw_timer_t timer, const gptimer_alarm_event_data_t *edata, void *arg){
-    void (*fn)(void) = arg;
-    fn();
+typedef void (*voidFuncPtr)(void);
+typedef void (*voidFuncPtrArg)(void*);
+typedef struct {
+    voidFuncPtr fn;
+    void* arg;
+} interrupt_config_t;
+
+bool IRAM_ATTR timerFnWrapper(hw_timer_t timer, const gptimer_alarm_event_data_t *edata, void *config){
+    interrupt_config_t * isr = (interrupt_config_t*)config;
+    if(isr->arg){
+            ((voidFuncPtrArg)isr->fn)(isr->arg);
+    } else {
+        	isr->fn();
+    }
+    //void (*fn)(void) = config.fn;
+    //fn();
 
     // some additional logic or handling may be required here to approriately yield or not
     return false;
 }
-
-void timerAttachInterrupt(hw_timer_t timer, void (*fn)(void)){
+void timerAttachInterruptFunctionalArg(hw_timer_t timer, voidFuncPtrArg fn /*void (*fn)(void*)*/, void * arg){
     esp_err_t err = ESP_OK;
     gptimer_event_callbacks_t cbs = {
         .on_alarm = timerFnWrapper,
     };
 
+    interrupt_config_t config = {
+        .fn = (voidFuncPtr)fn;
+        .arg = arg;
+    }
+
     gptimer_disable(timer);
-    err = gptimer_register_event_callbacks(timer, &cbs, fn);
+    err = gptimer_register_event_callbacks(timer, &cbs, &config);
     if (err != ESP_OK){
         log_e("Timer Attach Interrupt failed, error num=%d", err);
     } 
     gptimer_enable(timer);
 }
 
+void timerAttachInterruptArg(hw_timer_t timer, voidFuncPtrArg fn /*void (*fn)(void)*/, void * arg){
+    timerAttachInterruptFunctionalArg(timer, fn, arg);
+}
+
+void timerAttachInterrupt(hw_timer_t timer, voidFuncPtr fn/*void (*fn)(void)*/){
+    
+    //esp_err_t err = ESP_OK;
+    //gptimer_event_callbacks_t cbs = {
+    //    .on_alarm = timerFnWrapper,
+    //};
+
+    // gptimer_disable(timer);
+    // err = gptimer_register_event_callbacks(timer, &cbs, fn);
+    // if (err != ESP_OK){
+    //     log_e("Timer Attach Interrupt failed, error num=%d", err);
+    // } 
+    // gptimer_enable(timer);
+
+    timerAttachInterruptFunctionalArg(timer, (voidFuncPtrArg)fn, NULL);
+}
+
 void timerDetachInterrupt(hw_timer_t timer){
     esp_err_t err = ESP_OK;
     err = gptimer_set_alarm_action(timer, NULL);
@@ -140,18 +177,18 @@ void timerDetachInterrupt(hw_timer_t timer){
 
 uint64_t timerReadMicros(hw_timer_t timer){
     uint64_t timer_val = timerRead(timer);
-    uint32_t frequency = timerGetResolution(timer);
+    uint32_t frequency = timerGetFrequency(timer);
     return timer_val * 1000000 / frequency;
 }
 
 uint64_t timerReadMilis(hw_timer_t timer){
     uint64_t timer_val = timerRead(timer);
-    uint32_t frequency = timerGetResolution(timer);
+    uint32_t frequency = timerGetFrequency(timer);
     return timer_val * 1000 / frequency;
 }
 
 double timerReadSeconds(hw_timer_t timer){
     uint64_t timer_val = timerRead(timer);
-    uint32_t frequency = timerGetResolution(timer);
+    uint32_t frequency = timerGetFrequency(timer);
     return (double)timer_val / frequency;
 }

cores/esp32/esp32-hal-timer.h

@@ -35,6 +35,7 @@ hw_timer_t timerBegin(uint32_t frequency);
 void timerEnd(hw_timer_t timer);
 
 void timerAttachInterrupt(hw_timer_t timer, void (*fn)(void));
+void timerAttachInterruptArg(hw_timer_t timer, void (*fn)(void*), void * arg);
 void timerDetachInterrupt(hw_timer_t timer);
 
 void timerStart(hw_timer_t timer);