model-railway/system-control
1
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

auto load and dependency fix

Browse Source 
Signed-off-by: Peter Siegmund <developer@mars3142.org>
This commit is contained in:
Peter Siegmund
2025-06-25 07:47:23 +02:00
parent 00cfecf13a
commit ab14765750
5 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/insa/CMakeLists.txt
View File

@@ -20,6 +20,7 @@ if (DEFINED ENV{IDF_PATH})
PRIV_REQUIRES PRIV_REQUIRES
u8g2 u8g2
led-manager led-manager
persistence-manager
) )
return() return()
endif () endif ()
@@ -38,4 +39,5 @@ target_include_directories(${PROJECT_NAME} PUBLIC include)
target_link_libraries(${PROJECT_NAME} PRIVATE target_link_libraries(${PROJECT_NAME} PRIVATE
u8g2 u8g2
led-manager led-manager
persistence-manager
) )

2
components/insa/include/MenuOptions.h
View File

@@ -17,7 +17,7 @@
// Project-specific headers // Project-specific headers
#include "common/Widget.h" #include "common/Widget.h"
#include "../../persistence-manager/include/IPersistenceManager.h" #include "IPersistenceManager.h"
#include "u8g2.h" #include "u8g2.h"
class MenuItem; class MenuItem;

1
components/persistence-manager/src/hal_esp32/PersistenceManager.cpp
View File

@@ -8,6 +8,7 @@ PersistenceManager::PersistenceManager(const std::string &nvs_namespace)
: namespace_(nvs_namespace), initialized_(false) : namespace_(nvs_namespace), initialized_(false)
{ {
Initialize(); Initialize();
Load();
} }
PersistenceManager::~PersistenceManager() PersistenceManager::~PersistenceManager()

2
components/persistence-manager/src/hal_native/PersistenceManager.cpp
View File

@@ -9,6 +9,8 @@ PersistenceManager::PersistenceManager(std::string filename) : m_filename(std::m
{ {
SDL_Init(SDL_INIT_EVENTS); SDL_Init(SDL_INIT_EVENTS);
} }
Load();
} }
PersistenceManager::~PersistenceManager() PersistenceManager::~PersistenceManager()

1
main/app_task.cpp
View File

@@ -101,7 +101,6 @@ static void init_ui(void)
.onButtonClicked = nullptr, .onButtonClicked = nullptr,
.persistenceManager = std::make_shared<PersistenceManager>(), .persistenceManager = std::make_shared<PersistenceManager>(),
}; };
options.persistenceManager->Load();
m_widget = std::make_shared<SplashScreen>(&options); m_widget = std::make_shared<SplashScreen>(&options);
m_inactivityTracker = std::make_unique<InactivityTracker>(60000, []() { m_inactivityTracker = std::make_unique<InactivityTracker>(60000, []() {
auto screensaver = std::make_shared<ScreenSaver>(&options); auto screensaver = std::make_shared<ScreenSaver>(&options);