ALPAKA/rtos2-utils
1
0
Fork 0
mirror of https://git.intern.spaceteamaachen.de/ALPAKA/rtos2-utils.git synced 2025-08-06 19:17:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change include paths

Browse Source
This commit is contained in:
Henrik Stickann
2022-05-07 00:24:58 +02:00
parent 941de7e064
commit baef731e1a
22 changed files with 335 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/os2/mutex.cpp
View File

@@ -1,19 +0,0 @@
#include <sta/os2/mutex.hpp>
namespace sta
{
Os2Mutex::Os2Mutex(osMutexId_t * handle)
: handle_{handle}
{}
void Os2Mutex::acquire()
{
osMutexAcquire(*handle_, osWaitForever);
}
void Os2Mutex::release()
{
osMutexRelease(*handle_);
}
}

41
src/os2/system_event.cpp
View File

@@ -1,41 +0,0 @@
#include <sta/os2/system_event.hpp>
#ifdef STA_OS2_SYSTEM_EVENT_ENABLE
#include <cmsis_os2.h>
#ifndef STA_OS2_SYSTEM_EVENT_HANDLE
# define STA_OS2_SYSTEM_EVENT_HANDLE systemEventHandle
#endif // !STA_OS2_SYSTEM_EVENT_HANDLE
// Access handle from freertos.c
extern osEventFlagsId_t STA_OS2_SYSTEM_EVENT_HANDLE;
namespace sta
{
void signalSystemEvents(uint32_t flags)
{
osEventFlagsSet(STA_OS2_SYSTEM_EVENT_HANDLE, flags);
}
void waitForSystemEvents(uint32_t flags, uint32_t options, uint32_t timeout)
{
osEventFlagsWait(STA_OS2_SYSTEM_EVENT_HANDLE, flags, options | osFlagsNoClear, timeout);
}
void signalStartupEvent()
{
signalSystemEvents(STA_SYSTEM_EVENT_STARTUP);
}
void waitForStartupEvent()
{
waitForSystemEvents(STA_SYSTEM_EVENT_STARTUP, osFlagsWaitAll, osWaitForever);
}
} // namespace sta
#endif // STA_SYSTEM_EVENT_ENABLE

46
src/os2/watchdog/heartbeat.cpp
View File

@@ -1,46 +0,0 @@
#include <sta/os2/watchdog.hpp>
#ifdef STA_OS2_WATCHDOG_ENABLE
#include <cmsis_os2.h>
#ifndef STA_OS2_WATCHDOG_TIMER_PERIOD
# define STA_OS2_WATCHDOG_TIMER_PERIOD 1000
#endif // !STA_OS2_WATCHDOG_TIMER_PERIOD
#ifndef STA_OS2_WATCHDOG_TIMER_HANDLE
# define STA_OS2_WATCHDOG_TIMER_HANDLE heartbeatHandle
#endif // !STA_OS2_WATCHDOG_TIMER_HANDLE
#ifndef STA_OS2_WATCHDOG_TIMER_CALLBACK
# define STA_OS2_WATCHDOG_TIMER_CALLBACK heartbeatCallback
#endif // !STA_OS2_WATCHDOG_TIMER_CALLBACK
// Access handles from freertos.c
extern osTimerId_t STA_OS2_WATCHDOG_TIMER_HANDLE;
namespace sta
{
void startWatchdogTimer()
{
osTimerStart(STA_OS2_WATCHDOG_TIMER_HANDLE, STA_OS2_WATCHDOG_TIMER_PERIOD);
}
} // namespace sta
// Declare with C linkage
extern "C"
{
void STA_OS2_WATCHDOG_TIMER_CALLBACK(void *)
{
// Notify watchdog task to send heartbeat message
// Required because blocking in a timer callback is not allowed
sta::notifyWatchdog(STA_WATCHDOG_FLAG_HEARTBEAT);
}
}
#endif // STA_OS2_WATCHDOG_ENABLE

58
src/os2/watchdog/watchdog.cpp
View File

