model-railway/system-control
1
0
Fork 0
Code Issues 3 Pull Requests Actions Projects Activity

refactor persistence manager from cpp to c
Some checks failed
ESP-IDF Build / build (esp32c6, release-v5.4) (push) Failing after 4m12s
Details
ESP-IDF Build / build (esp32c6, release-v5.5) (push) Failing after 4m17s
Details
ESP-IDF Build / build (esp32s3, release-v5.4) (push) Failing after 3m49s
Details
ESP-IDF Build / build (esp32s3, release-v5.5) (push) Failing after 4m0s
Details

Browse Source 
Signed-off-by: Peter Siegmund <developer@mars3142.org>
This commit is contained in:
Peter Siegmund
2026-01-10 11:12:31 +01:00
parent ef0cda1d67
commit b77fdee21d
13 changed files with 476 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/components/insa/src/common/Menu.cpp
View File

@@ -64,7 +64,7 @@ void Menu::setItemSize(const size_t size, int8_t startIndex)
constexpr int key_length = 20;
char key[key_length] = "";
snprintf(key, key_length, "section_%zu", i + 1 - startIndex);
index = m_options->persistenceManager->GetValue(key, index);
index = persistence_manager_get_int(m_options->persistenceManager, key, index);
}
addSelection(i + 1, caption, m_items.at(0).getValues(), index);
}

7
firmware/components/insa/src/ui/ClockScreenSaver.cpp
View File

@@ -1,5 +1,5 @@
#include "ui/ClockScreenSaver.h"
#include "hal_esp32/PersistenceManager.h"
#include "persistence_manager.h"
#include "simulator.h"
#include <cstring>
#include <ctime>
@@ -38,8 +38,9 @@ void ClockScreenSaver::updateTextDimensions()
void ClockScreenSaver::getCurrentTimeString(char *buffer, size_t bufferSize) const
{
if (m_options && m_options->persistenceManager->GetValue("light_active", false) &&
m_options->persistenceManager->GetValue("light_mode", 0) == 0)
if (m_options && m_options->persistenceManager &&
persistence_manager_get_bool(m_options->persistenceManager, "light_active", false) &&
persistence_manager_get_int(m_options->persistenceManager, "light_mode", 0) == 0)
{
char *simulated_time = get_time();
if (simulated_time != nullptr)

19
firmware/components/insa/src/ui/LightMenu.cpp
View File

@@ -27,7 +27,7 @@ LightMenu::LightMenu(menu_options_t *options) : Menu(options), m_options(options
bool active = false;
if (m_options && m_options->persistenceManager)
{
active = m_options->persistenceManager->GetValue(LightMenuOptions::LIGHT_ACTIVE, active);
active = persistence_manager_get_bool(m_options->persistenceManager, LightMenuOptions::LIGHT_ACTIVE, active);
}
addToggle(LightMenuItem::ACTIVATE, "Einschalten", active);
@@ -39,7 +39,8 @@ LightMenu::LightMenu(menu_options_t *options) : Menu(options), m_options(options
int mode_value = 0;
if (m_options && m_options->persistenceManager)
{
mode_value = m_options->persistenceManager->GetValue(LightMenuOptions::LIGHT_MODE, mode_value);
mode_value =
persistence_manager_get_int(m_options->persistenceManager, LightMenuOptions::LIGHT_MODE, mode_value);
}
addSelection(LightMenuItem::MODE, "Modus", items, mode_value);
@@ -50,7 +51,9 @@ LightMenu::LightMenu(menu_options_t *options) : Menu(options), m_options(options
int variant_value = 3;
if (m_options && m_options->persistenceManager)
{
variant_value = m_options->persistenceManager->GetValue(LightMenuOptions::LIGHT_VARIANT, variant_value) - 1;
variant_value =
persistence_manager_get_int(m_options->persistenceManager, LightMenuOptions::LIGHT_VARIANT, variant_value) -
1;
}
addSelection(LightMenuItem::VARIANT, "Variante", variants, variant_value);
}
@@ -70,7 +73,7 @@ void LightMenu::onButtonPressed(const MenuItem &menuItem, const ButtonType butto
const auto value = getItem(menuItem.getId()).getValue() == "1";
if (m_options && m_options->persistenceManager)
{
m_options->persistenceManager->SetValue(LightMenuOptions::LIGHT_ACTIVE, value);
persistence_manager_set_bool(m_options->persistenceManager, LightMenuOptions::LIGHT_ACTIVE, value);
}
start_simulation();
@@ -86,8 +89,8 @@ void LightMenu::onButtonPressed(const MenuItem &menuItem, const ButtonType butto
const auto value = getItem(item.getId()).getIndex();
if (m_options && m_options->persistenceManager)
{
m_options->persistenceManager->SetValue(LightMenuOptions::LIGHT_MODE, value);
m_options->persistenceManager->Save();
persistence_manager_set_int(m_options->persistenceManager, LightMenuOptions::LIGHT_MODE, value);
persistence_manager_save(m_options->persistenceManager);
}
start_simulation();
@@ -103,8 +106,8 @@ void LightMenu::onButtonPressed(const MenuItem &menuItem, const ButtonType butto
const auto value = getItem(item.getId()).getIndex() + 1;
if (m_options && m_options->persistenceManager)
{
m_options->persistenceManager->SetValue(LightMenuOptions::LIGHT_VARIANT, value);
m_options->persistenceManager->Save();
persistence_manager_set_int(m_options->persistenceManager, LightMenuOptions::LIGHT_VARIANT, value);
persistence_manager_save(m_options->persistenceManager);
}
start_simulation();