mirror of
https://git.intern.spaceteamaachen.de/ALPAKA/rtos2-utils.git
synced 2025-08-06 11:07:34 +00:00
Added fixes to timer implementation
This commit is contained in:
@@ -5,7 +5,11 @@
|
||||
|
||||
namespace sta {
|
||||
RtosTimer::RtosTimer(void (*callback)(void *arg), void *arg)
|
||||
: timer_id_{NULL}, timer_attr_{.name="Timer", .attr_bits=osTimerOnce, .cb_size=sizeof(osTimerAttr_t)}, callback_{callback}, callbackArg_{arg}
|
||||
: timer_id_{NULL},
|
||||
timer_attr_{.name="Timer", .attr_bits=osTimerOnce, /*.cb_size=sizeof(osTimerAttr_t)*/},
|
||||
callback_{callback},
|
||||
callbackArg_{arg},
|
||||
running_{false}
|
||||
{
|
||||
// Pass an anonymous function as the callback which will invoke the currently registered callback.
|
||||
timer_id_ = osTimerNew(timeoutHandler, osTimerOnce, arg, &timer_attr_);
|
||||
@@ -19,6 +23,8 @@ namespace sta {
|
||||
|
||||
RtosTimer::~RtosTimer()
|
||||
{
|
||||
if (isRunning()) stop();
|
||||
|
||||
osTimerDelete(timer_id_);
|
||||
}
|
||||
|
||||
@@ -32,13 +38,38 @@ namespace sta {
|
||||
{
|
||||
osStatus_t status = osTimerStart(timer_id_, millis);
|
||||
|
||||
if (status != osOK) STA_DEBUG_PRINTLN("Timer start failed");
|
||||
if (status != osOK)
|
||||
{
|
||||
STA_DEBUG_PRINTLN("Timer start failed");
|
||||
return;
|
||||
}
|
||||
|
||||
running_ = true;
|
||||
}
|
||||
|
||||
void RtosTimer::stop()
|
||||
{
|
||||
osStatus_t status = osTimerStop(timer_id_);
|
||||
|
||||
if (status != osOK) STA_DEBUG_PRINTLN("Timer stop failed");
|
||||
if (status != osOK)
|
||||
{
|
||||
STA_DEBUG_PRINTLN("Timer stop failed");
|
||||
return;
|
||||
}
|
||||
|
||||
running_ = false;
|
||||
}
|
||||
|
||||
bool RtosTimer::isRunning()
|
||||
{
|
||||
return running_;
|
||||
}
|
||||
|
||||
void RtosTimer::timeoutHandler(void* arg)
|
||||
{
|
||||
RtosTimer* timer = static_cast<RtosTimer*>(arg);
|
||||
timer->running_ = false;
|
||||
timer->callback_(timer->callbackArg_);
|
||||
}
|
||||
|
||||
} // namespace sta
|
||||
|
Reference in New Issue
Block a user