diff --git a/applications/subghz/subghz_setting.c b/applications/subghz/subghz_setting.c index 6a589c03e..25b488d84 100644 --- a/applications/subghz/subghz_setting.c +++ b/applications/subghz/subghz_setting.c @@ -59,113 +59,6 @@ static const uint32_t subghz_hopper_frequency_list[] = { 0, }; -/* Europe and Russia */ -static const uint32_t subghz_frequency_list_region_eu_ru[] = { - /* 300 - 348 */ - 300000000, - 303875000, - 304250000, - 310000000, - 315000000, - 318000000, - - /* 387 - 464 */ - 390000000, - 418000000, - 433075000, /* LPD433 first */ - 433420000, - 433920000 | FREQUENCY_FLAG_DEFAULT, /* LPD433 mid */ - 434420000, - 434775000, /* LPD433 last channels */ - 438900000, - - /* 779 - 928 */ - 868350000, - 915000000, - 925000000, - 0, -}; -static const uint32_t subghz_hopper_frequency_list_region_eu_ru[] = { - 310000000, - 315000000, - 318000000, - 390000000, - 433920000, - 868350000, - 0, -}; - -/* Region 0 */ -static const uint32_t subghz_frequency_list_region_us_ca_au[] = { - /* 300 - 348 */ - 300000000, - 303875000, - 304250000, - 310000000, - 315000000, - 318000000, - - /* 387 - 464 */ - 390000000, - 418000000, - 433075000, /* LPD433 first */ - 433420000, - 433920000 | FREQUENCY_FLAG_DEFAULT, /* LPD433 mid */ - 434420000, - 434775000, /* LPD433 last channels */ - 438900000, - - /* 779 - 928 */ - 868350000, - 915000000, - 925000000, - 0, -}; -static const uint32_t subghz_hopper_frequency_list_region_us_ca_au[] = { - 310000000, - 315000000, - 318000000, - 390000000, - 433920000, - 868350000, - 0, -}; - -static const uint32_t subghz_frequency_list_region_jp[] = { - /* 300 - 348 */ - 300000000, - 303875000, - 304250000, - 310000000, - 315000000, - 318000000, - - /* 387 - 464 */ - 390000000, - 418000000, - 433075000, /* LPD433 first */ - 433420000, - 433920000 | FREQUENCY_FLAG_DEFAULT, /* LPD433 mid */ - 434420000, - 434775000, /* LPD433 last channels */ - 438900000, - - /* 779 - 928 */ - 868350000, - 915000000, - 925000000, - 0, -}; -static const uint32_t subghz_hopper_frequency_list_region_jp[] = { - 310000000, - 315000000, - 318000000, - 390000000, - 433920000, - 868350000, - 0, -}; - LIST_DEF(FrequencyList, uint32_t) #define M_OPL_FrequencyList_t() LIST_OPLIST(FrequencyList) diff --git a/firmware/targets/f7/furi_hal/furi_hal_subghz.c b/firmware/targets/f7/furi_hal/furi_hal_subghz.c index e94edb9db..5f37d0e4b 100644 --- a/firmware/targets/f7/furi_hal/furi_hal_subghz.c +++ b/firmware/targets/f7/furi_hal/furi_hal_subghz.c @@ -285,15 +285,6 @@ static const uint8_t furi_hal_subghz_preset_ook_async_patable[8] = { 0x00, 0x00, 0x00}; -static const uint8_t furi_hal_subghz_preset_ook_async_patable_au[8] = { - 0x00, - 0x37, // 12dBm 0xC0, 10dBm 0xC5, 7dBm 0xCD, 5dBm 0x86, 0dBm 0x50, -6dBm 0x37, -10dBm 0x26, -15dBm 0x1D, -20dBm 0x17, -30dBm 0x03 - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00}; static const uint8_t furi_hal_subghz_preset_2fsk_async_patable[8] = { 0xC0, // 10dBm 0xC0, 7dBm 0xC8, 5dBm 0x84, 0dBm 0x60, -10dBm 0x34, -15dBm 0x1D, -20dBm 0x0E, -30dBm 0x12 0x00, @@ -571,7 +562,12 @@ uint32_t furi_hal_subghz_set_frequency_and_path(uint32_t value) { bool furi_hal_subghz_is_tx_allowed(uint32_t value) { // Removed region check - + if(!(value >= 299999755 && value <= 348000335) && + !(value >= 386999938 && value <= 464000000) && + !(value >= 778999847 && value <= 928000000)) { + return false; + } + return true; }