From d8f35c562cdc7bcabb4b4eae713a8b5d6885fd59 Mon Sep 17 00:00:00 2001 From: Attila Body Date: Sun, 29 Jun 2025 22:00:31 +0200 Subject: [PATCH] WIP --- Core/Src/freertos.c | 2 +- components/app/inc/app.h | 10 ++++++---- components/app/src/app.cpp | 10 ++++++---- components/f4ll | 2 +- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Core/Src/freertos.c b/Core/Src/freertos.c index 4427b4d..ae32c6c 100644 --- a/Core/Src/freertos.c +++ b/Core/Src/freertos.c @@ -127,7 +127,7 @@ void MX_FREERTOS_Init(void) __weak void StartDefaultTask(void const *argument) { /* USER CODE BEGIN StartDefaultTask */ - app_main(NULL); + app_main(); /* Infinite loop */ for (;;) { osDelay(1); diff --git a/components/app/inc/app.h b/components/app/inc/app.h index 37b146f..c6f2767 100644 --- a/components/app/inc/app.h +++ b/components/app/inc/app.h @@ -13,15 +13,17 @@ #ifdef __cplusplus #include +#include + #include #include -class app : public f4ll::initialized_singleton, public f4ll::console_handler::iconsole_input +class app : public f4ll::singleton, public f4ll::console_handler::iconsole_input { - friend class f4ll::initialized_singleton; + friend class f4ll::singleton; private: - app(void const *param); + app(); public: __attribute__((noreturn)) void main(); @@ -49,7 +51,7 @@ private: extern "C" { #endif // __cplusplus -void app_main(void const *param) __attribute__((noreturn)); +void app_main() __attribute__((noreturn)); #ifdef __cplusplus } // extern "C" { diff --git a/components/app/src/app.cpp b/components/app/src/app.cpp index 747c88d..4c41163 100644 --- a/components/app/src/app.cpp +++ b/components/app/src/app.cpp @@ -15,18 +15,21 @@ #include #include +#include +#include + #include #include #include -void app_main(void const *param) +void app_main() { - app::init(param).main(); + app::instance().main(); } -app::app(void const *param) +app::app() : m_con( f4ll::console_handler::init( USART2, DMA1, LL_DMA_STREAM_5, LL_DMA_STREAM_6, m_rx_buf_mem, sizeof(m_rx_buf_mem), m_tx_buf_mem, sizeof(m_tx_buf_mem), @@ -34,7 +37,6 @@ app::app(void const *param) m_safe_conout(m_con) { - (void)param; } void app::main() diff --git a/components/f4ll b/components/f4ll index eb385a1..80fc520 160000 --- a/components/f4ll +++ b/components/f4ll @@ -1 +1 @@ -Subproject commit eb385a113f4dbf3f2f2a722b18fe140968a88aa1 +Subproject commit 80fc520b6fad8a012e239efca77f33f759337344