From 8f2bd3be571a3f949d0817dda8474d7624594751 Mon Sep 17 00:00:00 2001 From: derskythe Date: Wed, 28 Sep 2022 07:14:38 +0400 Subject: [PATCH] Update list of frequencies and change name of file of settings to not able to run in browser --- .../main/subghz/subghz_last_settings.c | 4 +-- .../subghz/views/subghz_frequency_analyzer.c | 25 ++++++------------- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/applications/main/subghz/subghz_last_settings.c b/applications/main/subghz/subghz_last_settings.c index 241d8e950..0a45e36ba 100644 --- a/applications/main/subghz/subghz_last_settings.c +++ b/applications/main/subghz/subghz_last_settings.c @@ -1,13 +1,11 @@ #include "subghz_last_settings.h" -#include -#include #include #define TAG "SubGhzLastSettings" #define SUBGHZ_LAST_SETTING_FILE_TYPE "Flipper SubGhz Last Setting File" #define SUBGHZ_LAST_SETTING_FILE_VERSION 1 -#define SUBGHZ_LAST_SETTINGS_PATH EXT_PATH("subghz/assets/.subghz.settings") +#define SUBGHZ_LAST_SETTINGS_PATH EXT_PATH("subghz/assets/subghz.settings") // 1 = "AM650" // "AM270", "AM650", "FM238", "FM476", #define SUBGHZ_LAST_SETTING_DEFAULT_PRESET 1 diff --git a/applications/main/subghz/views/subghz_frequency_analyzer.c b/applications/main/subghz/views/subghz_frequency_analyzer.c index 7d1239cd8..f7c41f627 100644 --- a/applications/main/subghz/views/subghz_frequency_analyzer.c +++ b/applications/main/subghz/views/subghz_frequency_analyzer.c @@ -48,24 +48,13 @@ static const NotificationSequence sequence_not_saved = { NULL, }; -static const uint32_t subghz_frequency_list[17] = { - 300000000, - 303875000, - 304250000, - 310000000, - 315000000, - 318000000, - 390000000, - 418000000, - 433075000, - 433420000, - 433920000, - 434420000, - 434775000, - 438900000, - 868350000, - 915000000, - 925000000}; +static const uint32_t subghz_frequency_list[] = { + 300000000, 302757000, 303875000, 304250000, 307000000, 307500000, 307800000, + 309000000, 310000000, 312000000, 312100000, 313000000, 313850000, 314000000, + 314350000, 315000000, 318000000, 345000000, 348000000, 387000000, 390000000, + 418000000, 433075000, 433220000, 433420000, 433657070, 433889000, 433920000, + 434176948, 434420000, 434775000, 438900000, 464000000, 779000000, 868350000, + 868400000, 868950000, 906400000, 915000000, 925000000, 928000000}; typedef enum { SubGhzFrequencyAnalyzerStatusIDLE,