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

Auto reflevel and auto attenuation added

Browse Source
tinySA
erikkaashoek 6 years ago
parent 1f86864f9a
commit e3d96b9bed
3 changed files with 89 additions and 32 deletions
Show Stats Download Patch File Download Diff File

2
nanovna.h
Unescape View File

@ -637,7 +637,7 @@ int get_waterfall(void);
void toggle_tracking(void); void toggle_tracking(void);
void calibrate(void); void calibrate(void);
void reset_calibration(void); void reset_calibration(void);
void SetRefpos(int); void SetReflevel(int);
void SetScale(int); void SetScale(int);
void SetRBW(int); void SetRBW(int);
void SetRX(int); void SetRX(int);

69
sa_core.c
Unescape View File

@ -17,6 +17,9 @@ int setting_subtract_stored = 0;
int setting_drive; // 0-7 , 7=+20dBm, 3dB steps int setting_drive; // 0-7 , 7=+20dBm, 3dB steps
int setting_agc = true; int setting_agc = true;
int setting_lna = false; int setting_lna = false;
int setting_auto_reflevel;
int setting_reflevel;
int setting_scale;
int setting_tracking = false; int setting_tracking = false;
int setting_modulation = MO_NONE; int setting_modulation = MO_NONE;
int setting_step_delay = 0; int setting_step_delay = 0;
@ -42,6 +45,8 @@ int in_selftest = false;
void reset_settings(int m) void reset_settings(int m)
{ {
setting_mode = m; setting_mode = m;
SetScale(10);
SetReflevel(-10);
setting_attenuate = 0; setting_attenuate = 0;
setting_rbw = 0; setting_rbw = 0;
setting_average = 0; setting_average = 0;
@ -56,8 +61,9 @@ void reset_settings(int m)
setting_modulation = MO_NONE; setting_modulation = MO_NONE;
setting_step_delay = 0; setting_step_delay = 0;
setting_vbw = 0; setting_vbw = 0;
setting_auto_reflevel = true; // Must be after SetReflevel
setting_decay=20; setting_decay=20;
setting_noise=20; setting_noise=5;
trace[TRACE_STORED].enabled = false; trace[TRACE_STORED].enabled = false;
trace[TRACE_TEMP].enabled = false; trace[TRACE_TEMP].enabled = false;
@ -69,7 +75,6 @@ void reset_settings(int m)
maxFreq = 520000000; maxFreq = 520000000;
set_sweep_frequency(ST_START, (int32_t) 0); set_sweep_frequency(ST_START, (int32_t) 0);
set_sweep_frequency(ST_STOP, (int32_t) 350000000); set_sweep_frequency(ST_STOP, (int32_t) 350000000);
SetRefpos(-10);
setting_attenuate = 30; setting_attenuate = 30;
break; break;
case M_GENLOW: case M_GENLOW:
@ -84,7 +89,6 @@ void reset_settings(int m)
maxFreq = 960000000; maxFreq = 960000000;
set_sweep_frequency(ST_START, (int32_t) minFreq); set_sweep_frequency(ST_START, (int32_t) minFreq);
set_sweep_frequency(ST_STOP, (int32_t) maxFreq); set_sweep_frequency(ST_STOP, (int32_t) maxFreq);
SetRefpos(-30);
break; break;
case M_GENHIGH: case M_GENHIGH:
setting_drive=8; setting_drive=8;
@ -94,7 +98,6 @@ void reset_settings(int m)
set_sweep_frequency(ST_SPAN, 0); set_sweep_frequency(ST_SPAN, 0);
break; break;
} }
SetScale(10);
dirty = true; dirty = true;
} }
@ -119,7 +122,7 @@ void set_decay(int d)
void set_noise(int d) void set_noise(int d)
{ {
if (d < 5 || d > 200) if (d < 2 || d > 50)
return; return;
setting_noise = d; setting_noise = d;
dirty = true; dirty = true;
@ -173,7 +176,11 @@ void set_auto_attenuation(void)
{ {
setting_auto_attenuation = true; setting_auto_attenuation = true;
setting_attenuate = 30; setting_attenuate = 30;
}
void set_auto_reflevel(void)
{
setting_auto_reflevel = true;
} }
void SetAttenuation(int a) void SetAttenuation(int a)
@ -211,7 +218,6 @@ void SetAttenuation(int a)
a=31; a=31;
// if (setting_attenuate == a) // if (setting_attenuate == a)
// return; // return;
setting_auto_attenuation = false;
setting_attenuate = a; setting_attenuate = a;
dirty = true; dirty = true;
} }
@ -371,20 +377,29 @@ int GetAGC(void)
return(setting_agc); return(setting_agc);
} }
void SetRefpos(int level) void SetReflevel(int level)
{ {
setting_reflevel = (level / setting_scale) * setting_scale;
set_trace_refpos(0, NGRIDY - level / get_trace_scale(0)); set_trace_refpos(0, NGRIDY - level / get_trace_scale(0));
set_trace_refpos(1, NGRIDY - level / get_trace_scale(0)); set_trace_refpos(1, NGRIDY - level / get_trace_scale(0));
set_trace_refpos(2, NGRIDY - level / get_trace_scale(0)); set_trace_refpos(2, NGRIDY - level / get_trace_scale(0));
dirty = true; dirty = true;
} }
//int GetRefpos(void) {
// return (NGRIDY - get_trace_refpos(2)) * get_trace_scale(2);
//}
void SetScale(int s) { void SetScale(int s) {
setting_scale = s;
set_trace_scale(0, s); set_trace_scale(0, s);
set_trace_scale(1, s); set_trace_scale(1, s);
set_trace_scale(2, s); set_trace_scale(2, s);
} }
//int GetScale(void) {
// return get_trace_refpos(2);
//}
void SetMode(int m) void SetMode(int m)
{ {
if (setting_mode == m) if (setting_mode == m)
@ -878,9 +893,10 @@ static bool sweep(bool break_on_operation)
temppeakLevel = actual_t[i]; temppeakLevel = actual_t[i];
} }
} }
#endif
if (temp_min_level > actual_t[i]) if (temp_min_level > actual_t[i])
temp_min_level = actual_t[i]; temp_min_level = actual_t[i];
#endif
} }
// if (setting_spur == 1) { // if (setting_spur == 1) {
// setting_spur = -1; // setting_spur = -1;
@ -892,13 +908,28 @@ static bool sweep(bool break_on_operation)
scandirty = false; scandirty = false;
draw_cal_status(); draw_cal_status();
} }
if (setting_mode == M_LOW && setting_auto_attenuation ) { if (setting_mode == M_LOW && setting_auto_attenuation && max_index[0] > 0) {
if (actual_t[max_index[0]] - setting_attenuate < -30 && setting_attenuate >= 10) { if (actual_t[max_index[0]] - setting_attenuate < -30 && setting_attenuate >= 10) {
setting_attenuate -= 10; setting_attenuate -= setting_scale;
redraw_request |= REDRAW_CAL_STATUS; redraw_request |= REDRAW_CAL_STATUS;
dirty = true; // Must be above if(scandirty!!!!!) dirty = true; // Must be above if(scandirty!!!!!)
} else if (actual_t[max_index[0]] - setting_attenuate > -20 && setting_attenuate <= 20) { } else if (actual_t[max_index[0]] - setting_attenuate > -20 && setting_attenuate <= 20) {
setting_attenuate += 10; setting_attenuate += setting_scale;
redraw_request |= REDRAW_CAL_STATUS;
dirty = true; // Must be above if(scandirty!!!!!)
}
}
if (MODE_INPUT(setting_mode) && setting_auto_reflevel && max_index[0] > 0) {
if (actual_t[max_index[0]] > setting_reflevel - setting_scale/2) {
SetReflevel(setting_reflevel + setting_scale);
redraw_request |= REDRAW_CAL_STATUS;
dirty = true; // Must be above if(scandirty!!!!!)
} else if (temp_min_level < setting_reflevel - 9 * setting_scale && actual_t[max_index[0]] < setting_reflevel - setting_scale * 3 / 2) {
SetReflevel(setting_reflevel - setting_scale);
redraw_request |= REDRAW_CAL_STATUS;
dirty = true; // Must be above if(scandirty!!!!!)
} else if (temp_min_level > setting_reflevel - 9 * setting_scale + setting_scale * 3 / 2) {
SetReflevel(setting_reflevel + setting_scale);
redraw_request |= REDRAW_CAL_STATUS; redraw_request |= REDRAW_CAL_STATUS;
dirty = true; // Must be above if(scandirty!!!!!) dirty = true; // Must be above if(scandirty!!!!!)
} }
@ -951,15 +982,15 @@ static bool sweep(bool break_on_operation)
#endif #endif
min_level = temp_min_level; min_level = temp_min_level;
#if 0 // Auto ref level setting #if 0 // Auto ref level setting
int scale = get_trace_scale(2); int scale = setting_scale;
int rp = (NGRIDY - get_trace_refpos(2)) * scale; int rp = GetRepos();
if (scale > 0 && peakLevel > rp && peakLevel - min_level < 8 * scale ) { if (scale > 0 && peakLevel > rp && peakLevel - min_level < 8 * scale ) {
SetRefpos((((int)(peakLevel/scale)) + 1) * scale); SetReflevel((((int)(peakLevel/scale)) + 1) * scale);
} }
if (scale > 0 && min_level < rp - 9*scale && peakLevel - min_level < 8 * scale ) { if (scale > 0 && min_level < rp - 9*scale && peakLevel - min_level < 8 * scale ) {
int new_rp = (((int)((min_level + 9*scale)/scale)) - 1) * scale; int new_rp = (((int)((min_level + 9*scale)/scale)) - 1) * scale;
if (new_rp < rp) if (new_rp < rp)
SetRefpos(new_rp); SetReflevel(new_rp);
} }
#endif #endif
@ -994,7 +1025,7 @@ void draw_cal_status(void)
ili9341_set_background(DEFAULT_BG_COLOR); ili9341_set_background(DEFAULT_BG_COLOR);
int yMax = (NGRIDY - get_trace_refpos(0)) * get_trace_scale(0); int yMax = setting_reflevel;
plot_printf(buf, BLEN, "%ddB", yMax); plot_printf(buf, BLEN, "%ddB", yMax);
buf[5]=0; buf[5]=0;
if (level_is_calibrated()) if (level_is_calibrated())
@ -1005,7 +1036,7 @@ void draw_cal_status(void)
ili9341_drawstring(buf, x, y); ili9341_drawstring(buf, x, y);
y += YSTEP*2; y += YSTEP*2;
plot_printf(buf, BLEN, "%ddB/",(int)get_trace_scale(0)); plot_printf(buf, BLEN, "%ddB/",(int)setting_scale);
ili9341_drawstring(buf, x, y); ili9341_drawstring(buf, x, y);
if (setting_attenuate) { if (setting_attenuate) {
@ -1101,7 +1132,7 @@ void draw_cal_status(void)
y = HEIGHT-7 + OFFSETY; y = HEIGHT-7 + OFFSETY;
plot_printf(buf, BLEN, "%ddB", (int)(yMax - get_trace_scale(0) * NGRIDY)); plot_printf(buf, BLEN, "%ddB", (int)(yMax - setting_scale * NGRIDY));
buf[5]=0; buf[5]=0;
if (level_is_calibrated()) if (level_is_calibrated())
color = DEFAULT_FG_COLOR; color = DEFAULT_FG_COLOR;
@ -1407,7 +1438,7 @@ common_silent:
goto common; goto common;
} }
trace[TRACE_STORED].enabled = true; trace[TRACE_STORED].enabled = true;
SetRefpos(test_case[i].pass+10); SetReflevel(test_case[i].pass+10);
set_sweep_frequency(ST_CENTER, (int32_t)(test_case[i].center * 1000000)); set_sweep_frequency(ST_CENTER, (int32_t)(test_case[i].center * 1000000));
set_sweep_frequency(ST_SPAN, (int32_t)(test_case[i].span * 1000000)); set_sweep_frequency(ST_SPAN, (int32_t)(test_case[i].span * 1000000));
draw_cal_status(); draw_cal_status();

50
ui_sa.c
Unescape View File

@ -14,6 +14,8 @@ int get_refer_output(void);
void SetAttenuation(int); void SetAttenuation(int);
int GetAttenuation(void); int GetAttenuation(void);
void set_auto_attenuation(void); void set_auto_attenuation(void);
void set_auto_reflevel(void);
void SetPowerLevel(int); void SetPowerLevel(int);
void SetGenerate(int); void SetGenerate(int);
void SetRBW(int); void SetRBW(int);
@ -32,7 +34,7 @@ void SetSubtractStorage(void);
void toggle_waterfall(void); void toggle_waterfall(void);
void SetMode(int); void SetMode(int);
int GetMode(void); int GetMode(void);
void SetRefpos(int); void SetReflevel(int);
void SetScale(int); void SetScale(int);
void AllDirty(void); void AllDirty(void);
void MenuDirty(void); void MenuDirty(void);
@ -49,6 +51,10 @@ extern int setting_lna;
extern int setting_agc; extern int setting_agc;
extern int setting_decay; extern int setting_decay;
extern int setting_noise; extern int setting_noise;
extern int setting_auto_reflevel;
extern int setting_auto_attenuation;
extern int setting_reflevel;
extern int setting_scale;
void SetModulation(int); void SetModulation(int);
extern int setting_modulation; extern int setting_modulation;
void set_measurement(int); void set_measurement(int);
@ -390,11 +396,22 @@ static void menu_measure_cb(int item, uint8_t data)
static void menu_atten_cb(int item, uint8_t data) static void menu_atten_cb(int item, uint8_t data)
{ {
(void)item;
(void)data;
set_auto_attenuation(); set_auto_attenuation();
menu_move_back(); menu_move_back();
ui_mode_normal(); ui_mode_normal();
} }
static void menu_reflevel_cb(int item, uint8_t data)
{
(void)item;
(void)data;
set_auto_reflevel();
menu_move_back();
ui_mode_normal();
}
static void menu_storage_cb(int item, uint8_t data) static void menu_storage_cb(int item, uint8_t data)
{ {
(void)item; (void)item;
@ -684,14 +701,21 @@ static const menuitem_t menu_acquirehigh[] = {
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };
static const menuitem_t menu_reflevel[] = {
{ MT_CALLBACK,0, "AUTO", menu_reflevel_cb},
{ MT_KEYPAD, KM_REFPOS, "MANUAL", NULL},
{ MT_CANCEL, 0, S_LARROW" BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel
};
static const menuitem_t menu_display[] = { static const menuitem_t menu_display[] = {
{ MT_KEYPAD, KM_REFPOS, "\2REF\0LEVEL", NULL}, { MT_SUBMENU, 0, "\2REF\0LEVEL", menu_reflevel},
{ MT_SUBMENU, 0, "\2SCALE/\0DIV", menu_dBper}, { MT_SUBMENU, 0, "\2SCALE/\0DIV",menu_dBper},
{ MT_CALLBACK,0, "STORE", menu_storage_cb}, { MT_CALLBACK,0, "STORE", menu_storage_cb},
{ MT_CALLBACK,1, "CLEAR", menu_storage_cb}, { MT_CALLBACK,1, "CLEAR", menu_storage_cb},
{ MT_CALLBACK,2, "SUBTRACT", menu_storage_cb}, { MT_CALLBACK,2, "SUBTRACT", menu_storage_cb},
{ MT_CALLBACK,3, "WATERFALL",menu_storage_cb}, { MT_CALLBACK,3, "WATERFALL", menu_storage_cb},
{ 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
}; };
@ -1021,12 +1045,12 @@ static void fetch_numeric_target(void)
plot_printf(uistat.text, sizeof uistat.text, "%3.3fMHz", uistat.value / 1000000.0); plot_printf(uistat.text, sizeof uistat.text, "%3.3fMHz", uistat.value / 1000000.0);
break; break;
case KM_SCALE: case KM_SCALE:
uistat.value = get_trace_scale(uistat.current_trace) * 1000; uistat.value = setting_scale;
plot_printf(uistat.text, sizeof uistat.text, "%ddB/", uistat.value / 1000); plot_printf(uistat.text, sizeof uistat.text, "%ddB/", uistat.value);
break; break;
case KM_REFPOS: case KM_REFPOS:
uistat.value = get_trace_refpos(uistat.current_trace) * 1000; uistat.value = setting_reflevel;
plot_printf(uistat.text, sizeof uistat.text, "%ddB", uistat.value / 1000); plot_printf(uistat.text, sizeof uistat.text, "%ddB", uistat.value);
break; break;
case KM_ATTENUATION: case KM_ATTENUATION:
uistat.value = GetAttenuation(); uistat.value = GetAttenuation();
@ -1097,9 +1121,11 @@ set_numeric_value(void)
set_trace_scale(2, uistat.value / 1000.0); set_trace_scale(2, uistat.value / 1000.0);
break; break;
case KM_REFPOS: case KM_REFPOS:
SetRefpos(uistat.value); setting_auto_reflevel = false;
SetReflevel(uistat.value);
break; break;
case KM_ATTENUATION: case KM_ATTENUATION:
setting_auto_attenuation = false;
SetAttenuation(uistat.value); SetAttenuation(uistat.value);
break; break;
case KM_ACTUALPOWER: case KM_ACTUALPOWER:

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.