refactor mstimer callback handling (#400)

Co-authored-by: Steve Karg <skarg@users.sourceforge.net>
This commit is contained in:
Steve Karg
2023-02-18 10:02:13 -06:00
committed by GitHub
parent 343d9f893d
commit 261a506eb4
5 changed files with 112 additions and 220 deletions
+6 -93
View File
@@ -29,64 +29,19 @@
#include <stdint.h>
#include "hardware.h"
#include "bacnet/basic/sys/mstimer.h"
#include "bacnet/basic/sys/debug.h"
/* counter for the various timers */
static volatile unsigned long Millisecond_Counter;
static volatile struct mstimer_callback_data_t *Callback_Head;
/**
* Activate the LED
*/
static void timer_debug_on(void)
{
GPIO_WriteBit(GPIOB, GPIO_Pin_13, Bit_SET);
}
/**
* Deactivate the LED
*/
static void timer_debug_off(void)
{
GPIO_WriteBit(GPIOB, GPIO_Pin_13, Bit_RESET);
}
/**
* Toggle the state of the debug LED
*/
static void timer_debug_toggle(void)
{
static bool state = false;
if (state) {
timer_debug_off();
state = false;
} else {
timer_debug_on();
state = true;
}
}
/**
* Handles the interrupt from the timer
*/
void SysTick_Handler(void)
{
struct mstimer_callback_data_t *cb;
/* increment the tick count */
Millisecond_Counter++;
cb = (struct mstimer_callback_data_t *)Callback_Head;
while (cb) {
if (mstimer_expired(&cb->timer)) {
cb->callback();
if (mstimer_interval(&cb->timer) > 0) {
mstimer_reset(&cb->timer);
}
}
cb = cb->next;
}
timer_debug_toggle();
/* run any callbacks */
mstimer_callback_handler();
}
/**
@@ -99,58 +54,16 @@ unsigned long mstimer_now(void)
return Millisecond_Counter;
}
/**
* Configures and enables a repeating callback function
*
* @param cb - pointer to a #mstimer_callback_data_t
* @param callback - pointer to a #timer_callback_function function
* @param milliseconds - how often to call the function
*
* @return true if successfully added and enabled
*/
void mstimer_callback(struct mstimer_callback_data_t *new_cb,
mstimer_callback_function callback,
unsigned long milliseconds)
{
struct mstimer_callback_data_t *cb;
if (new_cb) {
new_cb->callback = callback;
mstimer_set(&new_cb->timer, milliseconds);
}
if (Callback_Head) {
cb = (struct mstimer_callback_data_t *)Callback_Head;
while (cb) {
if (!cb->next) {
cb->next = new_cb;
break;
} else {
cb = cb->next;
}
}
} else {
Callback_Head = new_cb;
}
}
/**
* Timer setup for 1 millisecond timer
*/
void mstimer_init(void)
{
GPIO_InitTypeDef GPIO_InitStructure;
GPIO_StructInit(&GPIO_InitStructure);
/* Configure the Receive LED */
GPIO_InitStructure.GPIO_Pin = GPIO_Pin_13;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP;
GPIO_Init(GPIOB, &GPIO_InitStructure);
/* Setup SysTick Timer for 1ms interrupts */
if (SysTick_Config(SystemCoreClock / 1000)) {
/* Capture error */
while (1)
;
while (1) {
/* config error? return 1 = failed, 0 = successful */
}
}
NVIC_EnableIRQ(SysTick_IRQn);
}