diff options
| author | Michele Bini <michele.bini@gmail.com> | 2022-03-26 01:19:51 (GMT) |
|---|---|---|
| committer | Michele Bini <michele.bini@gmail.com> | 2022-03-26 01:37:03 (GMT) |
| commit | 9acd3ff0f8d12d2e97095ac562cbff3c7e8647ac (patch) | |
| tree | 9d0e69a9ce4a38733cf1bdc5a150ecef5d73e8e2 /src/components/settings | |
| parent | 268ddbdc7622ab2a6b0490701064ffdde13fee51 (diff) | |
sans fs; sans settings persist
Diffstat (limited to 'src/components/settings')
| -rw-r--r-- | src/components/settings/Settings.cpp | 41 | ||||
| -rw-r--r-- | src/components/settings/Settings.h | 7 |
2 files changed, 4 insertions, 44 deletions
diff --git a/src/components/settings/Settings.cpp b/src/components/settings/Settings.cpp index fee62da..69d9907 100644 --- a/src/components/settings/Settings.cpp +++ b/src/components/settings/Settings.cpp @@ -4,44 +4,9 @@ using namespace Pinetime::Controllers; -Settings::Settings(Pinetime::Controllers::FS& fs) : fs {fs} { -} +Settings::Settings() {} -void Settings::Init() { +void Settings::Init() {} - // Load default settings from Flash - LoadSettingsFromFile(); -} +void Settings::SaveSettings() {} -void Settings::SaveSettings() { - - // verify if is necessary to save - if (settingsChanged) { - SaveSettingsToFile(); - } - settingsChanged = false; -} - -void Settings::LoadSettingsFromFile() { - SettingsData bufferSettings; - lfs_file_t settingsFile; - - if ( fs.FileOpen(&settingsFile, "/settings.dat", LFS_O_RDONLY) != LFS_ERR_OK) { - return; - } - fs.FileRead(&settingsFile, reinterpret_cast<uint8_t*>(&bufferSettings), sizeof(settings)); - fs.FileClose(&settingsFile); - if ( bufferSettings.version == settingsVersion ) { - settings = bufferSettings; - } -} - -void Settings::SaveSettingsToFile() { - lfs_file_t settingsFile; - - if ( fs.FileOpen(&settingsFile, "/settings.dat", LFS_O_WRONLY | LFS_O_CREAT) != LFS_ERR_OK) { - return; - } - fs.FileWrite(&settingsFile, reinterpret_cast<uint8_t*>(&settings), sizeof(settings)); - fs.FileClose(&settingsFile); -} diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h index 3b26d69..2d26664 100644 --- a/src/components/settings/Settings.h +++ b/src/components/settings/Settings.h @@ -2,7 +2,6 @@ #include <cstdint> #include <bitset> #include "components/brightness/BrightnessController.h" -#include "components/fs/FS.h" namespace Pinetime { namespace Controllers { @@ -36,7 +35,7 @@ namespace Pinetime { Orange }; - Settings(Pinetime::Controllers::FS& fs); + Settings(); void Init(); void SaveSettings(); @@ -160,8 +159,6 @@ namespace Pinetime { }; private: - Pinetime::Controllers::FS& fs; - static constexpr uint32_t settingsVersion = 0x4001; // infinitime redux settings struct SettingsData { uint32_t version = settingsVersion; @@ -184,8 +181,6 @@ namespace Pinetime { uint8_t appMenu = 0; uint8_t settingsMenu = 0; - void LoadSettingsFromFile(); - void SaveSettingsToFile(); }; } } |
