Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-14 18:58:36 -07:00
Code Issues Packages Projects Releases Wiki Activity

upd settings to see release version only and current

Browse Source
This commit is contained in:
MX
2025-01-15 00:42:43 +03:00
parent b4c7cde261
commit 1666c4d04f
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
applications/services/desktop/desktop_settings.c
View File

@@ -6,7 +6,7 @@
#define TAG "DesktopSettings" #define TAG "DesktopSettings"
#define DESKTOP_SETTINGS_VER_15 (15) #define DESKTOP_SETTINGS_VER_14 (14)
#define DESKTOP_SETTINGS_VER (16) #define DESKTOP_SETTINGS_VER (16)
#define DESKTOP_SETTINGS_PATH INT_PATH(DESKTOP_SETTINGS_FILE_NAME) #define DESKTOP_SETTINGS_PATH INT_PATH(DESKTOP_SETTINGS_FILE_NAME)
@@ -14,13 +14,12 @@
typedef struct { typedef struct {
uint32_t auto_lock_delay_ms; uint32_t auto_lock_delay_ms;
uint32_t auto_poweroff_delay_ms;
uint8_t displayBatteryPercentage; uint8_t displayBatteryPercentage;
uint8_t dummy_mode; uint8_t dummy_mode;
uint8_t display_clock; uint8_t display_clock;
FavoriteApp favorite_apps[FavoriteAppNumber]; FavoriteApp favorite_apps[FavoriteAppNumber];
FavoriteApp dummy_apps[DummyAppNumber]; FavoriteApp dummy_apps[DummyAppNumber];
} DesktopSettingsV15; } DesktopSettingsV14;
// Actual size of DesktopSettings v13 // Actual size of DesktopSettings v13
//static_assert(sizeof(DesktopSettingsV13) == 1234); //static_assert(sizeof(DesktopSettingsV13) == 1234);
@@ -42,31 +41,31 @@ void desktop_settings_load(DesktopSettings* settings) {
DESKTOP_SETTINGS_MAGIC, DESKTOP_SETTINGS_MAGIC,
DESKTOP_SETTINGS_VER); DESKTOP_SETTINGS_VER);
} else if(version == DESKTOP_SETTINGS_VER_15) { } else if(version == DESKTOP_SETTINGS_VER_14) {
DesktopSettingsV15* settings_v15 = malloc(sizeof(DesktopSettingsV15)); DesktopSettingsV14* settings_v14 = malloc(sizeof(DesktopSettingsV14));
success = saved_struct_load( success = saved_struct_load(
DESKTOP_SETTINGS_PATH, DESKTOP_SETTINGS_PATH,
settings_v15, settings_v14,
sizeof(DesktopSettingsV15), sizeof(DesktopSettingsV14),
DESKTOP_SETTINGS_MAGIC, DESKTOP_SETTINGS_MAGIC,
DESKTOP_SETTINGS_VER_15); DESKTOP_SETTINGS_VER_14);
if(success) { if(success) {
settings->auto_lock_delay_ms = settings_v15->auto_lock_delay_ms; settings->auto_lock_delay_ms = settings_v14->auto_lock_delay_ms;
settings->usb_inhibit_auto_lock = 0; settings->usb_inhibit_auto_lock = 0;
settings->displayBatteryPercentage = settings_v15->displayBatteryPercentage; settings->displayBatteryPercentage = settings_v14->displayBatteryPercentage;
settings->dummy_mode = settings_v15->dummy_mode; settings->dummy_mode = settings_v14->dummy_mode;
settings->display_clock = settings_v15->display_clock; settings->display_clock = settings_v14->display_clock;
memcpy( memcpy(
settings->favorite_apps, settings->favorite_apps,
settings_v15->favorite_apps, settings_v14->favorite_apps,
sizeof(settings->favorite_apps)); sizeof(settings->favorite_apps));
memcpy( memcpy(
settings->dummy_apps, settings_v15->dummy_apps, sizeof(settings->dummy_apps)); settings->dummy_apps, settings_v14->dummy_apps, sizeof(settings->dummy_apps));
} }
free(settings_v15); free(settings_v14);
} }
} while(false); } while(false);