added pager modulation, removed duplicate modulations, and cleaned up duplicate setting file

applications/main/subghz/subghz.c

@@ -183,7 +183,7 @@ SubGhz* subghz_alloc(bool alloc_for_tx_only) {
     //init setting
     subghz->setting = subghz_setting_alloc();
 
-    subghz_setting_load(subghz->setting, EXT_PATH("subghz/assets/setting_user"));
+    subghz_setting_load(subghz->setting, EXT_PATH("subghz/assets/setting_user.txt"));
 
     // Custom Presets load without using config file
 
@@ -208,26 +208,37 @@ SubGhz* subghz_alloc(bool alloc_for_tx_only) {
 
     flipper_format_free(temp_fm_preset2);
 
-    // # HND - FM presets
+    // Pagers
     FlipperFormat* temp_fm_preset3 = flipper_format_string_alloc();
     flipper_format_write_string_cstr(
-        temp_fm_preset3,
+        temp_fm_preset2,
         (const char*)"Custom_preset_data",
-        (const char*)"02 0D 0B 06 08 32 07 04 14 00 13 02 12 04 11 36 10 69 15 32 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");
+        (const char*)"02 0D 07 04 08 32 0B 06 10 64 11 93 12 0C 13 02 14 00 15 15 18 18 19 16 1B 07 1C 00 1D 91 20 FB 21 56 22 10 00 00 C0 00 00 00 00 00 00 00");
     flipper_format_rewind(temp_fm_preset3);
-    subghz_setting_load_custom_preset(subghz->setting, (const char*)"HND_1", temp_fm_preset3);
+    subghz_setting_load_custom_preset(subghz->setting, (const char*)"Pagers", temp_fm_preset3);
 
     flipper_format_free(temp_fm_preset3);
 
+    // # HND - FM presets
     FlipperFormat* temp_fm_preset4 = flipper_format_string_alloc();
     flipper_format_write_string_cstr(
         temp_fm_preset4,
         (const char*)"Custom_preset_data",
-        (const char*)"02 0D 0B 06 08 32 07 04 14 00 13 02 12 07 11 36 10 E9 15 32 18 18 19 16 1D 92 1C 40 1B 03 20 FB 22 10 21 56 00 00 C0 00 00 00 00 00 00 00");
+        (const char*)"02 0D 0B 06 08 32 07 04 14 00 13 02 12 04 11 36 10 69 15 32 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");
     flipper_format_rewind(temp_fm_preset4);
-    subghz_setting_load_custom_preset(subghz->setting, (const char*)"HND_2", temp_fm_preset4);
+    subghz_setting_load_custom_preset(subghz->setting, (const char*)"Honda_1", temp_fm_preset4);
 
-    flipper_format_free(temp_fm_preset4);
+    flipper_format_free(temp_fm_preset3);
+
+    FlipperFormat* temp_fm_preset5 = flipper_format_string_alloc();
+    flipper_format_write_string_cstr(
+        temp_fm_preset5,
+        (const char*)"Custom_preset_data",
+        (const char*)"02 0D 0B 06 08 32 07 04 14 00 13 02 12 07 11 36 10 E9 15 32 18 18 19 16 1D 92 1C 40 1B 03 20 FB 22 10 21 56 00 00 C0 00 00 00 00 00 00 00");
+    flipper_format_rewind(temp_fm_preset5);
+    subghz_setting_load_custom_preset(subghz->setting, (const char*)"Honda_2", temp_fm_preset5);
+
+    flipper_format_free(temp_fm_preset5);
 
     // custom presets loading - end
 

applications/main/unirfremix/unirfremix_app.c

@@ -706,7 +706,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"));
+    subghz_setting_load(app->setting, EXT_PATH("subghz/assets/setting_user.txt"));
 
     // load mfcodes
     app->environment = subghz_environment_alloc();

applications/plugins/protoview/app.c

@@ -143,7 +143,7 @@ ProtoViewApp* protoview_app_alloc() {
 
     //init setting
     app->setting = subghz_setting_alloc();
-    subghz_setting_load(app->setting, EXT_PATH("subghz/assets/setting_user"));
+    subghz_setting_load(app->setting, EXT_PATH("subghz/assets/setting_user.txt"));
 
     // GUI
     app->gui = furi_record_open(RECORD_GUI);

assets/resources/subghz/assets/setting_user

@@ -1,45 +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: 310000000
-Frequency: 320000000
-
-# Frequencies used for hopping mode (keep this list small or flipper will miss signal)
-Hopper_frequency: 300000000
-Hopper_frequency: 310000000
-Hopper_frequency: 310000000
-
-# 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
-
-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
-
-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
-
-# Honda Presets
-Custom_preset_name: Honda1
-Custom_preset_module: CC1101
-#                                                          G2    G3    G4    D                 L0    L1    L2
-Custom_preset_data: 02 0D 0B 06 08 32 07 04 14 00 13 02 12 04 11 36 10 69 15 32 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: Honda2
-Custom_preset_module: CC1101
-#                                                          G2    G3    G4    D                 L0    L1    L2
-Custom_preset_data: 02 0D 0B 06 08 32 07 04 14 00 13 02 12 07 11 36 10 E9 15 32 18 18 19 16 1D 92 1C 40 1B 03 20 FB 22 10 21 56 00 00 C0 00 00 00 00 00 00 00

assets/resources/subghz/assets/setting_user.txt

@@ -78,24 +78,3 @@ Hopper_frequency: 868350000
 #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
-
-# Custom presets added in Unleashed FW
-# -- Some presets from forum.flipperzero.one --
-
-#2-FSK 200khz BW / 135kHz Filter/ 15.86Khz Deviation + Ramping
-Custom_preset_name: FM15k
-Custom_preset_module: CC1101
-Custom_preset_data: 02 0D 03 47 08 32 0B 06 15 32 14 00 13 00 12 00 11 32 10 A7 18 18 19 1D 1D 92 1C 00 1B 04 20 FB 22 17 21 B6 00 00 00 12 0E 34 60 C5 C1 C0
-
-# -- Other presets --
-
-# Honda Presets
-Custom_preset_name: Honda1
-Custom_preset_module: CC1101
-#                                                          G2    G3    G4    D                 L0    L1    L2
-Custom_preset_data: 02 0D 0B 06 08 32 07 04 14 00 13 02 12 04 11 36 10 69 15 32 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: Honda2
-Custom_preset_module: CC1101
-#                                                          G2    G3    G4    D                 L0    L1    L2
-Custom_preset_data: 02 0D 0B 06 08 32 07 04 14 00 13 02 12 07 11 36 10 E9 15 32 18 18 19 16 1D 92 1C 40 1B 03 20 FB 22 10 21 56 00 00 C0 00 00 00 00 00 00 00