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

Auto mixer_drive and first correction table

Browse Source
Removed_REF_marker
erikkaashoek 5 years ago
parent 10ef465890
commit 49a4dede62
5 changed files with 91 additions and 85 deletions
Show Stats Download Patch File Download Diff File

2
main.c
Unescape View File

@ -1017,7 +1017,7 @@ config_t config = {
.high_level_output_offset = 0.0, // Uncalibrated .high_level_output_offset = 0.0, // Uncalibrated
.correction_frequency = {{ 1000000, 500000000, 1000000000, 1500000000, 2000000000, 2500000000, 3000000000, 3500000000, 4000000000, 4500000000, 5000000000, 5500000000, 6000000000, 6500000000, 7000000000, 7500000000, 8000000000, 8500000000, 9000000000, 10000000000 }, .correction_frequency = {{ 1000000, 500000000, 1000000000, 1500000000, 2000000000, 2500000000, 3000000000, 3500000000, 4000000000, 4500000000, 5000000000, 5500000000, 6000000000, 6500000000, 7000000000, 7500000000, 8000000000, 8500000000, 9000000000, 10000000000 },
{ 1000000, 500000000, 1000000000, 1500000000, 2000000000, 2500000000, 3000000000, 3500000000, 4000000000, 4500000000, 5000000000, 5500000000, 6000000000, 6500000000, 7000000000, 7500000000, 8000000000, 8500000000, 9000000000, 10000000000 }}, { 1000000, 500000000, 1000000000, 1500000000, 2000000000, 2500000000, 3000000000, 3500000000, 4000000000, 4500000000, 5000000000, 5500000000, 6000000000, 6500000000, 7000000000, 7500000000, 8000000000, 8500000000, 9000000000, 10000000000 }},
.correction_value = {{ 0, 0, +1, +2, +2, +4, +9, +10, +16, +15, +17, +22, +30, +30, +30, +30, +30, +30, +30, +30 }, .correction_value = {{ 0, +3, +11, +8.5, +2, +3, +10, +15, +12, +4, +0, +18, +22, +30, +30, +30, +30, +30, +30, +30 },
{ 0, 0, +1, +2, +2, +4, +9, +10, +16, +15, +17, +22, +30, +30, +30, +30, +30, +30, +30, +30 }}, { 0, 0, +1, +2, +2, +4, +9, +10, +16, +15, +17, +22, +30, +30, +30, +30, +30, +30, +30, +30 }},
.setting_frequency_30mhz = 30000000, .setting_frequency_30mhz = 30000000,
.cor_am = 0, .cor_am = 0,

4
plot.c
Unescape View File

@ -1349,7 +1349,11 @@ static void trace_print_value_string( // Only used at one place
format = FONT_s"%s %.3F%s%s"; // 5 characters incl u, m, etc... format = FONT_s"%s %.3F%s%s"; // 5 characters incl u, m, etc...
else else
format = FONT_s"%s %.1f%s%s"; format = FONT_s"%s %.1f%s%s";
#ifdef TINYSA4
format++; // Skip small prefix for bold output
#else
if (bold) format++; // Skip small prefix for bold output if (bold) format++; // Skip small prefix for bold output
#endif
cell_printf(xpos, ypos, format, buf2, v, unit_string[unit_index], (mtype & M_NOISE?"/Hz":"")); cell_printf(xpos, ypos, format, buf2, v, unit_string[unit_index], (mtype & M_NOISE?"/Hz":""));
} }

153
sa_core.c
Unescape View File

