Mirrors/unleashed-firmware
2
0
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware synced 2025-02-17 05:48:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Now really block transmission at dangerous freq

Browse source
This commit is contained in:
gid9798 2023-06-20 11:02:14 +03:00
parent a519a242d6
commit f9472effe3
2 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
applications/drivers/subghz/cc1101_ext/cc1101_ext.c
View file

@ -1,7 +1,6 @@
#include "cc1101_ext.h" #include "cc1101_ext.h"
#include <lib/subghz/devices/cc1101_configs.h> #include <lib/subghz/devices/cc1101_configs.h>
#include <furi_hal_region.h>
#include <furi_hal_version.h> #include <furi_hal_version.h>
#include <furi_hal_rtc.h> #include <furi_hal_rtc.h>
#include <furi_hal_spi.h> #include <furi_hal_spi.h>
@ -19,6 +18,7 @@
#define TAG "SubGhz_Device_CC1101_Ext" #define TAG "SubGhz_Device_CC1101_Ext"
#define SUBGHZ_DEVICE_CC1101_EXT_TX_GPIO &gpio_ext_pb2 #define SUBGHZ_DEVICE_CC1101_EXT_TX_GPIO &gpio_ext_pb2
#define SUBGHZ_DEVICE_CC1101_EXT_DANGEROUS_RANGE false
/* DMA Channels definition */ /* DMA Channels definition */
#define SUBGHZ_DEVICE_CC1101_EXT_DMA DMA2 #define SUBGHZ_DEVICE_CC1101_EXT_DMA DMA2
@ -428,9 +428,26 @@ uint8_t subghz_device_cc1101_ext_get_lqi() {
} }
bool subghz_device_cc1101_ext_is_frequency_valid(uint32_t value) { bool subghz_device_cc1101_ext_is_frequency_valid(uint32_t value) {
if(!(value >= 299999755 && value <= 348000335) && if(!(value >= 281000000 && value <= 361000000) &&
!(value >= 386999938 && value <= 464000000) && !(value >= 378000000 && value <= 481000000) &&
!(value >= 749000000 && value <= 962000000)) {
return false;
}
return true;
}
bool subghz_device_cc1101_ext_is_tx_allowed(uint32_t value) {
if(!(SUBGHZ_DEVICE_CC1101_EXT_DANGEROUS_RANGE) &&
!(value >= 299999755 && value <= 350000335) && // was increased from 348 to 350
!(value >= 386999938 && value <= 467750000) && // was increased from 464 to 467.75
!(value >= 778999847 && value <= 928000000)) { !(value >= 778999847 && value <= 928000000)) {
FURI_LOG_I(TAG, "Frequency blocked - outside default range");
return false;
} else if(
(SUBGHZ_DEVICE_CC1101_EXT_DANGEROUS_RANGE) &&
!subghz_device_cc1101_ext_is_frequency_valid(value)) {
FURI_LOG_I(TAG, "Frequency blocked - outside dangerous range");
return false; return false;
} }
@ -438,10 +455,10 @@ bool subghz_device_cc1101_ext_is_frequency_valid(uint32_t value) {
} }
uint32_t subghz_device_cc1101_ext_set_frequency(uint32_t value) { uint32_t subghz_device_cc1101_ext_set_frequency(uint32_t value) {
if(furi_hal_region_is_frequency_allowed(value)) { if(subghz_device_cc1101_ext_is_tx_allowed(value)) {
subghz_device_cc1101_ext->regulation = SubGhzDeviceCC1101ExtRegulationTxRx; subghz_device_cc1101_ext->regulation = SubGhzDeviceCC1101ExtRegulationTxRx;
} else { } else {
subghz_device_cc1101_ext->regulation = SubGhzDeviceCC1101ExtRegulationOnlyRx; subghz_device_cc1101_ext->regulation = SubGhzDeviceCC1101ExtRegulationTxRx;
} }
furi_hal_spi_acquire(subghz_device_cc1101_ext->spi_bus_handle); furi_hal_spi_acquire(subghz_device_cc1101_ext->spi_bus_handle);

12
firmware/targets/f7/furi_hal/furi_hal_subghz.c
View file

@ -10,8 +10,6 @@
#include <stm32wbxx_ll_dma.h> #include <stm32wbxx_ll_dma.h>
#include <lib/flipper_format/flipper_format.h> // TODO
#include <furi.h> #include <furi.h>
#include <cc1101.h> #include <cc1101.h>
#include <stdio.h> #include <stdio.h>
@ -390,9 +388,7 @@ bool furi_hal_subghz_is_tx_allowed(uint32_t value) {
return false; return false;
} else if( } else if(
(allow_extended_for_int) && // (allow_extended_for_int) && //
!(value >= 281000000 && value <= 361000000) && !furi_hal_subghz_is_frequency_valid(value)) {
!(value >= 378000000 && value <= 481000000) &&
!(value >= 749000000 && value <= 962000000)) {
FURI_LOG_I(TAG, "Frequency blocked - outside dangerous range"); FURI_LOG_I(TAG, "Frequency blocked - outside dangerous range");
return false; return false;
} }
@ -401,7 +397,11 @@ bool furi_hal_subghz_is_tx_allowed(uint32_t value) {
} }
uint32_t furi_hal_subghz_set_frequency(uint32_t value) { uint32_t furi_hal_subghz_set_frequency(uint32_t value) {
furi_hal_subghz.regulation = SubGhzRegulationTxRx; if(furi_hal_subghz_is_tx_allowed(value)) {
furi_hal_subghz.regulation = SubGhzRegulationTxRx;
} else {
furi_hal_subghz.regulation = SubGhzRegulationOnlyRx;
}
furi_hal_spi_acquire(&furi_hal_spi_bus_handle_subghz); furi_hal_spi_acquire(&furi_hal_spi_bus_handle_subghz);
uint32_t real_frequency = cc1101_set_frequency(&furi_hal_spi_bus_handle_subghz, value); uint32_t real_frequency = cc1101_set_frequency(&furi_hal_spi_bus_handle_subghz, value);