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

Revert "Reset expansion settings on install for now"

Browse Source 
This reverts commit fc87dc5dd2.
This commit is contained in:
Willy-JL
2024-01-30 19:23:05 +00:00
parent b96c9c4550
commit fd372f1461
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
applications/system/updater/util/update_task_worker_backup.c
View File

@@ -5,7 +5,6 @@
#include <furi_hal.h> #include <furi_hal.h>
#include <storage/storage.h> #include <storage/storage.h>
#include <desktop/views/desktop_view_slideshow.h> #include <desktop/views/desktop_view_slideshow.h>
#include <expansion/expansion_settings_filename.h>
#include <toolbox/path.h> #include <toolbox/path.h>
#include <update_util/dfu_file.h> #include <update_util/dfu_file.h>
#include <update_util/lfs_backup.h> #include <update_util/lfs_backup.h>
@@ -166,13 +165,6 @@ static bool update_task_post_update(UpdateTask* update_task) {
CHECK_RESULT(lfs_backup_unpack(update_task->storage, furi_string_get_cstr(file_path))); CHECK_RESULT(lfs_backup_unpack(update_task->storage, furi_string_get_cstr(file_path)));
#ifdef FURI_NDEBUG
// Production
// Currently no expansion modules exist, disable listening on UART
storage_common_remove(update_task->storage, EXPANSION_SETTINGS_OLD_PATH);
storage_common_remove(update_task->storage, EXPANSION_SETTINGS_PATH);
#endif
if(update_task->state.groups & UpdateTaskStageGroupResources) { if(update_task->state.groups & UpdateTaskStageGroupResources) {
TarUnpackProgress progress = { TarUnpackProgress progress = {
.update_task = update_task, .update_task = update_task,

4
furi/flipper.c
View File

@@ -66,8 +66,8 @@ 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, EXPANSION_SETTINGS_OLD_PATH, EXPANSION_SETTINGS_PATH); // Reset on install for now storage_common_copy(storage, EXPANSION_SETTINGS_OLD_PATH, EXPANSION_SETTINGS_PATH);
// storage_common_remove(storage, EXPANSION_SETTINGS_OLD_PATH); storage_common_remove(storage, EXPANSION_SETTINGS_OLD_PATH);
// storage_common_copy(storage, NOTIFICATION_SETTINGS_OLD_PATH, NOTIFICATION_SETTINGS_PATH); // Not compatible anyway // storage_common_copy(storage, NOTIFICATION_SETTINGS_OLD_PATH, NOTIFICATION_SETTINGS_PATH); // Not compatible anyway
storage_common_remove(storage, NOTIFICATION_SETTINGS_OLD_PATH); storage_common_remove(storage, NOTIFICATION_SETTINGS_OLD_PATH);
// Ext -> Int // Ext -> Int