From e1945b2fbba2657f090cf36daf91d6da2278403a Mon Sep 17 00:00:00 2001 From: erikkaashoek Date: Sat, 20 Feb 2021 08:28:48 +0100 Subject: [PATCH] Added IGNORE_RSSI --- sa_core.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sa_core.c b/sa_core.c index db0324e..1431edf 100644 --- a/sa_core.c +++ b/sa_core.c @@ -2641,8 +2641,8 @@ modulation_again: old_CFGR = orig_CFGR; RCC->CFGR = orig_CFGR; } - - pureRSSI_t rssi = RSSI + correct_RSSI + correct_RSSI_freq; // add correction +#define IGNORE_RSSI 30000 + pureRSSI_t rssi = (RSSI>0 ? RSSI + correct_RSSI + correct_RSSI_freq : IGNORE_RSSI); // add correction if (false) { abort: rssi = 0; @@ -2717,8 +2717,11 @@ sweep_again: // stay in sweep loop when output mo // ------------------------- start sweep loop ----------------------------------- for (int i = 0; i < sweep_points; i++) { // --------------------- measure ------------------------- - - RSSI = PURE_TO_float(perform(break_on_operation, i, frequencies[i], setting.tracking)); // Measure RSSI for one of the frequencies + pureRSSI_t rssi = perform(break_on_operation, i, frequencies[i], setting.tracking); // Measure RSSI for one of the frequencies + if (rssi == IGNORE_RSSI) + RSSI = -174.0; + else + RSSI = PURE_TO_float(rssi); // if break back to top level to handle ui operation if (refreshing) scandirty = false; @@ -2833,7 +2836,7 @@ sweep_again: // stay in sweep loop when output mo } } - if (temp_min_level > actual_t[i]) // Remember minimum + if ( actual_t[i] > -174.0 && temp_min_level > actual_t[i]) // Remember minimum temp_min_level = actual_t[i]; // --------------------------- find peak and add to peak table if found ------------------------