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

Improved NF measurement procedure

Browse Source
multi_trace
erikkaashoek 5 years ago
parent 65893bfaf2
commit 90d19a9dfd
5 changed files with 59 additions and 17 deletions
Show Stats Download Patch File Download Diff File

3
nanovna.h
Unescape View File

@ -1029,6 +1029,7 @@ typedef struct setting
bool extra_lna; bool extra_lna;
uint8_t ultra; // enum ?? uint8_t ultra; // enum ??
int R; // KM_R int R; // KM_R
int32_t exp_aver;
#endif #endif
int64_t test_argument; // used for tests int64_t test_argument; // used for tests
uint32_t checksum; // must be last and at 4 byte boundary uint32_t checksum; // must be last and at 4 byte boundary
@ -1407,7 +1408,7 @@ void interpolate_maximum(int m);
void calibrate_modulation(int modulation, int8_t *correction); void calibrate_modulation(int modulation, int8_t *correction);
enum { enum {
M_OFF, M_IMD, M_OIP3, M_PHASE_NOISE, M_SNR, M_PASS_BAND, M_LINEARITY, M_AM, M_FM, M_THD, M_CP, M_NF, M_DECONV M_OFF, M_IMD, M_OIP3, M_PHASE_NOISE, M_SNR, M_PASS_BAND, M_LINEARITY, M_AM, M_FM, M_THD, M_CP, M_NF_TINYSA, M_NF_VALIDATE, M_NF_AMPLIFIER, M_DECONV
}; };
enum { enum {

13
plot.c
Unescape View File

@ -1625,11 +1625,11 @@ static void cell_draw_marker_info(int x0, int y0)
break; break;
} }
#ifdef __NOISE_FIGURE__ #ifdef __NOISE_FIGURE__
} else if (i>=2 && setting.measurement == M_NF && markers[0].enabled) { } else if (i>=2 && (setting.measurement == M_NF_TINYSA || setting.measurement == M_NF_VALIDATE || setting.measurement == M_NF_AMPLIFIER) && markers[0].enabled) {
float aNP = 0; float aNP = 0;
aNP = marker_to_value(0); aNP = marker_to_value(0);
float mNF = aNP + 173.93 - nf_gain; // measured noise figure at 20C float mNF = aNP + 173.93 - nf_gain; // measured noise figure at 20C
if (nf_gain != 0) { if (setting.measurement != M_NF_TINYSA) {
float mnf = expf(mNF/10.0 * logf(10)); // measure noise factor float mnf = expf(mNF/10.0 * logf(10)); // measure noise factor
float tnf = expf(config.noise_figure/10.0 * logf(10.0)); // tinySA noise factor float tnf = expf(config.noise_figure/10.0 * logf(10.0)); // tinySA noise factor
float amp_gain = expf(nf_gain/10.0 * logf(10.0)); float amp_gain = expf(nf_gain/10.0 * logf(10.0));
@ -1644,10 +1644,13 @@ static void cell_draw_marker_info(int x0, int y0)
// j = 1; // j = 1;
int xpos = 1 + (j%2)*(WIDTH/2) + CELLOFFSETX - x0; int xpos = 1 + (j%2)*(WIDTH/2) + CELLOFFSETX - x0;
int ypos = 1 + (j/2)*(16) - y0; int ypos = 1 + (j/2)*(16) - y0;
if (nf_gain != 0) { if (setting.measurement == M_NF_TINYSA) {
cell_printf(xpos, ypos, FONT_b"GAIN: %4.1fdB NF: %4.1f", nf_gain, mNF);
} else {
cell_printf(xpos, ypos, FONT_b"TINYSA NF: %4.1f", mNF); cell_printf(xpos, ypos, FONT_b"TINYSA NF: %4.1f", mNF);
} else {
if (setting.measurement == M_NF_VALIDATE)
cell_printf(xpos, ypos, FONT_b"TINYSA NF ERROR: %4.1f", mNF);
else
cell_printf(xpos, ypos, FONT_b"GAIN: %4.1fdB NF: %4.1f", nf_gain, mNF);
} }
break; break;
#endif #endif

5
sa_core.c
Unescape View File

@ -201,6 +201,7 @@ void reset_settings(int m)
ultra_threshold = config.ultra_threshold; ultra_threshold = config.ultra_threshold;
ultra = config.ultra; ultra = config.ultra;
drive_dBm = (float *) (setting.mode == M_GENHIGH && config.high_out_adf4350 ? adf_drive_dBm : si_drive_dBm); drive_dBm = (float *) (setting.mode == M_GENHIGH && config.high_out_adf4350 ? adf_drive_dBm : si_drive_dBm);
setting.exp_aver = 1;
#endif #endif
update_min_max_freq(); update_min_max_freq();
setting.frequency_var = 0; setting.frequency_var = 0;
@ -4189,7 +4190,7 @@ static volatile int dummy;
// Update actual time on change on status panel // Update actual time on change on status panel
uint32_t delta = abs((int)(setting.actual_sweep_time_us - setting.measure_sweep_time_us)); uint32_t delta = abs((int)(setting.actual_sweep_time_us - setting.measure_sweep_time_us));
if ((delta<<3) > setting.actual_sweep_time_us){ // update if delta > 1/8 if ((delta<<3) > setting.actual_sweep_time_us){ // update if delta > 1/8
redraw_request|=REDRAW_CAL_STATUS; redraw_request|=REDRAW_CAL_STATUS | REDRAW_FREQUENCY;
} }
setting.actual_sweep_time_us = setting.measure_sweep_time_us; setting.actual_sweep_time_us = setting.measure_sweep_time_us;
// Not possible reduce sweep time, it minimum! // Not possible reduce sweep time, it minimum!
@ -4517,7 +4518,7 @@ static volatile int dummy;
#endif #endif
} }
#ifdef __CHANNEL_POWER__ #ifdef __CHANNEL_POWER__
} else if (setting.measurement == M_CP || setting.measurement == M_SNR || setting.measurement == M_NF) { // ----------------CHANNEL_POWER measurement } else if (setting.measurement == M_CP || setting.measurement == M_SNR || setting.measurement == M_NF_TINYSA|| setting.measurement == M_NF_VALIDATE|| setting.measurement == M_NF_AMPLIFIER) { // ----------------CHANNEL_POWER measurement
freq_t bw = get_sweep_frequency(ST_SPAN)/3; freq_t bw = get_sweep_frequency(ST_SPAN)/3;
int old_unit = setting.unit; int old_unit = setting.unit;
setting.unit = U_WATT; setting.unit = U_WATT;

16
si4468.c
Unescape View File

@ -1319,6 +1319,7 @@ const uint8_t dBm_to_volt [] =
5, 5,
5, 5,
}; };
static int32_t RSSI_RAW = 0;
void SI4432_Listen(int s) void SI4432_Listen(int s)
{ {
@ -1356,7 +1357,8 @@ int16_t Si446x_RSSI(void)
#endif #endif
int i = setting.repeat; int i = setting.repeat;
int32_t RSSI_RAW = 0; if (setting.exp_aver == 1)
RSSI_RAW = 0;
// SI4463_WAIT_CTS; // Wait for CTS // SI4463_WAIT_CTS; // Wait for CTS
do{ do{
// if (MODE_INPUT(setting.mode) && RSSI_R // if (MODE_INPUT(setting.mode) && RSSI_R
@ -1388,13 +1390,21 @@ int16_t Si446x_RSSI(void)
RSSI_RAW += DEVICE_TO_PURE_RSSI(RSSI_RAW_ARRAY[1]); RSSI_RAW += DEVICE_TO_PURE_RSSI(RSSI_RAW_ARRAY[1]);
#else #else
#ifdef TINYSA4
if (setting.exp_aver == 1)
RSSI_RAW += DEVICE_TO_PURE_RSSI(RSSI_RAW_ARRAY[0]); RSSI_RAW += DEVICE_TO_PURE_RSSI(RSSI_RAW_ARRAY[0]);
else
RSSI_RAW = ((setting.exp_aver-1) * RSSI_RAW + DEVICE_TO_PURE_RSSI(RSSI_RAW_ARRAY[0]))/setting.exp_aver;
#else
RSSI_RAW += DEVICE_TO_PURE_RSSI(RSSI_RAW_ARRAY[0]);
#endif
#endif #endif
if (--i <= 0) break; if (--i <= 0) break;
my_microsecond_delay(100); // my_microsecond_delay(100);
}while(1); }while(1);
if (setting.repeat > 1) if (setting.repeat > 1 && setting.exp_aver == 1)
RSSI_RAW = RSSI_RAW / setting.repeat; RSSI_RAW = RSSI_RAW / setting.repeat;
return RSSI_RAW; return RSSI_RAW;

39
ui_sa.c
Unescape View File

@ -423,6 +423,7 @@ enum {
KM_ATTACK, KM_ATTACK,
#ifdef TINYSA4 #ifdef TINYSA4
KM_LPF, KM_LPF,
KM_EXP_AVER,
#endif #endif
KM_LEVEL, KM_LEVEL,
#ifdef __LIMITS__ #ifdef __LIMITS__
@ -483,6 +484,7 @@ static const struct {
[KM_ATTACK] = {keypads_positive , "ATTACK"}, // KM_ATTACK [KM_ATTACK] = {keypads_positive , "ATTACK"}, // KM_ATTACK
#ifdef TINYSA4 #ifdef TINYSA4
[KM_LPF] = {keypads_freq , "ULTRA\nSTART"}, // KM_LPF [KM_LPF] = {keypads_freq , "ULTRA\nSTART"}, // KM_LPF
[KM_EXP_AVER] = {keypads_positive , "EXPONENTIAL\nAVERAGING"}, //KM_EXP_AVER
#endif #endif
[KM_LEVEL] = {keypads_plusmin , "LEVEL"}, // KM_LEVEL [KM_LEVEL] = {keypads_plusmin , "LEVEL"}, // KM_LEVEL
#ifdef __LIMITS__ #ifdef __LIMITS__
@ -1344,21 +1346,32 @@ static UI_FUNCTION_ADV_CALLBACK(menu_measure_acb)
break; break;
#endif #endif
#ifdef __NOISE_FIGURE__ #ifdef __NOISE_FIGURE__
case M_NF: // noise figure case M_NF_TINYSA:
nf_gain = 0;
goto noise_figure;
case M_NF_VALIDATE:
nf_gain = 0.00001; // almost zero
goto noise_figure;
case M_NF_AMPLIFIER: // noise figure
// reset_settings(setting.mode); // reset_settings(setting.mode);
markers[0].enabled = M_ENABLED;
markers[0].mtype = M_NOISE | M_AVER; // Not tracking
set_extra_lna(true);
kp_help_text = "Amplifier Gain "; kp_help_text = "Amplifier Gain ";
float old_gain = setting.external_gain; float old_gain = setting.external_gain;
ui_mode_keypad(KM_EXT_GAIN); ui_mode_keypad(KM_EXT_GAIN);
nf_gain = setting.external_gain; nf_gain = setting.external_gain;
setting.external_gain = old_gain; setting.external_gain = old_gain;
noise_figure:
markers[0].enabled = M_ENABLED;
markers[0].mtype = M_NOISE | M_AVER; // Not tracking
set_extra_lna(true);
kp_help_text = "Noise center frequency"; kp_help_text = "Noise center frequency";
ui_mode_keypad(KM_CENTER); ui_mode_keypad(KM_CENTER);
set_marker_frequency(0, uistat.value); set_marker_frequency(0, uistat.value);
#if 0
kp_help_text = "Noise span"; kp_help_text = "Noise span";
ui_mode_keypad(KM_SPAN); ui_mode_keypad(KM_SPAN);
#else
set_sweep_frequency(ST_SPAN, 100000);
#endif
set_RBW(get_sweep_frequency(ST_SPAN)/100 / 100); set_RBW(get_sweep_frequency(ST_SPAN)/100 / 100);
// set_sweep_frequency(ST_SPAN, 0); // set_sweep_frequency(ST_SPAN, 0);
set_average(AV_100); set_average(AV_100);
@ -2606,6 +2619,16 @@ static const menuitem_t menu_settings[] =
{ MT_NONE, 0, NULL, menu_back} // next-> menu_back { MT_NONE, 0, NULL, menu_back} // next-> menu_back
}; };
#ifdef __NOISE_FIGURE__
static const menuitem_t menu_measure_noise_figure[] =
{
{ MT_ADV_CALLBACK, M_NF_TINYSA, "MEASURE\nTINYSA NF",menu_measure_acb},
{ MT_ADV_CALLBACK, M_NF_VALIDATE, "VALIDATE\nTINYSA NF",menu_measure_acb},
{ MT_ADV_CALLBACK, M_NF_AMPLIFIER, "MEASURE\nAMPLIFIER NF",menu_measure_acb},
{ MT_NONE, 0, NULL, menu_back} // next-> menu_back
};
#endif
static const menuitem_t menu_measure2[] = { static const menuitem_t menu_measure2[] = {
{ MT_ADV_CALLBACK, M_AM, "AM", menu_measure_acb}, { MT_ADV_CALLBACK, M_AM, "AM", menu_measure_acb},
{ MT_ADV_CALLBACK, M_FM, "FM", menu_measure_acb}, { MT_ADV_CALLBACK, M_FM, "FM", menu_measure_acb},
@ -2617,7 +2640,7 @@ static const menuitem_t menu_measure2[] = {
{ MT_ADV_CALLBACK | MT_LOW, M_LINEARITY, "LINEAR", menu_measure_acb}, { MT_ADV_CALLBACK | MT_LOW, M_LINEARITY, "LINEAR", menu_measure_acb},
#endif #endif
#ifdef __NOISE_FIGURE__ #ifdef __NOISE_FIGURE__
{ MT_ADV_CALLBACK | MT_LOW, M_NF, "NOISE\nFIGURE", menu_measure_acb}, { MT_SUBMENU | MT_LOW, 0, "NOISE\nFIGURE", menu_measure_noise_figure},
#endif #endif
#ifdef __FFT_DECONV__ #ifdef __FFT_DECONV__
{ MT_ADV_CALLBACK, M_DECONV, "DECONV", menu_measure_acb}, { MT_ADV_CALLBACK, M_DECONV, "DECONV", menu_measure_acb},
@ -2719,6 +2742,7 @@ static const menuitem_t menu_display[] = {
// { MT_ADV_CALLBACK,2, "SUBTRACT\nSTORED",menu_storage_acb}, // { MT_ADV_CALLBACK,2, "SUBTRACT\nSTORED",menu_storage_acb},
#ifdef __VBW__ #ifdef __VBW__
{ MT_SUBMENU, 0, "VBW", menu_vbw}, { MT_SUBMENU, 0, "VBW", menu_vbw},
{ MT_KEYPAD, KM_EXP_AVER, "EXP\nAVER", NULL},
#endif #endif
#ifdef __LIMITS__ #ifdef __LIMITS__
{ MT_SUBMENU, 0, "LIMITS", menu_limit_select}, { MT_SUBMENU, 0, "LIMITS", menu_limit_select},
@ -3099,6 +3123,9 @@ set_numeric_value(void)
config_save(); config_save();
ultra_threshold = config.ultra_threshold; ultra_threshold = config.ultra_threshold;
break; break;
case KM_EXP_AVER:
setting.exp_aver = uistat.value;
dirty = true;
#endif #endif
case KM_LEVEL: case KM_LEVEL:
break; break;
@ -3417,7 +3444,7 @@ redraw_cal_status:
calculate_step_delay(); calculate_step_delay();
setting.actual_sweep_time_us = calc_min_sweep_time_us(); setting.actual_sweep_time_us = calc_min_sweep_time_us();
} }
ili9341_set_foreground(setting.step_delay ? LCD_BRIGHT_COLOR_GREEN : LCD_FG_COLOR); ili9341_set_foreground((setting.step_delay || setting.sweep_time_us ) ? LCD_BRIGHT_COLOR_GREEN : LCD_FG_COLOR);
#if 0 // Activate for sweep time debugging #if 0 // Activate for sweep time debugging
lcd_printf(x, y, "%cScan:\n%5.3Fs", fscan[setting.step_delay_mode&3], (float)setting.sweep_time_us/ONE_SECOND_TIME); lcd_printf(x, y, "%cScan:\n%5.3Fs", fscan[setting.step_delay_mode&3], (float)setting.sweep_time_us/ONE_SECOND_TIME);
#endif #endif

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.