[PYFW-325] Hardware timer for Lora ticks fully implemented #close #comment Fix tested

iwahdan88 · iwahdan88 · commit efa74cb26857 · 2019-03-27T17:41:09.000+01:00
diff --git a/esp32/hal/esp32_mphal.c b/esp32/hal/esp32_mphal.c
@@ -58,9 +58,9 @@ IRAM_ATTR static void HAL_TimerCallback (void* arg) {
         HAL_tick_user_cb();
     }
 
-        TIMERG0.int_clr_timers.t1 = 1;
-        TIMERG0.hw_timer[1].update=1;
-        TIMERG0.hw_timer[1].config.alarm_en = 1;
+    TIMERG0.int_clr_timers.t1 = 1;
+    TIMERG0.hw_timer[1].update=1;
+    TIMERG0.hw_timer[1].config.alarm_en = 1;
 
 }
 
diff --git a/esp32/lora/timer-board.c b/esp32/lora/timer-board.c
@@ -56,12 +56,17 @@ static TimerTime_t TimerTickCounterContext = 0;
  * Value trigging the IRQ
  */
 DRAM_ATTR volatile TimerTime_t TimeoutCntValue = 0;
-
+extern TaskHandle_t xLoRaTimerTaskHndl;
 
 static IRAM_ATTR void TimerCallback (void) {
+    BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+
     TimerTickCounter++;
     if (TimeoutCntValue > 0 && TimerTickCounter == TimeoutCntValue) {
         TimerIrqHandler();
+        // Notify the thread so it will wake up when the ISR is complete
+        vTaskNotifyGiveFromISR(xLoRaTimerTaskHndl, &xHigherPriorityTaskWoken);
+        portYIELD_FROM_ISR();
     }
 }
 
diff --git a/esp32/mods/modlora.c b/esp32/mods/modlora.c
@@ -1052,10 +1052,12 @@ static void TASK_LoRa_Timer (void *pvParameters) {
         if (thread_notification) {
 
             modlora_timerCallback cb;
-            xQueueReceive(xCbQueue, &cb, 0);
-            if(cb != NULL)
+            while (pdTRUE == xQueueReceive(xCbQueue, &cb, 0))
             {
-                cb();
+                if(cb != NULL)
+                {
+                    cb();
+                }
             }
         }
     }
diff --git a/lib/lora/system/timer.c b/lib/lora/system/timer.c
@@ -229,11 +229,6 @@ IRAM_ATTR void TimerIrqHandler( void )
         if( elapsedTimer->Callback != NULL )
         {
             modlora_set_timer_callback(elapsedTimer->Callback);
-
-            BaseType_t xHigherPriorityTaskWoken = pdFALSE;
-            // Notify the thread so it will wake up when the ISR is complete
-            vTaskNotifyGiveFromISR(xLoRaTimerTaskHndl, &xHigherPriorityTaskWoken);
-            portYIELD_FROM_ISR();
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -58,9 +58,9 @@ IRAM_ATTR static void HAL_TimerCallback (void* arg) {`
`58`	`58`	`HAL_tick_user_cb();`
`59`	`59`	`}`
`60`	`60`
`61`		`- TIMERG0.int_clr_timers.t1 = 1;`
`62`		`- TIMERG0.hw_timer[1].update=1;`
`63`		`- TIMERG0.hw_timer[1].config.alarm_en = 1;`
	`61`	`+ TIMERG0.int_clr_timers.t1 = 1;`
	`62`	`+ TIMERG0.hw_timer[1].update=1;`
	`63`	`+ TIMERG0.hw_timer[1].config.alarm_en = 1;`
`64`	`64`
`65`	`65`	`}`
`66`	`66`
Original file line number	Diff line number	Diff line change
`@@ -1052,10 +1052,12 @@ static void TASK_LoRa_Timer (void *pvParameters) {`
`1052`	`1052`	`if (thread_notification) {`
`1053`	`1053`
`1054`	`1054`	`modlora_timerCallback cb;`
`1055`		`- xQueueReceive(xCbQueue, &cb, 0);`
`1056`		`- if(cb != NULL)`
	`1055`	`+ while (pdTRUE == xQueueReceive(xCbQueue, &cb, 0))`
`1057`	`1056`	`{`
`1058`		`- cb();`
	`1057`	`+ if(cb != NULL)`
	`1058`	`+ {`
	`1059`	`+ cb();`
	`1060`	`+ }`
`1059`	`1061`	`}`
`1060`	`1062`	`}`
`1061`	`1063`	`}`
Original file line number	Diff line number	Diff line change
`@@ -229,11 +229,6 @@ IRAM_ATTR void TimerIrqHandler( void )`
`229`	`229`	`if( elapsedTimer->Callback != NULL )`
`230`	`230`	`{`
`231`	`231`	`modlora_set_timer_callback(elapsedTimer->Callback);`
`232`		`-`
`233`		`- BaseType_t xHigherPriorityTaskWoken = pdFALSE;`
`234`		`- // Notify the thread so it will wake up when the ISR is complete`
`235`		`- vTaskNotifyGiveFromISR(xLoRaTimerTaskHndl, &xHigherPriorityTaskWoken);`
`236`		`- portYIELD_FROM_ISR();`
`237`	`232`	`}`
`238`	`233`	`}`
`239`	`234`