From 9bbdaf8cb2e9ffd6227635e22e867a498fd8d899 Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Sat, 2 Dec 2023 01:51:30 +0000 Subject: [PATCH] Revert "Default to AM_Q (maybe idk, subghz code is a mess) --nobuild" This reverts commit 24b994102ddae0b6156aa977c42d581c4a9c18b6. --- applications/main/subghz/helpers/subghz_txrx.c | 2 +- applications/main/subghz/helpers/subghz_txrx.h | 2 +- applications/main/subghz/subghz_last_settings.h | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/applications/main/subghz/helpers/subghz_txrx.c b/applications/main/subghz/helpers/subghz_txrx.c index 8138c6288..583138e51 100644 --- a/applications/main/subghz/helpers/subghz_txrx.c +++ b/applications/main/subghz/helpers/subghz_txrx.c @@ -694,7 +694,7 @@ SubGhzReceiver* subghz_txrx_get_receiver(SubGhzTxRx* instance) { void subghz_txrx_set_default_preset(SubGhzTxRx* instance, uint32_t frequency) { furi_assert(instance); - const char* default_modulation = "AM_Q"; + const char* default_modulation = "AM650"; if(frequency == 0) { frequency = subghz_setting_get_default_frequency(subghz_txrx_get_setting(instance)); } diff --git a/applications/main/subghz/helpers/subghz_txrx.h b/applications/main/subghz/helpers/subghz_txrx.h index 4971ebf1e..fda684378 100644 --- a/applications/main/subghz/helpers/subghz_txrx.h +++ b/applications/main/subghz/helpers/subghz_txrx.h @@ -362,7 +362,7 @@ void subghz_txrx_reset_dynamic_and_custom_btns(SubGhzTxRx* instance); SubGhzReceiver* subghz_txrx_get_receiver(SubGhzTxRx* instance); // TODO use only in DecodeRaw /** - * @brief Set current preset AM_Q without additional params + * @brief Set current preset AM650 without additional params * * @param instance - instance Pointer to a SubGhzTxRx * @param frequency - frequency of preset, if pass 0 then taking default frequency 433.92MHz diff --git a/applications/main/subghz/subghz_last_settings.h b/applications/main/subghz/subghz_last_settings.h index d09bcab07..c5a46946e 100644 --- a/applications/main/subghz/subghz_last_settings.h +++ b/applications/main/subghz/subghz_last_settings.h @@ -9,9 +9,9 @@ #define SUBGHZ_LAST_SETTING_FREQUENCY_ANALYZER_TRIGGER (-93.0f) #define SUBGHZ_LAST_SETTING_SAVE_BIN_RAW true #define SUBGHZ_LAST_SETTING_SAVE_PRESET true -// 2 = "AM_Q" -// "AM270", "AM650", "AM_Q", "FM238", "FM476", -#define SUBGHZ_LAST_SETTING_DEFAULT_PRESET 2 +// 1 = "AM650" +// "AM270", "AM650", "FM238", "FM476", +#define SUBGHZ_LAST_SETTING_DEFAULT_PRESET 1 #define SUBGHZ_LAST_SETTING_DEFAULT_FREQUENCY 433920000 #define SUBGHZ_LAST_SETTING_FREQUENCY_ANALYZER_FEEDBACK_LEVEL 2