@@ -1,58 +0,0 @@
#include <sta/os2/watchdog.hpp>
#ifdef STA_OS2_WATCHDOG_ENABLE
#include <sta/os2/defs.hpp>
#include <sta/os2/system_event.hpp>
#include <main.h>
#include <cmsis_os2.h>
#ifndef STA_OS2_WATCHDOG_HANDLE
# define STA_OS2_WATCHDOG_HANDLE watchdogHandle
#endif // !STA_OS2_WATCHDOG_HANDLE
#ifndef STA_OS2_WATCHDOG_ENTRY_FUNCTION
# define STA_OS2_WATCHDOG_ENTRY_FUNCTION watchdogTask
#endif // !STA_OS2_WATCHDOG_ENTRY_FUNCTION
// Access handle from freertos.c
extern osThreadId_t STA_OS2_WATCHDOG_HANDLE;
namespace sta
{
void notifyWatchdog(uint32_t flags)
{
osThreadFlagsSet(STA_OS2_WATCHDOG_HANDLE, flags);
}
// Handler for watchdog events
extern void watchdogEventHandler(void * arg, uint32_t flags);
} // namespace sta
// Declare with C linkage
extern "C"
{
void STA_OS2_WATCHDOG_ENTRY_FUNCTION(void * arg)
{
sta::waitForStartupEvent();
while (true)
{
// Wait for any flag to be set
uint32_t flags = osThreadFlagsWait(STA_OS2_THREAD_FLAGS_VALID_BITS, osFlagsWaitAny, osWaitForever);
// Call event handler
sta::watchdogEventHandler(arg, flags);
}
}
}
#endif // STA_OS2_WATCHDOG_ENABLE

19
src/rtos2/mutex.cpp Normal file
View File

@@ -0,0 +1,19 @@
#include <sta/rtos2/mutex.hpp>
namespace sta
{
Rtos2Mutex::Rtos2Mutex(osMutexId_t * handle)
: handle_{handle}
{}
void Rtos2Mutex::acquire()
{
osMutexAcquire(*handle_, osWaitForever);
}
void Rtos2Mutex::release()
{
osMutexRelease(*handle_);
}
} // namespace sta

12
src/os2/signal.cpp → src/rtos2/signal.cpp
View File

