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

Improved measurements

Browse Source
Removed_REF_marker
erikkaashoek 5 years ago
parent accf6f92fc
commit 6aa31c51ea
3 changed files with 87 additions and 16 deletions
Show Stats Download Patch File Download Diff File

18
plot.c
Unescape View File

@ -1498,16 +1498,28 @@ static void cell_draw_marker_info(int x0, int y0)
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;
cell_printf(xpos, ypos, FONT_b"DEVIATION:%6.1QHz", dev); cell_printf(xpos, ypos, FONT_b"DEVIATION:%6.1QHz", dev);
} else if (setting.measurement == M_THD && markers[0].enabled && (markers[0].index << 5) > sweep_points ) { #ifdef TINYSA4
#define THD_SHIFT 7
#else
#define THD_SHIFT 6
#endif
} else if (setting.measurement == M_THD && markers[0].enabled && (markers[0].index << THD_SHIFT) > sweep_points ) {
int old_unit = setting.unit; int old_unit = setting.unit;
setting.unit = U_WATT; setting.unit = U_WATT;
float p = marker_to_value(0); float p = marker_to_value(0);
int h_i = 2; int h_i = 2;
freq_t f = markers[0].frequency; freq_t f = markers[0].frequency;
float h = 0.0; float h = 0.0;
int h_count = 0;
int search_gate = 10;
if (markers[0].index < search_gate)
search_gate = markers[0].index * 2 / 3;
while (f * h_i < frequencies[sweep_points-1]) { while (f * h_i < frequencies[sweep_points-1]) {
if (search_maximum(1, f*h_i, 4*h_i) ) // use marker 1 for searching harmonics if (search_maximum(1, f*h_i, search_gate) ) { // use marker 1 for searching harmonics
h_count++;
f = (f * 3 + markers[1].frequency / h_i) >> 2;
h += marker_to_value(1); h += marker_to_value(1);
}
h_i++; h_i++;
} }
float thd = 100.0 * sa_sqrtf(h/p); float thd = 100.0 * sa_sqrtf(h/p);
@ -1516,7 +1528,7 @@ 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;
cell_printf(xpos, ypos, FONT_b"THD: %4.1f%%", thd); cell_printf(xpos, ypos, FONT_b"#%d THD: %4.1f%%", h_count, thd);
break; break;
} }
} else } else

75
sa_core.c
Unescape View File

