KB8PMY
/
tinySA
mirror of https://github.com/erikkaashoek/tinySA.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Mirror masking added

Browse Source
pull/4/head
erikkaashoek 5 years ago
parent e5d27aa3fc
commit 3e428150de
3 changed files with 67 additions and 34 deletions
Show Stats Download Patch File Download Diff File

4
nanovna.h
Unescape View File

@ -202,6 +202,7 @@ void set_sweep_time_us(uint32_t);
#ifdef __SPUR__ #ifdef __SPUR__
//extern int setting.spur; //extern int setting.spur;
void set_spur(int v); void set_spur(int v);
void toggle_mirror_masking(void);
#endif #endif
void set_average(int); void set_average(int);
int GetAverage(void); int GetAverage(void);
@ -652,7 +653,8 @@ typedef struct setting
int freq_mode; int freq_mode;
int measurement; int measurement;
int refer; int refer;
int spur; int spur_removal;
int mirror_masking;
trace_t _trace[TRACES_MAX]; trace_t _trace[TRACES_MAX];
marker_t _markers[MARKERS_MAX]; marker_t _markers[MARKERS_MAX];
int8_t _active_marker; int8_t _active_marker;

74
sa_core.c
Unescape View File

@ -111,7 +111,8 @@ void reset_settings(int m)
// setting.refer = -1; // do not reset reffer when switching modes // setting.refer = -1; // do not reset reffer when switching modes
setting.mute = true; setting.mute = true;
#ifdef __SPUR__ #ifdef __SPUR__
setting.spur = 0; setting.spur_removal = 0;
setting.mirror_masking = 0;
#endif #endif
switch(m) { switch(m) {
case M_LOW: case M_LOW:
@ -190,10 +191,10 @@ uint32_t calc_min_sweep_time_us(void) // Estimate minimum sweep time in
#endif #endif
if (FREQ_IS_CW()) { if (FREQ_IS_CW()) {
bare_sweep_time = MINIMUM_SWEEP_TIME; // minimum sweep time in fast CW mode bare_sweep_time = MINIMUM_SWEEP_TIME; // minimum sweep time in fast CW mode
if (setting.repeat != 1 || setting.sweep_time_us >= 100*ONE_MS_TIME || setting.spur != 0) // if no fast CW sweep possible if (setting.repeat != 1 || setting.sweep_time_us >= 100*ONE_MS_TIME || setting.spur_removal != 0) // if no fast CW sweep possible
bare_sweep_time = 15000; // minimum CW sweep time when not in fast CW mode bare_sweep_time = 15000; // minimum CW sweep time when not in fast CW mode
} }
t = vbwSteps * (setting.spur ? 2 : 1) * bare_sweep_time ; // factor in vbwSteps and spur impact t = vbwSteps * (setting.spur_removal ? 2 : 1) * bare_sweep_time ; // factor in vbwSteps and spur impact
t += (setting.repeat - 1)* REPEAT_TIME * (sweep_points); // Add time required for repeats t += (setting.repeat - 1)* REPEAT_TIME * (sweep_points); // Add time required for repeats
} }
return t; return t;
@ -280,6 +281,12 @@ void toggle_tracking_output(void)
dirty = true; dirty = true;
} }
void toggle_mirror_masking(void)
{
setting.mirror_masking = !setting.mirror_masking;
dirty = true;
}
void toggle_mute(void) void toggle_mute(void)
{ {
setting.mute = !setting.mute; setting.mute = !setting.mute;
@ -534,8 +541,8 @@ void set_spur(int v)
{ {
if (setting.mode!=M_LOW) if (setting.mode!=M_LOW)
return; return;
setting.spur = v; setting.spur_removal = v;
// if (setting.spur && actual_rbw > 360) // moved to update_rbw // if (setting.spur_removal && actual_rbw > 360) // moved to update_rbw
// set_RBW(300); // set_RBW(300);
dirty = true; dirty = true;
} }
@ -1220,7 +1227,7 @@ void update_rbw(void) // calculate the actual_rbw and the vbwSteps (#
if (actual_rbw_x10 > 6000) if (actual_rbw_x10 > 6000)
actual_rbw_x10 = 6000; actual_rbw_x10 = 6000;
if (setting.spur && actual_rbw_x10 > 3000) if (setting.spur_removal && actual_rbw_x10 > 3000)
actual_rbw_x10 = 2500; // if spur suppression reduce max rbw to fit within BPF actual_rbw_x10 = 2500; // if spur suppression reduce max rbw to fit within BPF
#ifdef __SI4432__ #ifdef __SI4432__
@ -1444,7 +1451,7 @@ pureRSSI_t perform(bool break_on_operation, int i, uint32_t f, int tracking)
scandirty = true; // This is the first pass with new settings scandirty = true; // This is the first pass with new settings
dirty = false; dirty = false;
sweep_elapsed = chVTGetSystemTimeX(); // for measuring accumulated time sweep_elapsed = chVTGetSystemTimeX(); // for measuring accumulated time
if (setting.spur == -1) setting.spur = 1; // ensure spur processing starts in right phase if (setting.spur_removal == -1) setting.spur_removal = 1; // ensure spur processing starts in right phase
// Set for actual time pre calculated value (update after sweep) // Set for actual time pre calculated value (update after sweep)
setting.actual_sweep_time_us = calc_min_sweep_time_us(); setting.actual_sweep_time_us = calc_min_sweep_time_us();
// Change actual sweep time as user input if it greater minimum // Change actual sweep time as user input if it greater minimum
@ -1602,7 +1609,7 @@ modulation_again:
local_IF = 0; local_IF = 0;
else { else {
if (setting.auto_IF) if (setting.auto_IF)
local_IF = setting.spur ? 433900000 : 433800000; local_IF = setting.spur_removal ? 433900000 : 433800000;
else else
local_IF = setting.frequency_IF; local_IF = setting.frequency_IF;
} }
@ -1614,17 +1621,17 @@ modulation_again:
if (setting.mode == M_LOW && !in_selftest && avoid_spur(f)) { // check is alternate IF is needed to avoid spur. if (setting.mode == M_LOW && !in_selftest && avoid_spur(f)) { // check is alternate IF is needed to avoid spur.
local_IF = spur_alternate_IF; local_IF = spur_alternate_IF;
#ifdef __SPUR__ #ifdef __SPUR__
} else if (setting.mode== M_LOW && setting.spur){ // If in low input mode and spur reduction is on } else if (setting.mode== M_LOW && setting.spur_removal){ // If in low input mode and spur reduction is on
if (S_IS_AUTO(setting.below_IF) && lf < 150000000) // if below 150MHz and auto_below_IF if (S_IS_AUTO(setting.below_IF) && lf < 150000000) // if below 150MHz and auto_below_IF
{ // else low/above IF { // else low/above IF
if (setting.spur == 1) if (setting.spur_removal == 1)
setting.below_IF = S_AUTO_ON; // use below IF in first pass setting.below_IF = S_AUTO_ON; // use below IF in first pass
else else
setting.below_IF = S_AUTO_OFF; // and above IF in second pass setting.below_IF = S_AUTO_OFF; // and above IF in second pass
} }
else { else {
int32_t spur_offset = actual_rbw_x10 * 100; // Can not use below IF so calculate IF shift that hopefully will kill the spur. int32_t spur_offset = actual_rbw_x10 * 100; // Can not use below IF so calculate IF shift that hopefully will kill the spur.
if (setting.spur == -1) // If second spur pass if (setting.spur_removal == -1) // If second spur pass
spur_offset = - spur_offset; // IF shift in the other direction spur_offset = - spur_offset; // IF shift in the other direction
local_IF = local_IF + spur_offset; // apply IF spur shift local_IF = local_IF + spur_offset; // apply IF spur shift
} }
@ -1640,11 +1647,11 @@ modulation_again:
#endif #endif
#ifdef __ULTRA__ #ifdef __ULTRA__
} else if (setting.mode == M_ULTRA) { // No above/below IF mode in Ultra } else if (setting.mode == M_ULTRA) { // No above/below IF mode in Ultra
local_IF = setting.frequency_IF + (int)(actual_rbw < 350.0 ? setting.spur*300000 : 0 ); local_IF = setting.frequency_IF + (int)(actual_rbw < 350.0 ? setting.spur_removal*300000 : 0 );
#ifdef __SI4432__ #ifdef __SI4432__
set_freq (SI4432_RX , local_IF); set_freq (SI4432_RX , local_IF);
#endif #endif
// local_IF = setting.frequency_IF + (int)(actual_rbw < 300.0?setting.spur * 1000 * actual_rbw:0); // local_IF = setting.frequency_IF + (int)(actual_rbw < 300.0?setting.spur_removal * 1000 * actual_rbw:0);
#endif #endif
} else // This must be high mode } else // This must be high mode
local_IF= 0; local_IF= 0;
@ -1653,7 +1660,7 @@ modulation_again:
// if (lf > 3406000000 ) // if (lf > 3406000000 )
// setFreq (1, local_IF/5 + lf/5); // setFreq (1, local_IF/5 + lf/5);
// else // else
if (setting.spur != 1) { // Left of tables if (setting.spur_removal != 1) { // Left of tables
if (lf > 3250000000 ) if (lf > 3250000000 )
set_freq (SI4432_LO , lf/5 - local_IF/5); set_freq (SI4432_LO , lf/5 - local_IF/5);
if (lf > 1250000000 ) if (lf > 1250000000 )
@ -1714,7 +1721,7 @@ modulation_again:
#ifdef __SI4432__ #ifdef __SI4432__
#ifdef __FAST_SWEEP__ #ifdef __FAST_SWEEP__
if (i == 0 && setting.frequency_step == 0 && setting.trigger == T_AUTO && setting.spur == 0 && SI4432_step_delay == 0 && setting.repeat == 1 && setting.sweep_time_us < 100*ONE_MS_TIME) { if (i == 0 && setting.frequency_step == 0 && setting.trigger == T_AUTO && setting.spur_removal == 0 && SI4432_step_delay == 0 && setting.repeat == 1 && setting.sweep_time_us < 100*ONE_MS_TIME) {
// if ultra fast scanning is needed prefill the SI4432 RSSI read buffer // if ultra fast scanning is needed prefill the SI4432 RSSI read buffer
SI4432_Fill(MODE_SELECT(setting.mode), 0); SI4432_Fill(MODE_SELECT(setting.mode), 0);
} }
@ -1768,7 +1775,7 @@ modulation_again:
}while(1); }while(1);
#ifdef __FAST_SWEEP__ #ifdef __FAST_SWEEP__
#ifdef __SI4432__ #ifdef __SI4432__
if (setting.spur == 0 && SI4432_step_delay == 0 && setting.repeat == 1 && setting.sweep_time_us < 100*ONE_MS_TIME) { if (setting.spur_removal == 0 && SI4432_step_delay == 0 && setting.repeat == 1 && setting.sweep_time_us < 100*ONE_MS_TIME) {
SI4432_Fill(MODE_SELECT(setting.mode), 1); // fast mode possible to pre-fill RSSI buffer SI4432_Fill(MODE_SELECT(setting.mode), 1); // fast mode possible to pre-fill RSSI buffer
} }
#endif #endif
@ -1785,13 +1792,13 @@ modulation_again:
} }
#ifdef __SPUR__ #ifdef __SPUR__
static pureRSSI_t spur_RSSI = -1; // Initialization only to avoid warning. static pureRSSI_t spur_RSSI = -1; // Initialization only to avoid warning.
if (setting.spur == 1) { // If first spur pass if (setting.spur_removal == 1) { // If first spur pass
spur_RSSI = pureRSSI; // remember measure RSSI spur_RSSI = pureRSSI; // remember measure RSSI
setting.spur = -1; setting.spur_removal = -1;
goto again; // Skip all other processing goto again; // Skip all other processing
} else if (setting.spur == -1) { // If second spur pass } else if (setting.spur_removal == -1) { // If second spur pass
pureRSSI = ( pureRSSI < spur_RSSI ? pureRSSI : spur_RSSI); // Take minimum of two pureRSSI = ( pureRSSI < spur_RSSI ? pureRSSI : spur_RSSI); // Take minimum of two
setting.spur = 1; // and prepare for next call of perform. setting.spur_removal = 1; // and prepare for next call of perform.
} }
#endif #endif
@ -2069,6 +2076,21 @@ sweep_again: // stay in sweep loop when output mo
if (MODE_OUTPUT(setting.mode) ) // Sweep time is calculated, we can sweep again in output mode if (MODE_OUTPUT(setting.mode) ) // Sweep time is calculated, we can sweep again in output mode
goto again; // Keep repeating sweep loop till user aborts by input goto again; // Keep repeating sweep loop till user aborts by input
#define __MIRROR_MASKING__
#ifdef __MIRROR_MASKING__
if (setting.mode == M_HIGH && setting.mirror_masking) {
int mirror_offset = 2 * 937000 / setting.frequency_step;
if (mirror_offset > 3) {
for (int i = 1; i < sweep_points - mirror_offset; i++) {
if (actual_t[i] > -80 && actual_t[i+mirror_offset] < actual_t[i] - 25) {
actual_t[i+mirror_offset] = actual_t[i+mirror_offset-1];
actual_t[i+mirror_offset+1] = actual_t[i+mirror_offset-1];
}
}
}
}
#endif
// -------------------------- auto attenuate ---------------------------------- // -------------------------- auto attenuate ----------------------------------
#define AUTO_TARGET_LEVEL -25 #define AUTO_TARGET_LEVEL -25
@ -2607,7 +2629,7 @@ void draw_cal_status(void)
} }
// Spur // Spur
#ifdef __SPUR__ #ifdef __SPUR__
if (setting.spur) { if (setting.spur_removal) {
ili9341_set_foreground(BRIGHT_COLOR_GREEN); ili9341_set_foreground(BRIGHT_COLOR_GREEN);
y += YSTEP + YSTEP/2 ; y += YSTEP + YSTEP/2 ;
ili9341_drawstring("Spur:", x, y); ili9341_drawstring("Spur:", x, y);
@ -3084,7 +3106,7 @@ common_silent:
setting.step_delay_mode = SD_PRECISE; setting.step_delay_mode = SD_PRECISE;
// set_step_delay(1); // Precise scanning speed // set_step_delay(1); // Precise scanning speed
#ifdef __SPUR__ #ifdef __SPUR__
setting.spur = 1; setting.spur_removal = 1;
#endif #endif
common: common:
@ -3101,7 +3123,7 @@ common_silent:
set_refer_output(0); set_refer_output(0);
// set_step_delay(1); // Do not set !!!!! // set_step_delay(1); // Do not set !!!!!
#ifdef __SPUR__ #ifdef __SPUR__
setting.spur = 1; setting.spur_removal = 1;
#endif #endif
goto common; goto common;
case TPH_30MHZ: case TPH_30MHZ:
@ -3270,7 +3292,7 @@ void self_test(int test)
j = setting.test_argument; j = setting.test_argument;
// do_again: // do_again:
test_prepare(i); test_prepare(i);
setting.spur = 0; setting.spur_removal = 0;
#if 1 // Disable for offset baseline scanning #if 1 // Disable for offset baseline scanning
setting.step_delay_mode = SD_NORMAL; setting.step_delay_mode = SD_NORMAL;
setting.repeat = 1; setting.repeat = 1;
@ -3308,7 +3330,7 @@ void self_test(int test)
#if 1 // Enable for step delay tuning #if 1 // Enable for step delay tuning
while (setting.step_delay > 10 && test_value != 0 && test_value > saved_peakLevel - 0.5) { while (setting.step_delay > 10 && test_value != 0 && test_value > saved_peakLevel - 0.5) {
test_prepare(i); test_prepare(i);
setting.spur = 0; setting.spur_removal = 0;
setting.step_delay_mode = SD_NORMAL; setting.step_delay_mode = SD_NORMAL;
setting.step_delay = setting.step_delay * 4 / 5; setting.step_delay = setting.step_delay * 4 / 5;
if (setting.rbw_x10 < 1000) if (setting.rbw_x10 < 1000)
@ -3335,7 +3357,7 @@ void self_test(int test)
test_prepare(i); test_prepare(i);
setting.step_delay_mode = SD_FAST; setting.step_delay_mode = SD_FAST;
setting.offset_delay /= 2; setting.offset_delay /= 2;
setting.spur = 0; setting.spur_removal = 0;
if (setting.rbw_x10 < 1000) if (setting.rbw_x10 < 1000)
set_sweep_frequency(ST_SPAN, (uint32_t)(setting.rbw_x10 * 5000)); // 50 times RBW set_sweep_frequency(ST_SPAN, (uint32_t)(setting.rbw_x10 * 5000)); // 50 times RBW
else else

23
ui_sa.c
Unescape View File

@ -706,14 +706,23 @@ static UI_FUNCTION_ADV_CALLBACK(menu_spur_acb)
(void)data; (void)data;
(void)item; (void)item;
if (b){ if (b){
b->icon = setting.spur == 0 ? BUTTON_ICON_NOCHECK : BUTTON_ICON_CHECK; if (setting.mode == M_LOW) {
b->param_1.text = "SPUR\nREMOVAL";
b->icon = setting.spur_removal == 0 ? BUTTON_ICON_NOCHECK : BUTTON_ICON_CHECK;
} else {
b->param_1.text = "MIRROR\nMASKING";
b->icon = setting.mirror_masking == 0 ? BUTTON_ICON_NOCHECK : BUTTON_ICON_CHECK;
}
return; return;
} }
if (setting.spur) if (setting.mode == M_LOW) {
set_spur(0); if (setting.spur_removal)
else set_spur(0);
set_spur(1); // must be 0 or 1 !!!! else
// menu_move_back(); set_spur(1); // must be 0 or 1 !!!!
} else
toggle_mirror_masking();
// menu_move_back();
ui_mode_normal(); ui_mode_normal();
} }
#endif #endif
@ -1664,7 +1673,7 @@ static const menuitem_t menu_stimulus[] = {
{ MT_KEYPAD, KM_CW, "ZERO SPAN", NULL}, { MT_KEYPAD, KM_CW, "ZERO SPAN", NULL},
{ MT_SUBMENU,0, "RBW", menu_rbw}, { MT_SUBMENU,0, "RBW", menu_rbw},
#ifdef __SPUR__ #ifdef __SPUR__
{ MT_ADV_CALLBACK | MT_LOW,0, "SPUR\nREMOVAL", menu_spur_acb}, { MT_ADV_CALLBACK,0, "%s", menu_spur_acb},
#endif #endif
{ MT_CANCEL, 0, S_LARROW" BACK", NULL }, { MT_CANCEL, 0, S_LARROW" BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.