liz/flipperzero-firmware
liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SubGhz: frequency analyzer. 2dbi desensitization, rssi averaging to reduce jitter, new rssi indicators in log_mode, GUI fix (#2020)

Browse Source 
Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
Skorpionm 2022-11-23 17:31:39 +04:00 committed by GitHub
parent 1c8451fad4
commit 9bb0dbaa3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
applications/main/subghz/helpers/subghz_frequency_analyzer_worker.c
View File

@ -5,8 +5,6 @@
#define TAG "SubghzFrequencyAnalyzerWorker" #define TAG "SubghzFrequencyAnalyzerWorker"
#define SUBGHZ_FREQUENCY_ANALYZER_THRESHOLD -95.0f
static const uint8_t subghz_preset_ook_58khz[][2] = { static const uint8_t subghz_preset_ook_58khz[][2] = {
{CC1101_MDMCFG4, 0b11110111}, // Rx BW filter is 58.035714kHz {CC1101_MDMCFG4, 0b11110111}, // Rx BW filter is 58.035714kHz
/* End */ /* End */
@ -71,7 +69,7 @@ static int32_t subghz_frequency_analyzer_worker_thread(void* context) {
.frequency_coarse = 0, .rssi_coarse = 0, .frequency_fine = 0, .rssi_fine = 0}; .frequency_coarse = 0, .rssi_coarse = 0, .frequency_fine = 0, .rssi_fine = 0};
float rssi = 0; float rssi = 0;
uint32_t frequency = 0; uint32_t frequency = 0;
float rssi_temp = 0; float rssi_temp = -127.0f;
uint32_t frequency_temp = 0; uint32_t frequency_temp = 0;
CC1101Status status; CC1101Status status;
@ -196,7 +194,7 @@ static int32_t subghz_frequency_analyzer_worker_thread(void* context) {
TAG, "=:%lu:%f", frequency_rssi.frequency_fine, (double)frequency_rssi.rssi_fine); TAG, "=:%lu:%f", frequency_rssi.frequency_fine, (double)frequency_rssi.rssi_fine);
instance->sample_hold_counter = 20; instance->sample_hold_counter = 20;
rssi_temp = frequency_rssi.rssi_fine; rssi_temp = (rssi_temp + frequency_rssi.rssi_fine) / 2;
frequency_temp = frequency_rssi.frequency_fine; frequency_temp = frequency_rssi.frequency_fine;
if(instance->filVal) { if(instance->filVal) {
@ -207,10 +205,7 @@ static int32_t subghz_frequency_analyzer_worker_thread(void* context) {
// Deliver callback // Deliver callback
if(instance->pair_callback) { if(instance->pair_callback) {
instance->pair_callback( instance->pair_callback(
instance->context, instance->context, frequency_rssi.frequency_fine, rssi_temp, true);
frequency_rssi.frequency_fine,
frequency_rssi.rssi_fine,
true);
} }
} else if( // Deliver results coarse } else if( // Deliver results coarse
(frequency_rssi.rssi_coarse > SUBGHZ_FREQUENCY_ANALYZER_THRESHOLD) && (frequency_rssi.rssi_coarse > SUBGHZ_FREQUENCY_ANALYZER_THRESHOLD) &&
@ -222,7 +217,7 @@ static int32_t subghz_frequency_analyzer_worker_thread(void* context) {
(double)frequency_rssi.rssi_coarse); (double)frequency_rssi.rssi_coarse);
instance->sample_hold_counter = 20; instance->sample_hold_counter = 20;
rssi_temp = frequency_rssi.rssi_coarse; rssi_temp = (rssi_temp + frequency_rssi.rssi_coarse) / 2;
frequency_temp = frequency_rssi.frequency_coarse; frequency_temp = frequency_rssi.frequency_coarse;
if(instance->filVal) { if(instance->filVal) {
frequency_rssi.frequency_coarse = frequency_rssi.frequency_coarse =
@ -232,15 +227,12 @@ static int32_t subghz_frequency_analyzer_worker_thread(void* context) {
// Deliver callback // Deliver callback
if(instance->pair_callback) { if(instance->pair_callback) {
instance->pair_callback( instance->pair_callback(
instance->context, instance->context, frequency_rssi.frequency_coarse, rssi_temp, true);
frequency_rssi.frequency_coarse,
frequency_rssi.rssi_coarse,
true);
} }
} else { } else {
if(instance->sample_hold_counter > 0) { if(instance->sample_hold_counter > 0) {
instance->sample_hold_counter--; instance->sample_hold_counter--;
if(instance->sample_hold_counter == 18) { if(instance->sample_hold_counter == 15) {
if(instance->pair_callback) { if(instance->pair_callback) {
instance->pair_callback( instance->pair_callback(
instance->context, frequency_temp, rssi_temp, false); instance->context, frequency_temp, rssi_temp, false);
@ -248,8 +240,8 @@ static int32_t subghz_frequency_analyzer_worker_thread(void* context) {
} }
} else { } else {
instance->filVal = 0; instance->filVal = 0;
if(instance->pair_callback) rssi_temp = -127.0f;
instance->pair_callback(instance->context, 0, 0, false); instance->pair_callback(instance->context, 0, 0, false);
} }
} }
} }

2
applications/main/subghz/helpers/subghz_frequency_analyzer_worker.h
View File

@ -3,6 +3,8 @@
#include <furi_hal.h> #include <furi_hal.h>
#include "../subghz_i.h" #include "../subghz_i.h"
#define SUBGHZ_FREQUENCY_ANALYZER_THRESHOLD -93.0f
typedef struct SubGhzFrequencyAnalyzerWorker SubGhzFrequencyAnalyzerWorker; typedef struct SubGhzFrequencyAnalyzerWorker SubGhzFrequencyAnalyzerWorker;
typedef void (*SubGhzFrequencyAnalyzerWorkerPairCallback)( typedef void (*SubGhzFrequencyAnalyzerWorkerPairCallback)(

56
applications/main/subghz/views/subghz_frequency_analyzer.c
View File

@ -13,8 +13,6 @@
#include <assets_icons.h> #include <assets_icons.h>
#define LOG_FREQUENCY_MAX_ITEMS 60 // uint8_t (limited by 'seq' of SubGhzFrequencyAnalyzerLogItem) #define LOG_FREQUENCY_MAX_ITEMS 60 // uint8_t (limited by 'seq' of SubGhzFrequencyAnalyzerLogItem)
#define RSSI_OFFSET 74
#define RSSI_MAX 53 // 127 - RSSI_OFFSET
#define SNPRINTF_FREQUENCY(buff, freq) \ #define SNPRINTF_FREQUENCY(buff, freq) \
snprintf(buff, sizeof(buff), "%03ld.%03ld", freq / 1000000 % 1000, freq / 1000 % 1000); snprintf(buff, sizeof(buff), "%03ld.%03ld", freq / 1000000 % 1000, freq / 1000 % 1000);
@ -49,7 +47,7 @@ typedef struct {
} SubGhzFrequencyAnalyzerModel; } SubGhzFrequencyAnalyzerModel;
static inline uint8_t rssi_sanitize(float rssi) { static inline uint8_t rssi_sanitize(float rssi) {
return (rssi * -1.0f) - RSSI_OFFSET; return (rssi ? (uint8_t)(rssi - SUBGHZ_FREQUENCY_ANALYZER_THRESHOLD) : 0);
} }
void subghz_frequency_analyzer_set_callback( void subghz_frequency_analyzer_set_callback(
@ -65,12 +63,25 @@ void subghz_frequency_analyzer_set_callback(
void subghz_frequency_analyzer_draw_rssi(Canvas* canvas, uint8_t rssi, uint8_t x, uint8_t y) { void subghz_frequency_analyzer_draw_rssi(Canvas* canvas, uint8_t rssi, uint8_t x, uint8_t y) {
uint8_t column_number = 0; uint8_t column_number = 0;
if(rssi) { if(rssi) {
rssi = rssi / 3; rssi = rssi / 3 + 2;
if(rssi > 20) rssi = 20;
for(uint8_t i = 1; i < rssi; i++) { for(uint8_t i = 1; i < rssi; i++) {
if(i > 20) break;
if(i % 4) { if(i % 4) {
column_number++; column_number++;
canvas_draw_box(canvas, x + 2 * i, y - column_number, 2, 4 + column_number); canvas_draw_box(canvas, x + 2 * i, y - column_number, 2, column_number);
}
}
}
}
void subghz_frequency_analyzer_draw_log_rssi(Canvas* canvas, uint8_t rssi, uint8_t x, uint8_t y) {
uint8_t column_height = 6;
if(rssi) {
//rssi = rssi
if(rssi > 54) rssi = 54;
for(uint8_t i = 1; i < rssi; i++) {
if(i % 5) {
canvas_draw_box(canvas, x + i, y - column_height, 1, column_height);
} }
} }
} }
@ -86,9 +97,9 @@ static void subghz_frequency_analyzer_log_frequency_draw(
const size_t items_count = SubGhzFrequencyAnalyzerLogItemArray_size(model->log_frequency); const size_t items_count = SubGhzFrequencyAnalyzerLogItemArray_size(model->log_frequency);
if(items_count == 0) { if(items_count == 0) {
canvas_draw_rframe(canvas, offset_x + 27u, offset_y - 3u, 73u, 16u, 5u); canvas_draw_rframe(canvas, offset_x + 27, offset_y - 3, 73, 16, 5);
canvas_draw_str_aligned( canvas_draw_str_aligned(
canvas, offset_x + 64u, offset_y + 8u, AlignCenter, AlignBottom, "No records"); canvas, offset_x + 64, offset_y + 8, AlignCenter, AlignBottom, "No records");
return; return;
} else if(items_count > 3) { } else if(items_count > 3) {
elements_scrollbar_pos( elements_scrollbar_pos(
@ -117,7 +128,7 @@ static void subghz_frequency_analyzer_log_frequency_draw(
canvas_draw_str(canvas, offset_x + 48, offset_y + i * 10, buffer); canvas_draw_str(canvas, offset_x + 48, offset_y + i * 10, buffer);
// Max RSSI // Max RSSI
subghz_frequency_analyzer_draw_rssi( subghz_frequency_analyzer_draw_log_rssi(
canvas, (*log_frequency_item)->rssi_max, offset_x + 69, (offset_y + i * 10)); canvas, (*log_frequency_item)->rssi_max, offset_x + 69, (offset_y + i * 10));
} }
@ -167,25 +178,20 @@ void subghz_frequency_analyzer_draw(Canvas* canvas, SubGhzFrequencyAnalyzerModel
} else { } else {
canvas_draw_str(canvas, 20, 8, "Frequency Analyzer"); canvas_draw_str(canvas, 20, 8, "Frequency Analyzer");
canvas_draw_str(canvas, 0, 64, "RSSI"); canvas_draw_str(canvas, 0, 64, "RSSI");
subghz_frequency_analyzer_draw_rssi(canvas, model->rssi, 20u, 64u); subghz_frequency_analyzer_draw_rssi(canvas, model->rssi, 20, 64);
subghz_frequency_analyzer_history_frequency_draw(canvas, model); subghz_frequency_analyzer_history_frequency_draw(canvas, model);
} }
// Frequency // Frequency
canvas_set_font(canvas, FontBigNumbers); canvas_set_font(canvas, FontBigNumbers);
snprintf( SNPRINTF_FREQUENCY(buffer, model->frequency);
buffer,
sizeof(buffer),
"%03ld.%03ld",
model->frequency / 1000000 % 1000,
model->frequency / 1000 % 1000);
if(model->signal) { if(model->signal) {
canvas_draw_box(canvas, 4, 12, 121, 22); canvas_draw_box(canvas, 4, 11, 121, 22);
canvas_set_color(canvas, ColorWhite); canvas_set_color(canvas, ColorWhite);
} }
canvas_draw_str(canvas, 8, 30, buffer); canvas_draw_str(canvas, 8, 29, buffer);
canvas_draw_icon(canvas, 96, 19, &I_MHz_25x11); canvas_draw_icon(canvas, 96, 18, &I_MHz_25x11);
} }
static void subghz_frequency_analyzer_log_frequency_sort(SubGhzFrequencyAnalyzerModel* model) { static void subghz_frequency_analyzer_log_frequency_sort(SubGhzFrequencyAnalyzerModel* model) {
@ -292,7 +298,7 @@ static bool subghz_frequency_analyzer_log_frequency_insert(SubGhzFrequencyAnalyz
return false; return false;
} }
(*item)->frequency = model->frequency; (*item)->frequency = model->frequency;
(*item)->count = 1u; (*item)->count = 1;
(*item)->rssi_max = model->rssi; (*item)->rssi_max = model->rssi;
(*item)->seq = items_count; (*item)->seq = items_count;
return true; return true;
@ -394,9 +400,9 @@ void subghz_frequency_analyzer_enter(void* context) {
model->frequency = 0; model->frequency = 0;
model->fragment_bottom_type = SubGhzFrequencyAnalyzerFragmentBottomTypeMain; model->fragment_bottom_type = SubGhzFrequencyAnalyzerFragmentBottomTypeMain;
model->log_frequency_order_by = SubGhzFrequencyAnalyzerLogOrderBySeqDesc; model->log_frequency_order_by = SubGhzFrequencyAnalyzerLogOrderBySeqDesc;
model->log_frequency_scroll_offset = 0u; model->log_frequency_scroll_offset = 0;
model->history_frequency[0] = model->history_frequency[1] = model->history_frequency[0] = model->history_frequency[1] =
model->history_frequency[2] = 0u; model->history_frequency[2] = 0;
SubGhzFrequencyAnalyzerLogItemArray_init(model->log_frequency); SubGhzFrequencyAnalyzerLogItemArray_init(model->log_frequency);
}, },
true); true);
@ -416,13 +422,13 @@ void subghz_frequency_analyzer_exit(void* context) {
instance->view, instance->view,
SubGhzFrequencyAnalyzerModel * model, SubGhzFrequencyAnalyzerModel * model,
{ {
model->rssi = 0u; model->rssi = 0;
model->frequency = 0; model->frequency = 0;
model->fragment_bottom_type = SubGhzFrequencyAnalyzerFragmentBottomTypeMain; model->fragment_bottom_type = SubGhzFrequencyAnalyzerFragmentBottomTypeMain;
model->log_frequency_order_by = SubGhzFrequencyAnalyzerLogOrderBySeqDesc; model->log_frequency_order_by = SubGhzFrequencyAnalyzerLogOrderBySeqDesc;
model->log_frequency_scroll_offset = 0u; model->log_frequency_scroll_offset = 0;
model->history_frequency[0] = model->history_frequency[1] = model->history_frequency[0] = model->history_frequency[1] =
model->history_frequency[2] = 0u; model->history_frequency[2] = 0;
SubGhzFrequencyAnalyzerLogItemArray_clear(model->log_frequency); SubGhzFrequencyAnalyzerLogItemArray_clear(model->log_frequency);
}, },
true); true);