@ -2105,18 +2105,24 @@ done:
#endif #endif
} }
#ifdef TINYSA4 //#ifdef TINYSA4
#define frequency_seatch_gate 60 // 120% of the RBW //#define frequency_seatch_gate 60 // 120% of the RBW
#else //#else
#define frequency_seatch_gate 100 // 200% of the RBW //#define frequency_seatch_gate 100 // 200% of the RBW
#endif //#endif
int binary_search_frequency(freq_t f) // Search which index in the frequency tabled matches with frequency f using actual_rbw int binary_search_frequency(freq_t f) // Search which index in the frequency tabled matches with frequency f using actual_rbw
{ {
int L = 0; int L = 0;
int R = (sizeof frequencies)/sizeof(int) - 1; int frequency_seatch_gate = (frequencies[1] - frequencies[0]) >> 1;
freq_t fmin = f - actual_rbw_x10 * frequency_seatch_gate; if (f < frequencies[0])
freq_t fplus = f + actual_rbw_x10 * frequency_seatch_gate; return -1;
if (f > frequencies[sweep_points-1])
return -1;
// int R = (sizeof frequencies)/sizeof(int) - 1;
int R = sweep_points - 1;
freq_t fmin = f - frequency_seatch_gate; // actual_rbw_x10 * frequency_seatch_gate;
freq_t fplus = f + frequency_seatch_gate; // actual_rbw_x10 * frequency_seatch_gate;
while (L <= R) { while (L <= R) {
int m = (L + R) / 2; int m = (L + R) / 2;
if (frequencies[m] < fmin) if (frequencies[m] < fmin)
@ -2129,6 +2135,37 @@ int binary_search_frequency(freq_t f) // Search which index in the frequenc
return -1; return -1;
} }
int index_of_frequency(freq_t f) // Search which index in the frequency tabled matches with frequency f using actual_rbw
{
freq_t f_step = frequencies[1] - frequencies[0];
if (f_step == 0)
return 0;
if (f < frequencies[0])
return -1;
if (f > frequencies[sweep_points-1])
return -1;
int i = (f + (f_step >> 1))* sweep_points / (frequencies[sweep_points-1] - frequencies[0]);
return i;
#if 0
// int R = (sizeof frequencies)/sizeof(int) - 1;
int L = 0;
int R = sweep_points - 1;
freq_t fmin = f - frequency_seatch_gate; // actual_rbw_x10 * frequency_seatch_gate;
freq_t fplus = f + frequency_seatch_gate; // actual_rbw_x10 * frequency_seatch_gate;
while (L <= R) {
int m = (L + R) / 2;
if (frequencies[m] < fmin)
L = m + 1;
else if (frequencies[m] > fplus)
R = m - 1;
else
return m; // index is m
}
#endif
}
void interpolate_maximum(int m) void interpolate_maximum(int m)
{ {
const int idx = markers[m].index; const int idx = markers[m].index;
@ -2154,7 +2191,7 @@ void interpolate_maximum(int m)
int int
search_maximum(int m, freq_t center, int span) search_maximum(int m, freq_t center, int span)
{ {
int center_index = binary_search_frequency(center); int center_index = index_of_frequency(center);
if (center_index < 0) if (center_index < 0)
return false; return false;
int from = center_index - span/2; int from = center_index - span/2;
@ -2212,6 +2249,15 @@ search_maximum(int m, freq_t center, int span)
} }
} }
} }
if (false && !found) {
temppeakIndex = from;
temppeakLevel = actual_t[from];
for (int i = from+1; i <= to; i++) {
if (temppeakLevel<actual_t[i])
temppeakIndex = i;
}
found = true;
}
markers[m].index = max_index[0]; markers[m].index = max_index[0];
interpolate_maximum(m); interpolate_maximum(m);
// markers[m].frequency = frequencies[markers[m].index]; // markers[m].frequency = frequencies[markers[m].index];
@ -4187,9 +4233,14 @@ static bool sweep(bool break_on_operation)
#ifdef __MEASURE__ #ifdef __MEASURE__
if (setting.measurement == M_IMD && markers[0].index > 10) { // ----- IMD measurement if (setting.measurement == M_IMD && markers[0].index > 10) { // ----- IMD measurement
markers[1].enabled = search_maximum(1, frequencies[markers[0].index]*2, 8); #ifdef TINYSA4
markers[2].enabled = search_maximum(2, frequencies[markers[0].index]*3, 12); #define H_SPACING 7
markers[3].enabled = search_maximum(3, frequencies[markers[0].index]*4, 16); #else
#define H_SPACING 4
#endif
markers[1].enabled = search_maximum(1, frequencies[markers[0].index]*2, 2*H_SPACING);
markers[2].enabled = search_maximum(2, frequencies[markers[0].index]*3, 3*H_SPACING);
markers[3].enabled = search_maximum(3, frequencies[markers[0].index]*4, 4*H_SPACING);
#ifdef TINYSA4 #ifdef TINYSA4
} else if (setting.measurement == M_AM && markers[0].index > 10) { // ----------AM measurement } else if (setting.measurement == M_AM && markers[0].index > 10) { // ----------AM measurement
int l = markers[1].index; int l = markers[1].index;

10
ui_sa.c
Unescape View File

@ -1156,7 +1156,13 @@ static UI_FUNCTION_ADV_CALLBACK(menu_measure_acb)
kp_help_text = "Frequency of fundamental"; kp_help_text = "Frequency of fundamental";
ui_mode_keypad(KM_CENTER); ui_mode_keypad(KM_CENTER);
set_sweep_frequency(ST_START, 0); set_sweep_frequency(ST_START, 0);
set_sweep_frequency(ST_STOP, uistat.value*5); #ifdef TINYSA4
#define IMD_RANGE 10
#else
#define IMD_RANGE 5
#endif
set_sweep_frequency(ST_STOP, uistat.value*IMD_RANGE);
set_average(AV_4);
// set_measurement(M_IMD); // set_measurement(M_IMD);
break; break;
case M_OIP3: // OIP3 case M_OIP3: // OIP3
@ -1175,6 +1181,7 @@ static UI_FUNCTION_ADV_CALLBACK(menu_measure_acb)
int right = uistat.value; int right = uistat.value;
set_sweep_frequency(ST_CENTER, (left+right)/2); set_sweep_frequency(ST_CENTER, (left+right)/2);
set_sweep_frequency(ST_SPAN, (right - left)*5); set_sweep_frequency(ST_SPAN, (right - left)*5);
set_average(AV_4);
// set_measurement(M_OIP3); // set_measurement(M_OIP3);
break; break;
case M_PHASE_NOISE: // Phase noise case M_PHASE_NOISE: // Phase noise
@ -1305,6 +1312,7 @@ static UI_FUNCTION_ADV_CALLBACK(menu_measure_acb)
// set_measurement(M_FM); // set_measurement(M_FM);
break; break;
case M_THD: case M_THD:
set_average(AV_4);
// set_measurement(M_THD); // set_measurement(M_THD);
break; break;
#ifdef __CHANNEL_POWER__ #ifdef __CHANNEL_POWER__

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.