From 8dbbd34ec864ea5d27d61bc78e57c93acf362994 Mon Sep 17 00:00:00 2001 From: Willy-JL Date: Sun, 5 Mar 2023 22:18:25 +0000 Subject: [PATCH] Fix subghz setting_user reset on flash --- applications/main/unirfremix/unirfremix_app.c | 2 +- ...tting_user.pocsag => setting_user.example} | 8 -- .../resources/subghz/assets/setting_user.txt | 81 ------------------- 3 files changed, 1 insertion(+), 90 deletions(-) rename assets/resources/subghz/assets/{setting_user.pocsag => setting_user.example} (79%) delete mode 100644 assets/resources/subghz/assets/setting_user.txt diff --git a/applications/main/unirfremix/unirfremix_app.c b/applications/main/unirfremix/unirfremix_app.c index b750fd4f1..45156b385 100644 --- a/applications/main/unirfremix/unirfremix_app.c +++ b/applications/main/unirfremix/unirfremix_app.c @@ -716,7 +716,7 @@ static void input_callback(InputEvent* input_event, void* ctx) { void unirfremix_subghz_alloc(UniRFRemix* app) { // load subghz presets app->setting = subghz_setting_alloc(); - subghz_setting_load(app->setting, EXT_PATH("subghz/assets/setting_user.txt")); + subghz_setting_load(app->setting, EXT_PATH("subghz/assets/setting_user")); // load mfcodes app->environment = subghz_environment_alloc(); diff --git a/assets/resources/subghz/assets/setting_user.pocsag b/assets/resources/subghz/assets/setting_user.example similarity index 79% rename from assets/resources/subghz/assets/setting_user.pocsag rename to assets/resources/subghz/assets/setting_user.example index 3c6b3b3a0..e0c474a99 100644 --- a/assets/resources/subghz/assets/setting_user.pocsag +++ b/assets/resources/subghz/assets/setting_user.example @@ -1,7 +1,6 @@ # to use manual settings and prevent them from being deleted on upgrade, rename *_user.example files to *_user Filetype: Flipper SubGhz Setting File Version: 1 - # Add Standard frequencies for your region #Add_standard_frequencies: true @@ -9,8 +8,6 @@ Version: 1 #Default_frequency: 433920000 # Frequencies used for "Read", "Read Raw" and "Frequency Analyzer" -# DAPNET frequency in most countries -Frequency: 439987500 #Frequency: 300000000 #Frequency: 310000000 #Frequency: 320000000 @@ -23,11 +20,6 @@ Frequency: 439987500 # Custom preset # format for CC1101 "Custom_preset_data:" XX YY XX YY .. 00 00 ZZ ZZ ZZ ZZ ZZ ZZ ZZ ZZ, where: XX-register, YY - register data, 00 00 - end load register, ZZ - 8 byte Pa table register -# FM with 9.5KHz frequency deviation - POCSAG settings -Custom_preset_name: FM95 -Custom_preset_module: CC1101 -Custom_preset_data: 02 0D 0B 06 08 32 07 04 14 00 13 02 12 04 11 83 10 67 15 24 18 18 19 16 1D 91 1C 00 1B 07 20 FB 22 10 21 56 00 00 C0 00 00 00 00 00 00 00 - #Custom_preset_name: AM_1 #Custom_preset_module: CC1101 #Custom_preset_data: 02 0D 03 07 08 32 0B 06 14 00 13 00 12 30 11 32 10 17 18 18 19 18 1D 91 1C 00 1B 07 20 FB 22 11 21 B6 00 00 00 C0 00 00 00 00 00 00 diff --git a/assets/resources/subghz/assets/setting_user.txt b/assets/resources/subghz/assets/setting_user.txt deleted file mode 100644 index 67e89dceb..000000000 --- a/assets/resources/subghz/assets/setting_user.txt +++ /dev/null @@ -1,81 +0,0 @@ -# to use manual settings and prevent them from being deleted on upgrade, rename *_user.example files to *_user -Filetype: Flipper SubGhz Setting File -Version: 1 - -# Add Standard frequencies for your region -Add_standard_frequencies: true - -# Default Frequency: used as default for "Read" and "Read Raw" -Default_frequency: 433920000 - -# Frequencies used for "Read", "Read Raw" and "Frequency Analyzer" -Frequency: 300000000 -Frequency: 302757000 -Frequency: 303875000 -Frequency: 304250000 -Frequency: 307000000 -Frequency: 307500000 -Frequency: 307800000 -Frequency: 309000000 -Frequency: 310000000 -Frequency: 312000000 -Frequency: 312100000 -Frequency: 312200000 -Frequency: 313000000 -Frequency: 313850000 -Frequency: 314000000 -Frequency: 314350000 -Frequency: 314980000 -Frequency: 315000000 -Frequency: 318000000 -Frequency: 330000000 -Frequency: 345000000 -Frequency: 348000000 -Frequency: 387000000 -Frequency: 390000000 -Frequency: 418000000 -Frequency: 433075000 -Frequency: 433220000 -Frequency: 433420000 -Frequency: 433657070 -Frequency: 433889000 -Frequency: 433920000 -Frequency: 434075000 -Frequency: 434176948 -Frequency: 434190000 -Frequency: 434390000 -Frequency: 434420000 -Frequency: 434620000 -Frequency: 434775000 -Frequency: 438900000 -Frequency: 440175000 -Frequency: 446000000 -Frequency: 464000000 -Frequency: 467750000 -Frequency: 779000000 -Frequency: 868350000 -Frequency: 868400000 -Frequency: 868800000 -Frequency: 868950000 -Frequency: 906400000 -Frequency: 915000000 -Frequency: 925000000 -Frequency: 928000000 - -# Frequencies used for hopping mode (keep this list small or flipper will miss signal) -Hopper_frequency: 310000000 -Hopper_frequency: 313000000 -Hopper_frequency: 315000000 -Hopper_frequency: 390000000 -Hopper_frequency: 433920000 -Hopper_frequency: 434420000 -Hopper_frequency: 868350000 - -# Custom preset examples -# format for CC1101 "Custom_preset_data:" XX YY XX YY .. 00 00 ZZ ZZ ZZ ZZ ZZ ZZ ZZ ZZ, where: XX-register, YY - register data, 00 00 - end load register, ZZ - 8 byte Pa table register -#Custom_preset_name: AM_1 -#Custom_preset_module: CC1101 -#Custom_preset_data: 02 0D 03 07 08 32 0B 06 14 00 13 00 12 30 11 32 10 17 18 18 19 18 1D 91 1C 00 1B 07 20 FB 22 11 21 B6 00 00 00 C0 00 00 00 00 00 00 -#Custom_preset_name: AM_2 -#Custom_preset_module: CC1101 -#Custom_preset_data: 02 0D 03 07 08 32 0B 06 14 00 13 00 12 30 11 32 10 17 18 18 19 18 1D 91 1C 00 1B 07 20 FB 22 11 21 B6 00 00 00 C0 00 00 00 00 00 00