Merge branch 'dev' into release

DarkFlippers · Jul 19, 2023 · ca47930 · ca47930
2 parents 5e649d8 + 0bb1e89
commit ca47930
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - The settings will be reset after returning to the main menu
 ```
 * SubGHz Remote: Merged SubGHz Remote and Remote maker in one app, **use back button to access remote maker** (by @gid9798 | PR #545)
+* SubGHz: Replace FM15k with AM_Q in default modulations
 * SubGHz: Port latest OFW external radio driver, fix issues (now you can make drivers for other radio chips) (by @gid9798 | PR #539 #536 #535 #534)
 * GUI module: SubMenu fix vertical orientation (by @gid9798 | PR #543)
 * Apps: After merge fixes (by @gid9798 | PR #537)

diff --git a/applications/main/subghz/subghz.c b/applications/main/subghz/subghz.c
@@ -58,9 +58,9 @@ static void subghz_load_custom_presets(SubGhzSetting* setting) {
         {"FM95",
          "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"},
 
-        // #2-FSK 200khz BW / 135kHz Filter/ 15.86Khz Deviation + Ramping
-        {"FM15k",
-         "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"},
+        // AM_Q
+        {"AM_Q",
+         "02 0D 03 07 08 32 0B 06 14 00 13 00 12 30 11 22 10 1C 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"},
 
         // Pagers
         {"Pagers",