@@ -1,28 +1,28 @@
#include <sta/os2/signal.hpp>
#include <sta/rtos2/signal.hpp>
namespace sta
{
Os2Signal::Os2Signal(osSemaphoreId_t * semaphore)
Rtos2Signal::Rtos2Signal(osSemaphoreId_t * semaphore)
: semaphore_{semaphore}
{}
void Os2Signal::notify()
void Rtos2Signal::notify()
{
osSemaphoreRelease(*semaphore_);
}
bool Os2Signal::peek()
bool Rtos2Signal::peek()
{
return (osSemaphoreGetCount(*semaphore_) != 0);
}
bool Os2Signal::test()
bool Rtos2Signal::test()
{
return (osSemaphoreAcquire(*semaphore_, 0) == osOK);
}
void Os2Signal::wait()
void Rtos2Signal::wait()
{
osSemaphoreAcquire(*semaphore_, osWaitForever);
}

22
src/os2/startup.cpp → src/rtos2/startup.cpp
View File

@@ -1,20 +1,20 @@
/**
* @brief System startup task.
*/
#include <sta/os2/startup.hpp>
#ifdef STA_OS2_STARTUP_ENABLE
#include <sta/rtos2/startup.hpp>
#ifdef STA_RTOS2_STARTUP_ENABLE
#include <sta/lang.hpp>
#include <sta/hal/init.hpp>
#include <sta/os2/system_event.hpp>
#include <sta/os2/watchdog.hpp>
#include <sta/rtos2/system_event.hpp>
#include <sta/rtos2/watchdog.hpp>
#include <cmsis_os2.h>
#ifndef STA_OS2_STARTUP_ENTRY_FUNCTION
# define STA_OS2_STARTUP_ENTRY_FUNCTION startupTask
#endif // !STA_OS2_STARTUP_ENTRY_FUNCTION
#ifndef STA_RTOS2_STARTUP_ENTRY_FUNCTION
# define STA_RTOS2_STARTUP_ENTRY_FUNCTION startupTask
#endif // !STA_RTOS2_STARTUP_ENTRY_FUNCTION
namespace sta
@@ -29,7 +29,7 @@ namespace sta
// Declare with C linkage
extern "C"
{
void STA_OS2_STARTUP_ENTRY_FUNCTION(void * arg)
void STA_RTOS2_STARTUP_ENTRY_FUNCTION(void * arg)
{
// Call further initialization code
sta::startupExtras(arg);
@@ -37,10 +37,10 @@ extern "C"
// Initialize HAL
sta::initHAL();
#ifdef STA_OS2_WATCHDOG_ENABLE
#ifdef STA_RTOS2_WATCHDOG_ENABLE
// Start timers
sta::startWatchdogTimer();
#endif // STA_OS2_WATCHDOG_ENABLE
#endif // STA_RTOS2_WATCHDOG_ENABLE
// Wake tasks
sta::signalStartupEvent();
@@ -51,4 +51,4 @@ extern "C"
}
#endif // STA_OS2_STARTUP_ENABLE
#endif // STA_RTOS2_STARTUP_ENABLE

41
src/rtos2/system_event.cpp Normal file
View File

@@ -0,0 +1,41 @@
#include <sta/rtos2/system_event.hpp>
#ifdef STA_RTOS2_SYSTEM_EVENT_ENABLE
#include <cmsis_os2.h>
#ifndef STA_RTOS2_SYSTEM_EVENT_HANDLE
# define STA_RTOS2_SYSTEM_EVENT_HANDLE systemEventHandle
#endif // !STA_RTOS2_SYSTEM_EVENT_HANDLE
// Access handle from freertos.c
extern osEventFlagsId_t STA_RTOS2_SYSTEM_EVENT_HANDLE;
namespace sta
{
void signalSystemEvents(uint32_t flags)
{
osEventFlagsSet(STA_RTOS2_SYSTEM_EVENT_HANDLE, flags);
}
void waitForSystemEvents(uint32_t flags, uint32_t options, uint32_t timeout)
{
osEventFlagsWait(STA_RTOS2_SYSTEM_EVENT_HANDLE, flags, options | osFlagsNoClear, timeout);
}
void signalStartupEvent()
{
signalSystemEvents(STA_SYSTEM_EVENT_STARTUP);
}
void waitForStartupEvent()
{
waitForSystemEvents(STA_SYSTEM_EVENT_STARTUP, osFlagsWaitAll, osWaitForever);
}
} // namespace sta
#endif // STA_RTOS2_SYSTEM_EVENT_ENABLE

46
src/rtos2/watchdog/heartbeat.cpp Normal file
View File

@@ -0,0 +1,46 @@
#include <sta/rtos2/watchdog.hpp>
#ifdef STA_RTOS2_WATCHDOG_ENABLE
#include <cmsis_os2.h>
#ifndef STA_RTOS2_WATCHDOG_TIMER_PERIOD
# define STA_RTOS2_WATCHDOG_TIMER_PERIOD 1000
#endif // !STA_RTOS2_WATCHDOG_TIMER_PERIOD
#ifndef STA_RTOS2_WATCHDOG_TIMER_HANDLE
# define STA_RTOS2_WATCHDOG_TIMER_HANDLE heartbeatHandle
#endif // !STA_RTOS2_WATCHDOG_TIMER_HANDLE
#ifndef STA_RTOS2_WATCHDOG_TIMER_CALLBACK
# define STA_RTOS2_WATCHDOG_TIMER_CALLBACK heartbeatCallback
#endif // !STA_RTOS2_WATCHDOG_TIMER_CALLBACK
// Access handles from freertos.c
extern osTimerId_t STA_RTOS2_WATCHDOG_TIMER_HANDLE;
namespace sta
{
void startWatchdogTimer()
{
osTimerStart(STA_RTOS2_WATCHDOG_TIMER_HANDLE, STA_RTOS2_WATCHDOG_TIMER_PERIOD);
}
} // namespace sta
// Declare with C linkage
extern "C"
{
void STA_RTOS2_WATCHDOG_TIMER_CALLBACK(void *)
{
// Notify watchdog task to send heartbeat message
// Required because blocking in a timer callback is not allowed
sta::notifyWatchdog(STA_WATCHDOG_FLAG_HEARTBEAT);
}
}
#endif // STA_RTOS2_WATCHDOG_ENABLE

58
src/rtos2/watchdog/watchdog.cpp Normal file
View File

@@ -0,0 +1,58 @@
#include <sta/rtos2/watchdog.hpp>
#ifdef STA_RTOS2_WATCHDOG_ENABLE
#include <sta/rtos2/defs.hpp>
#include <sta/rtos2/system_event.hpp>
#include <main.h>
#include <cmsis_os2.h>
#ifndef STA_RTOS2_WATCHDOG_HANDLE
# define STA_RTOS2_WATCHDOG_HANDLE watchdogHandle
#endif // !STA_RTOS2_WATCHDOG_HANDLE
#ifndef STA_RTOS2_WATCHDOG_ENTRY_FUNCTION
# define STA_RTOS2_WATCHDOG_ENTRY_FUNCTION watchdogTask
#endif // !STA_RTOS2_WATCHDOG_ENTRY_FUNCTION
// Access handle from freertos.c
extern osThreadId_t STA_RTOS2_WATCHDOG_HANDLE;
namespace sta
{
void notifyWatchdog(uint32_t flags)
{
osThreadFlagsSet(STA_RTOS2_WATCHDOG_HANDLE, flags);
}
// Handler for watchdog events
extern void watchdogEventHandler(void * arg, uint32_t flags);
} // namespace sta
// Declare with C linkage
extern "C"
{
void STA_RTOS2_WATCHDOG_ENTRY_FUNCTION(void * arg)
{
sta::waitForStartupEvent();
while (true)
{
// Wait for any flag to be set
uint32_t flags = osThreadFlagsWait(STA_RTOS2_THREAD_FLAGS_VALID_BITS, osFlagsWaitAny, osWaitForever);
// Call event handler
sta::watchdogEventHandler(arg, flags);
}
}
}
#endif // STA_RTOS2_WATCHDOG_ENABLE