From e4835cc57d0d24c642874730c05583bfb0ebd5cb Mon Sep 17 00:00:00 2001 From: Henrik Stickann <4376396-Mithradir@users.noreply.gitlab.com> Date: Sun, 22 Jan 2023 00:06:29 +0100 Subject: [PATCH] Rename WATCHDOG macros to SYSTEM_WATCHDOG --- include/sta/rtos/system/watchdog.hpp | 14 +++++++------- src/system/watchdog.cpp | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/sta/rtos/system/watchdog.hpp b/include/sta/rtos/system/watchdog.hpp index 3a414d7..f7f2def 100644 --- a/include/sta/rtos/system/watchdog.hpp +++ b/include/sta/rtos/system/watchdog.hpp @@ -20,23 +20,23 @@ * * @ingroup STA_RTOS_BuildConfig */ -# define STA_RTOS_WATCHDOG_ENABLE +# define STA_RTOS_SYSTEM_WATCHDOG_ENABLE #endif // DOXYGEN /** - * @def STA_RTOS_WATCHDOG_TIMER_PERIOD + * @def STA_RTOS_SYSTEM_WATCHDOG_TIMER_PERIOD * @brief Set period in ticks of heartbeat timer. * * @ingroup STA_RTOS_BuildConfig */ -#ifndef STA_RTOS_WATCHDOG_TIMER_PERIOD -# define STA_RTOS_WATCHDOG_TIMER_PERIOD 1000 -#endif // !STA_RTOS_WATCHDOG_TIMER_PERIOD +#ifndef STA_RTOS_SYSTEM_WATCHDOG_TIMER_PERIOD +# define STA_RTOS_SYSTEM_WATCHDOG_TIMER_PERIOD 1000 +#endif // !STA_RTOS_SYSTEM_WATCHDOG_TIMER_PERIOD #include -#ifdef STA_RTOS_WATCHDOG_ENABLE +#ifdef STA_RTOS_SYSTEM_WATCHDOG_ENABLE #include @@ -87,6 +87,6 @@ namespace sta } // namespace sta -#endif // STA_RTOS_WATCHDOG_ENABLE +#endif // STA_RTOS_SYSTEM_WATCHDOG_ENABLE #endif // STA_RTOS_SYSTEM_WATCHDOG_HPP diff --git a/src/system/watchdog.cpp b/src/system/watchdog.cpp index a487d9a..2cdac7c 100644 --- a/src/system/watchdog.cpp +++ b/src/system/watchdog.cpp @@ -1,5 +1,5 @@ #include -#ifdef STA_RTOS_WATCHDOG_ENABLE +#ifdef STA_RTOS_SYSTEM_WATCHDOG_ENABLE #include #include @@ -60,7 +60,7 @@ namespace sta watchdogTimerHandle = osTimerNew(watchdogTimerCallback, osTimerPeriodic, nullptr, &timerAttributes); STA_ASSERT_MSG(watchdogTimerHandle != nullptr, "System watchdog timer initialization failed"); - osTimerStart(watchdogTimerHandle, STA_RTOS_WATCHDOG_TIMER_PERIOD); + osTimerStart(watchdogTimerHandle, STA_RTOS_SYSTEM_WATCHDOG_TIMER_PERIOD); } @@ -100,4 +100,4 @@ void watchdogTimerCallback(void *) -#endif // STA_RTOS_WATCHDOG_ENABLE +#endif // STA_RTOS_SYSTEM_WATCHDOG_ENABLE