From ab147657509539c279b8c9e4e7f652470849b98e Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Wed, 25 Jun 2025 07:47:23 +0200 Subject: [PATCH] auto load and dependency fix Signed-off-by: Peter Siegmund --- components/insa/CMakeLists.txt | 2 ++ components/insa/include/MenuOptions.h | 2 +- .../persistence-manager/src/hal_esp32/PersistenceManager.cpp | 1 + .../persistence-manager/src/hal_native/PersistenceManager.cpp | 2 ++ main/app_task.cpp | 1 - 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/components/insa/CMakeLists.txt b/components/insa/CMakeLists.txt index 29c7b32..58c39d0 100644 --- a/components/insa/CMakeLists.txt +++ b/components/insa/CMakeLists.txt @@ -20,6 +20,7 @@ if (DEFINED ENV{IDF_PATH}) PRIV_REQUIRES u8g2 led-manager + persistence-manager ) return() endif () @@ -38,4 +39,5 @@ target_include_directories(${PROJECT_NAME} PUBLIC include) target_link_libraries(${PROJECT_NAME} PRIVATE u8g2 led-manager + persistence-manager ) \ No newline at end of file diff --git a/components/insa/include/MenuOptions.h b/components/insa/include/MenuOptions.h index e13aef6..e926d8f 100644 --- a/components/insa/include/MenuOptions.h +++ b/components/insa/include/MenuOptions.h @@ -17,7 +17,7 @@ // Project-specific headers #include "common/Widget.h" -#include "../../persistence-manager/include/IPersistenceManager.h" +#include "IPersistenceManager.h" #include "u8g2.h" class MenuItem; diff --git a/components/persistence-manager/src/hal_esp32/PersistenceManager.cpp b/components/persistence-manager/src/hal_esp32/PersistenceManager.cpp index 20d6e98..f1d9c0b 100644 --- a/components/persistence-manager/src/hal_esp32/PersistenceManager.cpp +++ b/components/persistence-manager/src/hal_esp32/PersistenceManager.cpp @@ -8,6 +8,7 @@ PersistenceManager::PersistenceManager(const std::string &nvs_namespace) : namespace_(nvs_namespace), initialized_(false) { Initialize(); + Load(); } PersistenceManager::~PersistenceManager() diff --git a/components/persistence-manager/src/hal_native/PersistenceManager.cpp b/components/persistence-manager/src/hal_native/PersistenceManager.cpp index 5d2c8d1..14c56a6 100644 --- a/components/persistence-manager/src/hal_native/PersistenceManager.cpp +++ b/components/persistence-manager/src/hal_native/PersistenceManager.cpp @@ -9,6 +9,8 @@ PersistenceManager::PersistenceManager(std::string filename) : m_filename(std::m { SDL_Init(SDL_INIT_EVENTS); } + + Load(); } PersistenceManager::~PersistenceManager() diff --git a/main/app_task.cpp b/main/app_task.cpp index f330016..df9163f 100644 --- a/main/app_task.cpp +++ b/main/app_task.cpp @@ -101,7 +101,6 @@ static void init_ui(void) .onButtonClicked = nullptr, .persistenceManager = std::make_shared(), }; - options.persistenceManager->Load(); m_widget = std::make_shared(&options); m_inactivityTracker = std::make_unique(60000, []() { auto screensaver = std::make_shared(&options);