Skip to content

Commit ca47930

Browse files
committed
Merge branch 'dev' into release
2 parents 5e649d8 + 0bb1e89 commit ca47930

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
- The settings will be reset after returning to the main menu
1111
```
1212
* SubGHz Remote: Merged SubGHz Remote and Remote maker in one app, **use back button to access remote maker** (by @gid9798 | PR #545)
13+
* SubGHz: Replace FM15k with AM_Q in default modulations
1314
* 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)
1415
* GUI module: SubMenu fix vertical orientation (by @gid9798 | PR #543)
1516
* Apps: After merge fixes (by @gid9798 | PR #537)

applications/main/subghz/subghz.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ static void subghz_load_custom_presets(SubGhzSetting* setting) {
5858
{"FM95",
5959
"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"},
6060

61-
// #2-FSK 200khz BW / 135kHz Filter/ 15.86Khz Deviation + Ramping
62-
{"FM15k",
63-
"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"},
61+
// AM_Q
62+
{"AM_Q",
63+
"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"},
6464

6565
// Pagers
6666
{"Pagers",

0 commit comments

Comments
 (0)