Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-07-25 01:38:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Move desktop config back to int (for pin purposes)

Browse Source
This commit is contained in:
Willy-JL
2023-05-17 01:52:18 +01:00
parent 0a68781ce7
commit ff76fe32c1
5 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/services/desktop/desktop.c
-8
View File
@@ -369,14 +369,6 @@ int32_t desktop_srv(void* p) {
return 0; return 0;
} }
if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagResetPin)) {
Storage* storage = furi_record_open(RECORD_STORAGE);
storage_common_remove(storage, DESKTOP_SETTINGS_PATH);
storage_common_remove(storage, DESKTOP_SETTINGS_OLD_PATH);
furi_record_close(RECORD_STORAGE);
furi_hal_rtc_reset_flag(FuriHalRtcFlagResetPin);
}
Desktop* desktop = desktop_alloc(); Desktop* desktop = desktop_alloc();
bool loaded = DESKTOP_SETTINGS_LOAD(&desktop->settings); bool loaded = DESKTOP_SETTINGS_LOAD(&desktop->settings);
applications/services/desktop/desktop_settings.h
+2 -2
View File
@@ -9,8 +9,8 @@
#define DESKTOP_SETTINGS_VER (8) #define DESKTOP_SETTINGS_VER (8)
#define DESKTOP_SETTINGS_OLD_PATH INT_PATH(".desktop.settings") #define DESKTOP_SETTINGS_OLD_PATH CFG_PATH("desktop.settings")
#define DESKTOP_SETTINGS_PATH CFG_PATH("desktop.settings") #define DESKTOP_SETTINGS_PATH INT_PATH(".desktop.settings")
#define DESKTOP_SETTINGS_MAGIC (0x17) #define DESKTOP_SETTINGS_MAGIC (0x17)
#define PIN_MAX_LENGTH 12 #define PIN_MAX_LENGTH 12
firmware/targets/f7/src/recovery.c
-1
View File
@@ -56,7 +56,6 @@ void flipper_boot_recovery_exec() {
} }
if(!counter) { if(!counter) {
furi_hal_rtc_set_flag(FuriHalRtcFlagResetPin);
furi_hal_rtc_set_flag(FuriHalRtcFlagFactoryReset); furi_hal_rtc_set_flag(FuriHalRtcFlagFactoryReset);
furi_hal_rtc_set_pin_fails(0); furi_hal_rtc_set_pin_fails(0);
furi_hal_rtc_reset_flag(FuriHalRtcFlagLock); furi_hal_rtc_reset_flag(FuriHalRtcFlagLock);
firmware/targets/furi_hal_include/furi_hal_rtc.h
+2 -3
View File
@@ -30,9 +30,8 @@ typedef enum {
FuriHalRtcFlagLock = (1 << 2), FuriHalRtcFlagLock = (1 << 2),
FuriHalRtcFlagC2Update = (1 << 3), FuriHalRtcFlagC2Update = (1 << 3),
FuriHalRtcFlagHandOrient = (1 << 4), FuriHalRtcFlagHandOrient = (1 << 4),
FuriHalRtcFlagResetPin = (1 << 5), FuriHalRtcFlagLegacySleep = (1 << 5),
FuriHalRtcFlagLegacySleep = (1 << 6), FuriHalRtcFlagStealthMode = (1 << 6),
FuriHalRtcFlagStealthMode = (1 << 7),
} FuriHalRtcFlag; } FuriHalRtcFlag;
typedef enum { typedef enum {
furi/flipper.c
+7 -4
View File
@@ -45,7 +45,7 @@ void flipper_migrate_files() {
storage_common_remove(storage, INT_PATH(".passport.settings")); storage_common_remove(storage, INT_PATH(".passport.settings"));
storage_common_remove(storage, INT_PATH(".region_data")); storage_common_remove(storage, INT_PATH(".region_data"));
// Migrate files // Migrate files, Int -> Ext
storage_common_copy(storage, ARCHIVE_FAV_OLD_PATH, ARCHIVE_FAV_PATH); storage_common_copy(storage, ARCHIVE_FAV_OLD_PATH, ARCHIVE_FAV_PATH);
storage_common_remove(storage, ARCHIVE_FAV_OLD_PATH); storage_common_remove(storage, ARCHIVE_FAV_OLD_PATH);
storage_common_copy(storage, BT_SETTINGS_OLD_PATH, BT_SETTINGS_PATH); storage_common_copy(storage, BT_SETTINGS_OLD_PATH, BT_SETTINGS_PATH);
@@ -56,13 +56,16 @@ void flipper_migrate_files() {
storage_common_remove(storage, POWER_SETTINGS_OLD_PATH); storage_common_remove(storage, POWER_SETTINGS_OLD_PATH);
storage_common_copy(storage, BT_KEYS_STORAGE_OLD_PATH, BT_KEYS_STORAGE_PATH); storage_common_copy(storage, BT_KEYS_STORAGE_OLD_PATH, BT_KEYS_STORAGE_PATH);
storage_common_remove(storage, BT_KEYS_STORAGE_OLD_PATH); storage_common_remove(storage, BT_KEYS_STORAGE_OLD_PATH);
storage_common_copy(storage, DESKTOP_SETTINGS_OLD_PATH, DESKTOP_SETTINGS_PATH);
storage_common_remove(storage, DESKTOP_SETTINGS_OLD_PATH);
storage_common_copy(storage, NOTIFICATION_SETTINGS_OLD_PATH, NOTIFICATION_SETTINGS_PATH); storage_common_copy(storage, NOTIFICATION_SETTINGS_OLD_PATH, NOTIFICATION_SETTINGS_PATH);
storage_common_remove(storage, NOTIFICATION_SETTINGS_OLD_PATH); storage_common_remove(storage, NOTIFICATION_SETTINGS_OLD_PATH);
// Ext -> Int
storage_common_copy(storage, DESKTOP_SETTINGS_OLD_PATH, DESKTOP_SETTINGS_PATH);
storage_common_remove(storage, DESKTOP_SETTINGS_OLD_PATH);
// Special care for U2F // Special care for U2F
if(storage_common_exists(storage, U2F_CNT_OLD_FILE)) { // Is on Int FileInfo file_info;
if(storage_common_stat(storage, U2F_CNT_OLD_FILE, &file_info) == FSE_OK &&
file_info.size > 200) { // Is on Int and has content
storage_common_remove(storage, U2F_CNT_FILE); // Remove outdated on Ext storage_common_remove(storage, U2F_CNT_FILE); // Remove outdated on Ext
storage_common_rename(storage, U2F_CNT_OLD_FILE, U2F_CNT_FILE); // Int -> Ext storage_common_rename(storage, U2F_CNT_OLD_FILE, U2F_CNT_FILE); // Int -> Ext
} }