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

min max approach changed

Browse Source
pull/34/head
erikkaashoek 3 years ago
parent 67f15efeea
commit 336bcb8e65
2 changed files with 163 additions and 148 deletions
Show Stats Download Patch File Download Diff File

4
nanovna.h
Unescape View File

@ -823,7 +823,9 @@ enum {
#define TRACE_ACTUAL_FLAG (1<<(TRACE_ACTUAL))
#define TRACE_STORED_FLAG (1<<(TRACE_STORED))
#define TRACE_TEMP_FLAG (1<<(TRACE_TEMP))
#ifdef TINYSA4
#define TRACE_STORED2_FLAG (1<<(TRACE_STORED2))
#endif
#define TRACE_ENABLE(t_mask) {setting._traces|= (t_mask);}
#define TRACE_DISABLE(t_mask) {setting._traces&=~(t_mask);}

121
sa_core.c
Unescape View File

@ -584,7 +584,7 @@ void reset_settings(int m)
TRACE_ENABLE(TRACE_STORED_FLAG);
} else
#ifdef TINYSA4
TRACE_DISABLE(TRACE_STORED_FLAG|TRACE_TEMP_FLAG|TRACE_STORED2);
TRACE_DISABLE(TRACE_STORED_FLAG|TRACE_TEMP_FLAG|TRACE_STORED2_FLAG);
#else
TRACE_DISABLE(TRACE_STORED_FLAG|TRACE_TEMP_FLAG);
#endif
@ -2298,9 +2298,10 @@ done:
float peakLevel;
float min_level;
//float min_level;
freq_t peakFreq;
int peakIndex = 0;
int peakIndex;
int peakTrace;
float temppeakLevel;
uint16_t temppeakIndex;
// volatile int t;
@ -5195,13 +5196,13 @@ static volatile int dummy;
#endif
}
}
if ( actual_t[i] > -174.0 && temp_min_level > actual_t[i]) // Remember minimum
temp_min_level = actual_t[i];
// 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 ------------------------
add_to_peak_finding(actual_t, i);
// add_to_peak_finding(actual_t, i);
}
}
@ -5217,7 +5218,7 @@ static volatile int dummy;
// --------------- check if maximum is above trigger level -----------------
if (setting.trigger != T_AUTO && setting.frequency_step > 0) { // Trigger active
if (actual_t[max_index[0]] < setting.trigger_level) {
if (measured[peakTrace][peakIndex] < setting.trigger_level) {
goto again; // not yet, sweep again
} else {
if (setting.trigger == T_SINGLE) {
@ -5288,6 +5289,57 @@ static volatile int dummy;
if (MODE_OUTPUT(setting.mode) && (sweep_mode & SWEEP_ENABLE) ) // Sweep time is calculated, we can sweep again in output mode
goto again; // Keep repeating sweep loop till user aborts by input
// --------------------- set tracking markers from maximum table and find max/min -----------------
peakLevel = -170;
temp_min_level = 100;
for (int t=TRACES_MAX-1; t >= 0; t--) {
if (IS_TRACE_ENABLE(t)) {
float *trace_data = measured[t];
for (int i=0;i<sweep_points; i++) {
add_to_peak_finding(trace_data, i);
if ( trace_data[i] > -174.0 && temp_min_level > trace_data[i]) // Remember minimum
temp_min_level = trace_data[i];
}
if (trace_data[peak_finding_index] > peakLevel) {
peakIndex = peak_finding_index;
peakLevel = trace_data[peakIndex];
peakFreq = getFrequency(peakIndex);
peakTrace = t;
}
if (cur_max == 0) { // Always at least one maximum per trace
max_index[0] = peak_finding_index;
cur_max = 1;
}
if (MODE_INPUT(setting.mode)) { // Assign maxima found to tracking markers
int i = 0;
int m = 0;
while (i < cur_max) { // For all maxima found
while (m < MARKERS_MAX) {
if (markers[m].enabled && markers[m].mtype & M_TRACKING && markers[m].trace == t) { // Available marker found
markers[m].index = max_index[i];
interpolate_maximum(m);
m++;
break; // Next maximum
}
m++; // Try next marker
}
i++;
}
while (m < MARKERS_MAX) { // Insufficient maxima found
if (markers[m].enabled && markers[m].mtype & M_TRACKING && markers[m].trace == t) { // More available markers found
set_marker_index(m, 0); // Enabled but no max so set to left most frequency
}
m++; // Try next marker
}
}
}
#define __MIRROR_MASKING__
#ifdef __MIRROR_MASKING__
#ifdef __SI4432__
@ -5340,7 +5392,7 @@ static volatile int dummy;
if (setting.extra_lna)
target_level = LNA_AUTO_TARGET_LEVEL;
#endif
int actual_max_level = (max_index[0] == 0 ? -100 :(int) (actual_t[max_index[0]] - get_attenuation()) ) + setting.external_gain; // If no max found reduce attenuation
int actual_max_level = (peakIndex == 0 ? -100 :(int) (measured[peakTrace][peakIndex] - get_attenuation()) ) + setting.external_gain; // If no max found reduce attenuation
if (actual_max_level < target_level && setting.attenuate_x2 > 0) {
delta = - (target_level - actual_max_level);
} else if (actual_max_level > target_level && setting.attenuate_x2 < 60) {
@ -5383,7 +5435,7 @@ static volatile int dummy;
#ifdef __SI4432__
if (!in_selftest && MODE_INPUT(setting.mode)) {
if (S_IS_AUTO(setting.agc)) {
int actual_max_level = actual_t[max_index[0]] - get_attenuation() + setting.external_gain; // No need to use float
int actual_max_level = measured[peakTrace][peakIndex] - get_attenuation() + setting.external_gain; // No need to use float
if (UNIT_IS_LINEAR(setting.unit)) { // Auto AGC in linear mode
if (actual_max_level > - 45)
auto_set_AGC_LNA(false, 0); // Strong signal, no AGC and no LNA
@ -5412,13 +5464,14 @@ static volatile int dummy;
#endif
// -------------------------- auto reflevel ---------------------------------
if (max_index[0] > 0)
temppeakLevel = actual_t[max_index[0]];
// if (max_index[0] > 0)
// temppeakLevel = actual_t[max_index[0]];
if (!in_selftest && MODE_INPUT(setting.mode) && setting.auto_reflevel) { // Auto reflevel
float r = value(temppeakLevel);
float r = value(peakLevel);
float s_max = r / setting.scale; // Peak level normalized to /div
if (UNIT_IS_LINEAR(setting.unit)) { // Linear scales can not have negative values
@ -5468,40 +5521,8 @@ static volatile int dummy;
}
}
// --------------------- set tracking markers from maximum table -----------------
for (int t=0; t < TRACES_MAX; t++) {
if (t != 0) {
for (int i=0;i<sweep_points; i++)
add_to_peak_finding(measured[t], i);
}
if (cur_max == 0) {
max_index[0] = peak_finding_index;
cur_max = 1;
}
if (MODE_INPUT(setting.mode)) { // Assign maxima found to tracking markers
int i = 0;
int m = 0;
while (i < cur_max) { // For all maxima found
while (m < MARKERS_MAX) {
if (markers[m].enabled && markers[m].mtype & M_TRACKING && markers[m].trace == t) { // Available marker found
markers[m].index = max_index[i];
interpolate_maximum(m);
m++;
break; // Next maximum
}
m++; // Try next marker
}
i++;
}
while (m < MARKERS_MAX) { // Insufficient maxima found
if (markers[m].enabled && markers[m].mtype & M_TRACKING && markers[m].trace == t) { // More available markers found
set_marker_index(m, 0); // Enabled but no max so set to left most frequency
}
m++; // Try next marker
}
}
// ----------------------- now follow all the special marker calculations for the measurement modes ----------------------------
@ -5585,7 +5606,7 @@ static volatile int dummy;
} else if (setting.measurement == M_AM) { // ----------------AM measurement
if (S_IS_AUTO(setting.agc )) {
#ifdef __SI4432__
int actual_level = actual_t[max_index[0]] - get_attenuation() + setting.external_gain; // no need for float
int actual_level = measured[peakTrace][peakIndex] - get_attenuation() + setting.external_gain; // no need for float
if (actual_level > -20 ) {
setting.agc = S_AUTO_OFF;
setting.lna = S_AUTO_OFF;
@ -5619,14 +5640,6 @@ static volatile int dummy;
}
#endif
if (cur_max > 0) {
peakIndex = max_index[0];
cur_max = 1;
} else
peakIndex = peak_finding_index;
peakLevel = actual_t[peakIndex];
peakFreq = getFrequency(peakIndex);
min_level = temp_min_level;
}
// } while (MODE_OUTPUT(setting.mode) && setting.modulation != MO_NONE); // Never exit sweep loop while in output mode with modulation
#if 0 // Read ADC
@ -6108,7 +6121,7 @@ int validate_below(int tc, int from, int to) {
return(status);
}
int validate_flatness(int i) {
int validate_flatness(int i) { // This assumes only trace 1 is active
volatile int j,k;
test_fail_cause[i] = "Passband ";
for (j = peakIndex; j < setting._sweep_points; j++) {

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.