Merge develop into main (#312)
- Move various settings to `/data/settings` and `/sdcard/settings` - Fix for `Gui` and `Statusbar` errors on startup (LVGL start) - Implement Development service settings as properties file - Rename `service::findManifestId()` to `service::findManifestById()` - Renamed various classes like `BootProperties` to `BootSettings` - Renamed `settings.properties` to `system.properties`. Code was moved to `settings` namespace/folder - `DevelopmentSettings` is now in `settings` namespace/folder (moved from service)
This commit is contained in:
committed by
GitHub
parent
5dfc6d70da
commit
5cc5b50694
@@ -2,7 +2,7 @@
|
||||
|
||||
#include <Tactility/kernel/SystemEvents.h>
|
||||
#include <Tactility/Preferences.h>
|
||||
#include <Tactility/settings/SettingsProperties.h>
|
||||
#include <Tactility/settings/SystemSettings.h>
|
||||
|
||||
#ifdef ESP_PLATFORM
|
||||
#include <ctime>
|
||||
@@ -60,8 +60,8 @@ std::string getTimeZoneCode() {
|
||||
}
|
||||
|
||||
bool isTimeFormat24Hour() {
|
||||
SettingsProperties properties;
|
||||
if (!loadSettingsProperties(properties)) {
|
||||
SystemSettings properties;
|
||||
if (!loadSystemSettings(properties)) {
|
||||
return true;
|
||||
} else {
|
||||
return properties.timeFormat24h;
|
||||
@@ -69,13 +69,13 @@ bool isTimeFormat24Hour() {
|
||||
}
|
||||
|
||||
void setTimeFormat24Hour(bool show24Hour) {
|
||||
SettingsProperties properties;
|
||||
if (!loadSettingsProperties(properties)) {
|
||||
SystemSettings properties;
|
||||
if (!loadSystemSettings(properties)) {
|
||||
return;
|
||||
}
|
||||
|
||||
properties.timeFormat24h = show24Hour;
|
||||
saveSettingsProperties(properties);
|
||||
saveSystemSettings(properties);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user