From 065241fe5bdab19f2dc5d2b06e83244190ed09ea Mon Sep 17 00:00:00 2001 From: Skorpionm <85568270+Skorpionm@users.noreply.github.com> Date: Sun, 2 Jan 2022 21:42:28 +0400 Subject: [PATCH] SubGhz: extended frequency for Australia to 321.95 MHz (#934) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: あく --- firmware/targets/f6/furi-hal/furi-hal-subghz.c | 6 +++--- firmware/targets/f7/furi-hal/furi-hal-subghz.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/firmware/targets/f6/furi-hal/furi-hal-subghz.c b/firmware/targets/f6/furi-hal/furi-hal-subghz.c index b25a3052..ff5346c9 100644 --- a/firmware/targets/f6/furi-hal/furi-hal-subghz.c +++ b/firmware/targets/f6/furi-hal/furi-hal-subghz.c @@ -580,13 +580,13 @@ bool furi_hal_subghz_is_tx_allowed(uint32_t value) { } break; case FuriHalVersionRegionUsCaAu: - //304,10..315,25; 433,05..434,79; 915,00..928,00 - if(!(value >= 304100000 && value <= 315250000) && + //304,10..321,95; 433,05..434,79; 915,00..928,00 + if(!(value >= 304100000 && value <= 321950000) && !(value >= 433050000 && value <= 434790000) && !(value >= 915000000 && value <= 928000000)) { } else { if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) { - if((value >= 304100000 && value <= 315250000) && + if((value >= 304100000 && value <= 321950000) && ((furi_hal_subghz_preset == FuriHalSubGhzPresetOok270Async) || (furi_hal_subghz_preset == FuriHalSubGhzPresetOok650Async))) { furi_hal_subghz_load_patable(furi_hal_subghz_preset_ook_async_patable_au); diff --git a/firmware/targets/f7/furi-hal/furi-hal-subghz.c b/firmware/targets/f7/furi-hal/furi-hal-subghz.c index b25a3052..ff5346c9 100644 --- a/firmware/targets/f7/furi-hal/furi-hal-subghz.c +++ b/firmware/targets/f7/furi-hal/furi-hal-subghz.c @@ -580,13 +580,13 @@ bool furi_hal_subghz_is_tx_allowed(uint32_t value) { } break; case FuriHalVersionRegionUsCaAu: - //304,10..315,25; 433,05..434,79; 915,00..928,00 - if(!(value >= 304100000 && value <= 315250000) && + //304,10..321,95; 433,05..434,79; 915,00..928,00 + if(!(value >= 304100000 && value <= 321950000) && !(value >= 433050000 && value <= 434790000) && !(value >= 915000000 && value <= 928000000)) { } else { if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) { - if((value >= 304100000 && value <= 315250000) && + if((value >= 304100000 && value <= 321950000) && ((furi_hal_subghz_preset == FuriHalSubGhzPresetOok270Async) || (furi_hal_subghz_preset == FuriHalSubGhzPresetOok650Async))) { furi_hal_subghz_load_patable(furi_hal_subghz_preset_ook_async_patable_au);