Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-12 09:48:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

after merge fixes

Browse Source
This commit is contained in:
MX
2024-08-10 14:22:33 +03:00
parent 28272f7a7a
commit 1e5dd001fe
22 changed files with 61 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,8 +6,8 @@
#define TAG "DesktopSettings"
#define DESKTOP_SETTINGS_VER_10 (10)
#define DESKTOP_SETTINGS_VER (11)
#define DESKTOP_SETTINGS_VER_13 (13)
#define DESKTOP_SETTINGS_VER (14)
#define DESKTOP_SETTINGS_PATH INT_PATH(DESKTOP_SETTINGS_FILE_NAME)
#define DESKTOP_SETTINGS_MAGIC (0x17)
@@ -15,10 +15,10 @@
typedef struct {
uint8_t reserved[11];
DesktopSettings settings;
} DesktopSettingsV10;
} DesktopSettingsV13;
// Actual size of DesktopSettings v10
static_assert(sizeof(DesktopSettingsV10) == 1044);
// Actual size of DesktopSettings v13
//static_assert(sizeof(DesktopSettingsV13) == 1234);
void desktop_settings_load(DesktopSettings* settings) {
furi_assert(settings);
@@ -37,21 +37,21 @@ void desktop_settings_load(DesktopSettings* settings) {
DESKTOP_SETTINGS_MAGIC,
DESKTOP_SETTINGS_VER);
} else if(version == DESKTOP_SETTINGS_VER_10) {
DesktopSettingsV10* settings_v10 = malloc(sizeof(DesktopSettingsV10));
} else if(version == DESKTOP_SETTINGS_VER_13) {
DesktopSettingsV13* settings_v13 = malloc(sizeof(DesktopSettingsV13));
success = saved_struct_load(
DESKTOP_SETTINGS_PATH,
settings_v10,
sizeof(DesktopSettingsV10),
settings_v13,
sizeof(DesktopSettingsV13),
DESKTOP_SETTINGS_MAGIC,
DESKTOP_SETTINGS_VER_10);
DESKTOP_SETTINGS_VER_13);
if(success) {
*settings = settings_v10->settings;
*settings = settings_v13->settings;
}
free(settings_v10);
free(settings_v13);
}
} while(false);

36
applications/services/desktop/desktop_settings.h
View File

@@ -2,34 +2,6 @@
#include <stdint.h>
#define DESKTOP_SETTINGS_VER (13)
#define DESKTOP_SETTINGS_PATH INT_PATH(DESKTOP_SETTINGS_FILE_NAME)
#define DESKTOP_SETTINGS_MAGIC (0x17)
#define PIN_MAX_LENGTH 12
#define DESKTOP_SETTINGS_RUN_PIN_SETUP_ARG "run_pin_setup"
#define DESKTOP_SETTINGS_SAVE(x) \
saved_struct_save( \
DESKTOP_SETTINGS_PATH, \
(x), \
sizeof(DesktopSettings), \
DESKTOP_SETTINGS_MAGIC, \
DESKTOP_SETTINGS_VER)
#define DESKTOP_SETTINGS_LOAD(x) \
saved_struct_load( \
DESKTOP_SETTINGS_PATH, \
(x), \
sizeof(DesktopSettings), \
DESKTOP_SETTINGS_MAGIC, \
DESKTOP_SETTINGS_VER)
#define MAX_PIN_SIZE 10
#define MIN_PIN_SIZE 4
#define MAX_APP_LENGTH 128
#define DISPLAY_BATTERY_BAR 0
#define DISPLAY_BATTERY_PERCENT 1
#define DISPLAY_BATTERY_INVERTED_PERCENT 2
@@ -47,14 +19,14 @@ typedef enum {
} FavoriteAppShortcut;
typedef enum {
DummyAppLeft = 0,
DummyAppLeftShort,
DummyAppLeftLong,
DummyAppRight,
DummyAppRightShort,
DummyAppRightLong,
DummyAppUpLong,
DummyAppDown,
DummyAppDownShort,
DummyAppDownLong,
DummyAppOk,
DummyAppOkShort,
DummyAppOkLong,
DummyAppNumber,

8
applications/services/desktop/scenes/desktop_scene_main.c
View File

@@ -190,7 +190,7 @@ bool desktop_scene_main_on_event(void* context, SceneManagerEvent event) {
desktop, &desktop->settings.favorite_apps[FavoriteAppRightShort]);
} else {
desktop_scene_main_open_app_or_profile(
desktop, &desktop->settings.dummy_apps[DummyAppRight]);
desktop, &desktop->settings.dummy_apps[DummyAppRightShort]);
}
}
consumed = true;
@@ -198,15 +198,15 @@ bool desktop_scene_main_on_event(void* context, SceneManagerEvent event) {
case DesktopDummyEventOpenLeft:
desktop_scene_main_open_app_or_profile(
desktop, &desktop->settings.dummy_apps[DummyAppLeft]);
desktop, &desktop->settings.dummy_apps[DummyAppLeftShort]);
break;
case DesktopDummyEventOpenDown:
desktop_scene_main_open_app_or_profile(
desktop, &desktop->settings.dummy_apps[DummyAppDown]);
desktop, &desktop->settings.dummy_apps[DummyAppDownShort]);
break;
case DesktopDummyEventOpenOk:
desktop_scene_main_open_app_or_profile(
desktop, &desktop->settings.dummy_apps[DummyAppOk]);
desktop, &desktop->settings.dummy_apps[DummyAppOkShort]);
break;
case DesktopDummyEventOpenUpLong:
if(!desktop_scene_main_check_none(