diff --git a/ReadMe.md b/ReadMe.md index 14fb34712..6fd869be0 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -23,6 +23,7 @@ - Added OFW PR: [Snake Plugin: Store game state on close and restore it on restart, show highscore #1922 (By JuanJakobo)](https://github.com/flipperdevices/flipperzero-firmware/pull/1922) - Assets: Includes New Dolphin Animations: [D1g1talRa1n (By Sasquach)] - Trimmed out the Flipper animations. `/ext/dolphin` folder on your Flipper should now be managed by you! [Copy this folder](https://github.com/RogueMaster/awesome-flipperzero-withModules/tree/rogue_main/dolphin-RMselect) if you don't want to do the work. +- Updates to backup/restore SubGHz settings, extend_range.txt, manifest.txt and name.txt
TO DO / REMOVED
diff --git a/applications/plugins/dolphinbackup/storage_DolphinBackup.c b/applications/plugins/dolphinbackup/storage_DolphinBackup.c index 02baddc0f..70e46f98a 100644 --- a/applications/plugins/dolphinbackup/storage_DolphinBackup.c +++ b/applications/plugins/dolphinbackup/storage_DolphinBackup.c @@ -23,6 +23,10 @@ static const char* app_dirsDolphinBackup[] = { ".notification.settings", ".bt.keys", ".power.settings", + "dolphin/manifest.txt", + "dolphin/name.txt", + "subghz/assets/extend_range.txt", + "subghz/assets/setting_user.txt", }; bool storage_DolphinBackup_perform(void) { @@ -38,7 +42,14 @@ bool storage_DolphinBackup_perform(void) { storage_common_mkdir(storage, furi_string_get_cstr(new_path)); furi_string_free(new_path); for(uint32_t i = 0; i < COUNT_OF(app_dirsDolphinBackup); i++) { - if(i > 5) { + if(i > 11) { + furi_string_printf(path_src, "%s/%s", MOVE_DST, app_dirsDolphinBackup[i]); + furi_string_printf( + path_dst, "%s/dolphin_restorer/%s", MOVE_DST, app_dirsDolphinBackup[i]); + storage_simply_remove_recursive(storage, furi_string_get_cstr(path_dst)); + storage_common_copy( + storage, furi_string_get_cstr(path_src), furi_string_get_cstr(path_dst)); + } else if(i > 5) { furi_string_printf(path_src, "%s/%s", MOVE_SRC, app_dirsDolphinBackup[i]); furi_string_printf( path_dst, "%s/dolphin_restorer/%s", MOVE_DST, app_dirsDolphinBackup[i]); diff --git a/applications/plugins/dolphinrestorer/drestorer.c b/applications/plugins/dolphinrestorer/drestorer.c index d2c0273d2..b1811a6fa 100644 --- a/applications/plugins/dolphinrestorer/drestorer.c +++ b/applications/plugins/dolphinrestorer/drestorer.c @@ -17,6 +17,10 @@ static const char* app_dirs[] = { ".notification.settings", ".bt.keys", ".power.settings", + "dolphin/manifest.txt", + "dolphin/name.txt", + "subghz/assets/extend_range.txt", + "subghz/assets/setting_user.txt", }; bool drestorer_perform(void) { @@ -27,11 +31,19 @@ bool drestorer_perform(void) { path_dst = furi_string_alloc(); for(uint32_t i = 0; i < COUNT_OF(app_dirs); i++) { - furi_string_printf(path_src, "%s/%s", MOVE_SRC, app_dirs[i]); - furi_string_printf(path_dst, "%s/%s", MOVE_DST, app_dirs[i]); - storage_simply_remove_recursive(storage, furi_string_get_cstr(path_dst)); - storage_common_copy( - storage, furi_string_get_cstr(path_src), furi_string_get_cstr(path_dst)); + if(i>5) { + furi_string_printf(path_src, "%s/%s", MOVE_DST, app_dirs[i]); + furi_string_printf(path_dst, "%s/%s", MOVE_DST, app_dirs[i]); + storage_simply_remove_recursive(storage, furi_string_get_cstr(path_dst)); + storage_common_copy( + storage, furi_string_get_cstr(path_src), furi_string_get_cstr(path_dst)); + } else { + furi_string_printf(path_src, "%s/%s", MOVE_SRC, app_dirs[i]); + furi_string_printf(path_dst, "%s/%s", MOVE_DST, app_dirs[i]); + storage_simply_remove_recursive(storage, furi_string_get_cstr(path_dst)); + storage_common_copy( + storage, furi_string_get_cstr(path_src), furi_string_get_cstr(path_dst)); + } } furi_string_free(path_src);