@ -201,7 +201,7 @@ void reset_settings(int m)
setting.subtract_stored = false; setting.subtract_stored = false;
setting.normalize_level = 0.0; setting.normalize_level = 0.0;
#ifdef TINYSA4 #ifdef TINYSA4
setting.lo_drive=1; setting.lo_drive=5;
#else #else
setting.lo_drive=13; setting.lo_drive=13;
// setting.rx_drive=8; moved to top // setting.rx_drive=8; moved to top
@ -272,7 +272,7 @@ void reset_settings(int m)
setting.auto_attenuation = true; setting.auto_attenuation = true;
setting.sweep_time_us = 0; setting.sweep_time_us = 0;
#ifdef TINYSA4 #ifdef TINYSA4
setting.lo_drive=1; setting.lo_drive=5;
setting.extra_lna = false; setting.extra_lna = false;
#endif #endif
setting.correction_frequency = config.correction_frequency[CORRECTION_LOW]; setting.correction_frequency = config.correction_frequency[CORRECTION_LOW];
@ -2334,6 +2334,10 @@ void clock_at_48MHz(void)
} }
} }
#ifdef TINYSA4
int old_drive = -1;
#endif
pureRSSI_t perform(bool break_on_operation, int i, freq_t f, int tracking) // Measure the RSSI for one frequency, used from sweep and other measurement routines. Must do all HW setup pureRSSI_t perform(bool break_on_operation, int i, freq_t f, int tracking) // Measure the RSSI for one frequency, used from sweep and other measurement routines. Must do all HW setup
{ {
int modulation_delay = 0; int modulation_delay = 0;
@ -2404,7 +2408,20 @@ pureRSSI_t perform(bool break_on_operation, int i, freq_t f, int tracking) /
} }
} }
#endif #endif
#ifdef TINYSA4
// ----------------------------- set mixer drive --------------------------------------------
if (setting.lo_drive & 0x40 || f >=2000000000UL) {
if (old_drive != 3) {
ADF4351_drive(3); // Max drive
old_drive = 3;
}
} else {
if (old_drive != setting.lo_drive) {
ADF4351_drive(setting.lo_drive);
old_drive = setting.lo_drive;
}
}
#endif
// ------------------------------------- Set the output level ---------------------------------- // ------------------------------------- Set the output level ----------------------------------
if (( setting.frequency_step != 0 || setting.level_sweep != 0.0 || i == 0)) { // Initialize or adapt output levels if (( setting.frequency_step != 0 || setting.level_sweep != 0.0 || i == 0)) { // Initialize or adapt output levels
@ -4150,11 +4167,21 @@ static void test_acquire(int i)
{ {
(void)i; (void)i;
pause_sweep(); pause_sweep();
// SetAverage(4); if (test_case[i].kind == TC_LEVEL) {
float summed_peak_level = 0;
#define LEVEL_TEST_SWEEPS 10
for (int k=0; k<LEVEL_TEST_SWEEPS; k++) {
sweep(false);
float local_peak_level = 0.0;
#define FROM_START 50
for (int n = FROM_START ; n < sweep_points; n++)
local_peak_level += actual_t[n];
local_peak_level /= (sweep_points - FROM_START);
summed_peak_level += local_peak_level;
}
peakLevel = summed_peak_level / LEVEL_TEST_SWEEPS;
} else
sweep(false); sweep(false);
// sweep(false);
// sweep(false);
// sweep(false);
plot_into_index(measured); plot_into_index(measured);
redraw_request |= REDRAW_CELLS | REDRAW_FREQUENCY; redraw_request |= REDRAW_CELLS | REDRAW_FREQUENCY;
} }
@ -4262,68 +4289,29 @@ int validate_flatness(int i) {
return(TS_PASS); return(TS_PASS);
} }
int validate_level(int i, float a) {
int status = TS_PASS;
test_fail_cause[i] = "Level ";
float summed_peak_level = 0;
set_attenuation(a);
#define LEVEL_TEST_SWEEPS 10
for (int k=0; k<LEVEL_TEST_SWEEPS; k++) {
test_acquire(TEST_ATTEN); // Acquire test
float peaklevel = 0.0;
#define FROM_START 50
for (int n = FROM_START ; n < sweep_points; n++)
peaklevel += actual_t[n];
peaklevel /= (sweep_points - FROM_START);
summed_peak_level += peaklevel;
}
peakLevel = summed_peak_level / LEVEL_TEST_SWEEPS;
#if 0
#define LEVEL_TEST_CRITERIA 3
if (peakLevel - test_case[i].pass <= -LEVEL_TEST_CRITERIA || peakLevel - test_case[i].pass >= LEVEL_TEST_CRITERIA) {
status = TS_FAIL;
} else
#endif
test_fail_cause[i] = "";
return(status);
}
const float atten_step[7] = { 0.0, 0.5, 1.0, 2.0, 4.0, 8.0, 16.0 }; const float atten_step[7] = { 0.0, 0.5, 1.0, 2.0, 4.0, 8.0, 16.0 };
int test_validate(int i);
int validate_atten(int i) { int validate_atten(int i) {
int status = TS_PASS; int status = TS_PASS;
float reference_peak_level = 0.0; float reference_peak_level = 0.0;
test_fail_cause[i] = "Attenuator "; test_fail_cause[i] = "Attenuator ";
// for (int j= 0; j < 64; j++ ) { // for (int j= 0; j < 64; j++ ) {
for (int j= 0; j < 7; j++ ) { for (int j= 0; j < 7; j++ ) {
// float a = ((float)j)/2.0; // float a = ((float)j)/2.0;
float a = atten_step[j]; float a = atten_step[j];
set_attenuation(a); set_attenuation(a);
float summed_peak_level = 0; test_acquire(TEST_LEVEL); // Acquire test, does also the averaging.
#define ATTEN_TEST_SWEEPS 5 test_validate(TEST_LEVEL); // Validate test, does nothing actually
for (int k=0; k<ATTEN_TEST_SWEEPS; k++) {
// setting.sweep_time_us = 1000000;
test_acquire(TEST_ATTEN); // Acquire test
// test_validate(TEST_ATTEN); // Validate test
float peaklevel = 0.0;
for (int n = 0 ; n < sweep_points; n++)
peaklevel += actual_t[n];
peaklevel /= (sweep_points - 0);
summed_peak_level += peaklevel;
}
summed_peak_level /= ATTEN_TEST_SWEEPS;
if (j == 0) if (j == 0)
reference_peak_level = summed_peak_level; reference_peak_level = peakLevel;
else { else {
// if (SDU1.config->usbp->state == USB_ACTIVE) shell_printf("Attenuation %.2fdB, measured level %.2fdBm, delta %.2fdB\n\r",a, summed_peak_level, summed_peak_level - reference_peak_level); // if (SDU1.config->usbp->state == USB_ACTIVE) shell_printf("Attenuation %.2fdB, measured level %.2fdBm, delta %.2fdB\n\r",a, summed_peak_level, summed_peak_level - reference_peak_level);
#define ATTEN_TEST_CRITERIA 1.5 #define ATTEN_TEST_CRITERIA 1.5
if (summed_peak_level - reference_peak_level <= -ATTEN_TEST_CRITERIA || summed_peak_level - reference_peak_level >= ATTEN_TEST_CRITERIA) { if (peakLevel - reference_peak_level <= -ATTEN_TEST_CRITERIA || peakLevel - reference_peak_level >= ATTEN_TEST_CRITERIA) {
status = TS_FAIL; status = TS_FAIL;
// draw_all(true);
} }
} }
} }
if (status == TS_PASS) if (status == TS_PASS)
@ -4356,6 +4344,19 @@ int validate_above(int tc) {
return(status); return(status);
} }
int validate_level(int i) {
int status = TS_PASS;
test_fail_cause[i] = "Level ";
#if 0
#define LEVEL_TEST_CRITERIA 3
if (peakLevel - test_case[i].pass <= -LEVEL_TEST_CRITERIA || peakLevel - test_case[i].pass >= LEVEL_TEST_CRITERIA) {
status = TS_FAIL;
} else
#endif
test_fail_cause[i] = "";
return(status);
}
int test_validate(int i) int test_validate(int i)
{ {
@ -4395,10 +4396,10 @@ int test_validate(int i)
current_test_status = validate_flatness(i); current_test_status = validate_flatness(i);
break; break;
case TC_ATTEN: case TC_ATTEN:
current_test_status = validate_atten(i); current_test_status = validate_atten(i); // Measures and validates the attenuator
break; break;
case TC_LEVEL: case TC_LEVEL:
current_test_status = validate_level(i, 10.0); current_test_status = validate_level(i);
break; break;
case TC_DISPLAY: case TC_DISPLAY:
current_test_status = validate_display(i); current_test_status = validate_display(i);
@ -4412,7 +4413,7 @@ int test_validate(int i)
test_status[i] = current_test_status; // Must be set before draw_all() !!!!!!!! test_status[i] = current_test_status; // Must be set before draw_all() !!!!!!!!
// draw_frequencies(); // draw_frequencies();
// draw_cal_status(); // draw_cal_status();
redraw_request != REDRAW_CAL_STATUS; redraw_request |= REDRAW_CAL_STATUS;
draw_all(TRUE); draw_all(TRUE);
return current_test_status; return current_test_status;
} }
@ -4497,7 +4498,7 @@ common_silent:
#endif #endif
case TP_30MHZ: case TP_30MHZ:
set_mode(M_LOW); set_mode(M_LOW);
maxFreq = 2000000000; // needed to measure the LPF rejection maxFreq = 9900000000ULL; // needed to measure the LPF rejection
set_refer_output(0); set_refer_output(0);
dirty = true; dirty = true;
// set_step_delay(1); // Do not set !!!!! // set_step_delay(1); // Do not set !!!!!
@ -4695,28 +4696,24 @@ quit:
} else if (test == 2) { // Attenuator test } else if (test == 2) { // Attenuator test
in_selftest = true; in_selftest = true;
reset_settings(M_LOW); reset_settings(M_LOW);
test_prepare(TEST_ATTEN); #if 1
test_acquire(TEST_ATTEN); // Acquire test
test_validate(TEST_ATTEN); // Validate test
#if 0
float reference_peak_level = 0; float reference_peak_level = 0;
for (int j= 0; j < 64; j++ ) { for (int j= 0; j < 64; j++ ) {
test_prepare(TEST_ATTEN); test_prepare(TEST_LEVEL);
set_attenuation(((float)j)/2.0); set_attenuation(((float)j)/2.0);
float summed_peak_level = 0; if (setting.test_argument)
for (int k=0; k<10; k++) { set_sweep_frequency(ST_CENTER, ((freq_t)setting.test_argument) * 1000000ULL);
test_acquire(TEST_ATTEN); // Acquire test ultra_threshold = config.ultra_threshold;
test_validate(TEST_ATTEN); // Validate test test_acquire(TEST_LEVEL); // Acquire test
summed_peak_level += peakLevel; test_validate(TEST_LEVEL); // Validate test
}
float peaklevel = 0.0;
for (int k = 0 ; k < sweep_points; k++)
peaklevel += actual_t[k];
peaklevel /= sweep_points;
if (j == 0) if (j == 0)
reference_peak_level = peaklevel; reference_peak_level = peakLevel;
shell_printf("Attenuation %.2fdB, measured level %.2fdBm, delta %.2fdB\n\r",((float)j)/2.0, peaklevel, peaklevel - reference_peak_level); shell_printf("Attenuation %.2fdB, measured level %.2fdBm, delta %.2fdB\n\r",((float)j)/2.0, peakLevel, peakLevel - reference_peak_level);
} }
#else
test_prepare(TEST_ATTEN);
test_acquire(TEST_ATTEN); // Acquire test
test_validate(TEST_ATTEN); // Validate test
#endif #endif
reset_settings(M_LOW); reset_settings(M_LOW);
#endif #endif
@ -4897,7 +4894,7 @@ quit:
break; break;
} }
} else if (test == 6) { } else if (test == 6) {
in_selftest = true; // Spur search in_selftest = true; // MCU Spur search
reset_settings(M_LOW); reset_settings(M_LOW);
test_prepare(TEST_SPUR); test_prepare(TEST_SPUR);
set_RBW(300); set_RBW(300);
@ -4925,6 +4922,7 @@ quit:
j = setting.test_argument; j = setting.test_argument;
test_prepare(TEST_LEVEL); test_prepare(TEST_LEVEL);
setting.rbw_x10 = force_rbw(j); setting.rbw_x10 = force_rbw(j);
osalThreadSleepMilliseconds(200);
test_acquire(TEST_LEVEL); // Acquire test test_acquire(TEST_LEVEL); // Acquire test
test_validate(TEST_LEVEL); // Validate test test_validate(TEST_LEVEL); // Validate test
if (j == SI4432_RBW_count-1) if (j == SI4432_RBW_count-1)
@ -5019,8 +5017,8 @@ again:
// set_RBW(6000); // set_RBW(6000);
#else #else
set_RBW(8500); set_RBW(8500);
set_attenuation(10);
#endif #endif
set_attenuation(10);
test_acquire(test_case); // Acquire test test_acquire(test_case); // Acquire test
local_test_status = test_validate(test_case); // Validate test local_test_status = test_validate(test_case); // Validate test
#else #else
@ -5031,6 +5029,7 @@ again:
#endif #endif
test_prepare(test_case); test_prepare(test_case);
set_RBW(8500); set_RBW(8500);
set_attenuation(10);
test_acquire(test_case); // Acquire test test_acquire(test_case); // Acquire test
local_test_status = test_validate(test_case); // Validate test also sets attenuation if zero span local_test_status = test_validate(test_case); // Validate test also sets attenuation if zero span
#endif #endif

2
si4468.c
Unescape View File

@ -1149,6 +1149,7 @@ void ADF4351_CP(int p)
void ADF4351_drive(int p) void ADF4351_drive(int p)
{ {
p &= 0x03;
registers[4] &= ~ (((unsigned long)0x3) << 3); registers[4] &= ~ (((unsigned long)0x3) << 3);
registers[4] |= (((unsigned long)p) << 3); registers[4] |= (((unsigned long)p) << 3);
ADF4351_Set(0); ADF4351_Set(0);
@ -1156,6 +1157,7 @@ void ADF4351_drive(int p)
void ADF4351_aux_drive(int p) void ADF4351_aux_drive(int p)
{ {
p &= 0x03;
registers[4] &= ~ (((unsigned long)0x3) << 6); registers[4] &= ~ (((unsigned long)0x3) << 6);
registers[4] |= (((unsigned long)p) << 6); registers[4] |= (((unsigned long)p) << 6);
ADF4351_Set(0); ADF4351_Set(0);

1
ui_sa.c
Unescape View File

@ -1652,6 +1652,7 @@ static const menuitem_t menu_load_preset[] =
}; };
#ifdef TINYSA4 #ifdef TINYSA4
static const menuitem_t menu_mixer_drive[] = { static const menuitem_t menu_mixer_drive[] = {
{ MT_ADV_CALLBACK, 5, "Auto", menu_mixer_drive_acb},
{ MT_ADV_CALLBACK, 3, "%+ddBm", menu_mixer_drive_acb}, { MT_ADV_CALLBACK, 3, "%+ddBm", menu_mixer_drive_acb},
{ MT_ADV_CALLBACK, 2, "%+ddBm", menu_mixer_drive_acb}, { MT_ADV_CALLBACK, 2, "%+ddBm", menu_mixer_drive_acb},
{ MT_ADV_CALLBACK, 1, "%+ddBm", menu_mixer_drive_acb}, { MT_ADV_CALLBACK, 1, "%+ddBm", menu_mixer_drive_acb},

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.