Skip to content

Commit

Permalink
External radio driver in frequency analyzer & test carrier (#5)
Browse files Browse the repository at this point in the history 
* SubGhz App: add support ext_cc1101 in freq analyzer
* SubGhz App: add support ext_cc1101 in test_carrier
* SubGhz app: Deleted the temporary menu
  • Loading branch information
@gid9798
gid9798 authored Jul 6, 2023
1 parent b1850fd commit dd2cad0
Show file tree
Hide file tree
Showing 12 changed files with 206 additions and 220 deletions.
129 changes: 79 additions & 50 deletions applications/main/subghz/helpers/subghz_frequency_analyzer_worker.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
#include <furi.h>
#include <float_tools.h>

// TODO add external module

#define TAG "SubghzFrequencyAnalyzerWorker"

#define SUBGHZ_FREQUENCY_ANALYZER_THRESHOLD -97.0f
Expand All @@ -30,21 +28,27 @@ struct SubGhzFrequencyAnalyzerWorker {
FrequencyRSSI frequency_rssi_buf;
SubGhzSetting* setting;

const SubGhzDevice* radio_device;
FuriHalSpiBusHandle* spi_bus;
bool ext_radio;

float filVal;
float trigger_level;

SubGhzFrequencyAnalyzerWorkerPairCallback pair_callback;
void* context;
};

static void subghz_frequency_analyzer_worker_load_registers(const uint8_t data[][2]) {
furi_hal_spi_acquire(&furi_hal_spi_bus_handle_subghz);
static void subghz_frequency_analyzer_worker_load_registers(
FuriHalSpiBusHandle* spi_bus,
const uint8_t data[][2]) {
furi_hal_spi_acquire(spi_bus);
size_t i = 0;
while(data[i][0]) {
cc1101_write_reg(&furi_hal_spi_bus_handle_subghz, data[i][0], data[i][1]);
cc1101_write_reg(spi_bus, data[i][0], data[i][1]);
i++;
}
furi_hal_spi_release(&furi_hal_spi_bus_handle_subghz);
furi_hal_spi_release(spi_bus);
}

// running average with adaptive coefficient
Expand Down Expand Up @@ -79,31 +83,35 @@ static int32_t subghz_frequency_analyzer_worker_thread(void* context) {
uint32_t frequency_temp = 0;
CC1101Status status;

FuriHalSpiBusHandle* spi_bus = instance->spi_bus;
const SubGhzDevice* radio_device = instance->radio_device;

//Start CC1101
furi_hal_subghz_reset();
// furi_hal_subghz_reset();
subghz_devices_reset(radio_device);

furi_hal_spi_acquire(&furi_hal_spi_bus_handle_subghz);
cc1101_flush_rx(&furi_hal_spi_bus_handle_subghz);
cc1101_flush_tx(&furi_hal_spi_bus_handle_subghz);
furi_hal_spi_acquire(spi_bus);
cc1101_flush_rx(spi_bus);
cc1101_flush_tx(spi_bus);

// TODO probably can be used device.load_preset(FuriHalSubGhzPresetCustom, ...) for external cc1101
cc1101_write_reg(&furi_hal_spi_bus_handle_subghz, CC1101_IOCFG0, CC1101IocfgHW);
cc1101_write_reg(&furi_hal_spi_bus_handle_subghz, CC1101_MDMCFG3,
cc1101_write_reg(spi_bus, CC1101_IOCFG0, CC1101IocfgHW);
cc1101_write_reg(spi_bus, CC1101_MDMCFG3,
0b01111111); // symbol rate
cc1101_write_reg(
&furi_hal_spi_bus_handle_subghz,
spi_bus,
CC1101_AGCCTRL2,
0b00000111); // 00 - DVGA all; 000 - MAX LNA+LNA2; 111 - MAGN_TARGET 42 dB
cc1101_write_reg(
&furi_hal_spi_bus_handle_subghz,
spi_bus,
CC1101_AGCCTRL1,
0b00001000); // 0; 0 - LNA 2 gain is decreased to minimum before decreasing LNA gain; 00 - Relative carrier sense threshold disabled; 1000 - Absolute carrier sense threshold disabled
cc1101_write_reg(
&furi_hal_spi_bus_handle_subghz,
spi_bus,
CC1101_AGCCTRL0,
0b00110000); // 00 - No hysteresis, medium asymmetric dead zone, medium gain ; 11 - 64 samples agc; 00 - Normal AGC, 00 - 4dB boundary

furi_hal_spi_release(&furi_hal_spi_bus_handle_subghz);
furi_hal_spi_release(spi_bus);

furi_hal_subghz_set_path(FuriHalSubGhzPathIsolate);

Expand All @@ -116,36 +124,36 @@ static int32_t subghz_frequency_analyzer_worker_thread(void* context) {

frequency_rssi.rssi_coarse = -127.0f;
frequency_rssi.rssi_fine = -127.0f;
furi_hal_subghz_idle();
subghz_frequency_analyzer_worker_load_registers(subghz_preset_ook_650khz);
// furi_hal_subghz_idle();
subghz_devices_idle(radio_device);
subghz_frequency_analyzer_worker_load_registers(spi_bus, subghz_preset_ook_650khz);

// First stage: coarse scan
for(size_t i = 0; i < subghz_setting_get_frequency_count(instance->setting); i++) {
uint32_t current_frequency = subghz_setting_get_frequency(instance->setting, i);
if(furi_hal_subghz_is_frequency_valid(current_frequency) &&
(current_frequency != 467750000) && (current_frequency != 464000000)
// &&
// !((furi_hal_subghz.radio_type == SubGhzRadioExternal) &&
// ((current_frequency == 390000000) || (current_frequency == 312000000) ||
// (current_frequency == 312100000) || (current_frequency == 312200000) ||
// (current_frequency == 440175000)))
) {
furi_hal_spi_acquire(&furi_hal_spi_bus_handle_subghz);
cc1101_switch_to_idle(&furi_hal_spi_bus_handle_subghz);
frequency =
cc1101_set_frequency(&furi_hal_spi_bus_handle_subghz, current_frequency);

cc1101_calibrate(&furi_hal_spi_bus_handle_subghz);
// if(furi_hal_subghz_is_frequency_valid(current_frequency) &&
if(subghz_devices_is_frequency_valid(radio_device, current_frequency) &&
(current_frequency != 467750000) && (current_frequency != 464000000) &&
!((instance->ext_radio) &&
((current_frequency == 390000000) || (current_frequency == 312000000) ||
(current_frequency == 312100000) || (current_frequency == 312200000) ||
(current_frequency == 440175000)))) {
furi_hal_spi_acquire(spi_bus);
cc1101_switch_to_idle(spi_bus);
frequency = cc1101_set_frequency(spi_bus, current_frequency);

cc1101_calibrate(spi_bus);
do {
status = cc1101_get_status(&furi_hal_spi_bus_handle_subghz);
status = cc1101_get_status(spi_bus);
} while(status.STATE != CC1101StateIDLE);

cc1101_switch_to_rx(&furi_hal_spi_bus_handle_subghz);
furi_hal_spi_release(&furi_hal_spi_bus_handle_subghz);
cc1101_switch_to_rx(spi_bus);
furi_hal_spi_release(spi_bus);

furi_delay_ms(2);

rssi = furi_hal_subghz_get_rssi();
// rssi = furi_hal_subghz_get_rssi();
rssi = subghz_devices_get_rssi(radio_device);

rssi_avg += rssi;
rssi_avg_samples++;
Expand All @@ -169,28 +177,31 @@ static int32_t subghz_frequency_analyzer_worker_thread(void* context) {

// Second stage: fine scan
if(frequency_rssi.rssi_coarse > instance->trigger_level) {
furi_hal_subghz_idle();
subghz_frequency_analyzer_worker_load_registers(subghz_preset_ook_58khz);
// furi_hal_subghz_idle();
subghz_devices_idle(radio_device);
subghz_frequency_analyzer_worker_load_registers(spi_bus, subghz_preset_ook_58khz);
//for example -0.3 ... 433.92 ... +0.3 step 20KHz
for(uint32_t i = frequency_rssi.frequency_coarse - 300000;
i < frequency_rssi.frequency_coarse + 300000;
i += 20000) {
if(furi_hal_subghz_is_frequency_valid(i)) {
furi_hal_spi_acquire(&furi_hal_spi_bus_handle_subghz);
cc1101_switch_to_idle(&furi_hal_spi_bus_handle_subghz);
frequency = cc1101_set_frequency(&furi_hal_spi_bus_handle_subghz, i);
// if(furi_hal_subghz_is_frequency_valid(i)) {
if(subghz_devices_is_frequency_valid(radio_device, i)) {
furi_hal_spi_acquire(spi_bus);
cc1101_switch_to_idle(spi_bus);
frequency = cc1101_set_frequency(spi_bus, i);

cc1101_calibrate(&furi_hal_spi_bus_handle_subghz);
cc1101_calibrate(spi_bus);
do {
status = cc1101_get_status(&furi_hal_spi_bus_handle_subghz);
status = cc1101_get_status(spi_bus);
} while(status.STATE != CC1101StateIDLE);

cc1101_switch_to_rx(&furi_hal_spi_bus_handle_subghz);
furi_hal_spi_release(&furi_hal_spi_bus_handle_subghz);
cc1101_switch_to_rx(spi_bus);
furi_hal_spi_release(spi_bus);

furi_delay_ms(2);

rssi = furi_hal_subghz_get_rssi();
// rssi = furi_hal_subghz_get_rssi();
rssi = subghz_devices_get_rssi(radio_device);

FURI_LOG_T(TAG, "#:%lu:%f", frequency, (double)rssi);

Expand Down Expand Up @@ -267,8 +278,10 @@ static int32_t subghz_frequency_analyzer_worker_thread(void* context) {
}

//Stop CC1101
furi_hal_subghz_idle();
furi_hal_subghz_sleep();
// furi_hal_subghz_idle();
// furi_hal_subghz_sleep();
subghz_devices_idle(radio_device);
subghz_devices_sleep(radio_device);

return 0;
}
Expand Down Expand Up @@ -307,10 +320,26 @@ void subghz_frequency_analyzer_worker_set_pair_callback(
instance->context = context;
}

void subghz_frequency_analyzer_worker_start(SubGhzFrequencyAnalyzerWorker* instance) {
void subghz_frequency_analyzer_worker_start(
SubGhzFrequencyAnalyzerWorker* instance,
SubGhzTxRx* txrx) {
furi_assert(instance);
furi_assert(!instance->worker_running);

SubGhzRadioDeviceType radio_type = subghz_txrx_radio_device_get(txrx);

if(radio_type == SubGhzRadioDeviceTypeExternalCC1101) {
instance->spi_bus = &furi_hal_spi_bus_handle_external;
instance->ext_radio = true;
} else if(radio_type == SubGhzRadioDeviceTypeInternal) {
instance->spi_bus = &furi_hal_spi_bus_handle_subghz;
instance->ext_radio = false;
} else {
furi_crash("Unsuported external module");
}

instance->radio_device = subghz_devices_get_by_name(subghz_txrx_radio_device_get_name(txrx));

instance->worker_running = true;

furi_thread_start(instance->thread);
Expand Down
5 changes: 4 additions & 1 deletion applications/main/subghz/helpers/subghz_frequency_analyzer_worker.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,11 @@ void subghz_frequency_analyzer_worker_set_pair_callback(
/** Start SubGhzFrequencyAnalyzerWorker
*
* @param instance SubGhzFrequencyAnalyzerWorker instance
* @param txrx pointer to SubGhzTxRx
*/
void subghz_frequency_analyzer_worker_start(SubGhzFrequencyAnalyzerWorker* instance);
void subghz_frequency_analyzer_worker_start(
SubGhzFrequencyAnalyzerWorker* instance,
SubGhzTxRx* txrx);

/** Stop SubGhzFrequencyAnalyzerWorker
*
Expand Down
1 change: 0 additions & 1 deletion applications/main/subghz/scenes/subghz_scene_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,3 @@ ADD_SCENE(subghz, decode_raw, DecodeRAW)
ADD_SCENE(subghz, delete_raw, DeleteRAW)
ADD_SCENE(subghz, need_saving, NeedSaving)
ADD_SCENE(subghz, rpc, Rpc)
ADD_SCENE(subghz, radio_setting, RadioSettings)
70 changes: 0 additions & 70 deletions applications/main/subghz/scenes/subghz_scene_radio_setting.c
View file

This file was deleted.

Loading

0 comments on commit dd2cad0

Please sign in to comment.