Workround bug in xTimerIsTimerActive.

h2zero · h2zero · commit b9350bb4a746 · 2021-11-21T20:50:38.000-07:00
With arduino-esp32 2.0.1, xTimerIsTimerActive will sometimes return pdTRUE even though the timer has expired, so and extra check was added.
diff --git a/src/nimble/nimble_npl_os.h b/src/nimble/nimble_npl_os.h
@@ -235,7 +235,10 @@ ble_npl_callout_stop(struct ble_npl_callout *co)
 static inline bool
 ble_npl_callout_is_active(struct ble_npl_callout *co)
 {
-    return xTimerIsTimerActive(co->handle) == pdTRUE;
+    /* Workaround for bug in xTimerIsTimerActive with latest arduino core.
+     * Sometimes xTimerIsTimerActive returns pdTRUE even though the timer has expired, so we double check.
+     */
+    return xTimerIsTimerActive(co->handle) == pdTRUE && xTimerGetExpiryTime(co->handle) > xTaskGetTickCountFromISR();
 }
 
 static inline ble_npl_time_t

Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,10 @@ ble_npl_callout_stop(struct ble_npl_callout *co)`
`235`	`235`	`static inline bool`
`236`	`236`	`ble_npl_callout_is_active(struct ble_npl_callout *co)`
`237`	`237`	`{`
`238`		`- return xTimerIsTimerActive(co->handle) == pdTRUE;`
	`238`	`+ /* Workaround for bug in xTimerIsTimerActive with latest arduino core.`
	`239`	`+ * Sometimes xTimerIsTimerActive returns pdTRUE even though the timer has expired, so we double check.`
	`240`	`+ */`
	`241`	`+ return xTimerIsTimerActive(co->handle) == pdTRUE && xTimerGetExpiryTime(co->handle) > xTaskGetTickCountFromISR();`
`239`	`242`	`}`
`240`	`243`
`241`	`244`	`static inline ble_npl_time_t`