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

Improved calibration

Browse Source
pull/34/head
erikkaashoek 3 years ago
parent 59475f1ec7
commit 679d222bf0
5 changed files with 186 additions and 173 deletions
Show Stats Download Patch File Download Diff File

14
main.c
Unescape View File

@ -107,7 +107,7 @@ uint8_t completed = false;
uint8_t enable_after_complete = 0; uint8_t enable_after_complete = 0;
#ifdef TINYSA4 #ifdef TINYSA4
static THD_WORKING_AREA(waThread1, 1124); static THD_WORKING_AREA(waThread1, 1224);
#else #else
static THD_WORKING_AREA(waThread1, 768); static THD_WORKING_AREA(waThread1, 768);
bool has_esd = false; bool has_esd = false;
@ -951,7 +951,7 @@ config_t config = {
#endif #endif
#ifdef TINYSA3 #ifdef TINYSA3
.vbat_offset = 500, .vbat_offset = 500,
.low_level_offset = 100, // Uncalibrated .low_level_offset = 0, // Uncalibrated
.high_level_offset = 100, // Uncalibrated .high_level_offset = 100, // Uncalibrated
.correction_frequency = { { 10000, 100000, 200000, 500000, 30000000, 140000000, 200000000, 300000000, 330000000, 350000000 }, .correction_frequency = { { 10000, 100000, 200000, 500000, 30000000, 140000000, 200000000, 300000000, 330000000, 350000000 },
{ 240000000, 280000000, 300000000, 400000000, 500000000, 600000000, 700000000, 800000000, 900000000, 960000000 }}, { 240000000, 280000000, 300000000, 400000000, 500000000, 600000000, 700000000, 800000000, 900000000, 960000000 }},
@ -978,14 +978,15 @@ config_t config = {
.frequency_IF1 = DEFAULT_IF, .frequency_IF1 = DEFAULT_IF,
.frequency_IF2 = 0, .frequency_IF2 = 0,
.ultra_start = ULTRA_AUTO, .ultra_start = ULTRA_AUTO,
.low_level_offset = 100.0, // Uncalibrated .low_level_offset = 0, // Uncalibrated
.high_level_offset = 100, // Uncalibrated .high_level_offset = 0, // Uncalibrated
.lna_level_offset = 0, .lna_level_offset = 0,
.low_level_output_offset = 100.0, // Uncalibrated .low_level_output_offset = 100, // Uncalibrated
.high_level_output_offset = 0, // Uncalibrated, but checking code is not yet present .high_level_output_offset = 0, // Uncalibrated, but checking code is not yet present
.harmonic_level_offset = 10.5, .harmonic_level_offset = 10.5,
.shift1_level_offset = 0.5, .shift1_level_offset = 0.5,
.shift2_level_offset = 3, .shift2_level_offset = 3,
.shift3_level_offset = 0,
.drive1_level_offset = 0, .drive1_level_offset = 0,
.drive2_level_offset = -1.5, .drive2_level_offset = -1.5,
.drive3_level_offset = -0.5, .drive3_level_offset = -0.5,
@ -1025,6 +1026,7 @@ config_t config = {
.cor_wfm = 0, .cor_wfm = 0,
.cor_nfm = 0, .cor_nfm = 0,
.ultra = false, .ultra = false,
.is_calibrated = false,
#ifndef __NEW_SWITCHES__ #ifndef __NEW_SWITCHES__
.high_out_adf4350 = true, .high_out_adf4350 = true,
#endif #endif
@ -2453,8 +2455,10 @@ static void dac_init(void){
} }
#ifdef TINYSA4__ #ifdef TINYSA4__
#undef PULSE
#define PULSE { palClearPad(GPIOB, 14); my_microsecond_delay(2); palSetPad(GPIOB, 14); } #define PULSE { palClearPad(GPIOB, 14); my_microsecond_delay(2); palSetPad(GPIOB, 14); }
#else #else
#undef PULSE
#define PULSE #define PULSE
#endif #endif

9
nanovna.h
Unescape View File

@ -149,6 +149,7 @@
#define DRIVE0_MAX_FREQ 600000000ULL // LO drive 0 #define DRIVE0_MAX_FREQ 600000000ULL // LO drive 0
#define DRIVE1_MAX_FREQ 1200000000ULL // LO drive 1 #define DRIVE1_MAX_FREQ 1200000000ULL // LO drive 1
#define DRIVE2_MAX_FREQ 2100000000ULL // LO drive 2 #define DRIVE2_MAX_FREQ 2100000000ULL // LO drive 2
#define LOW_SHIFT_FREQ 2000000ULL // shift IF to avoid zero Hz within IF
#define USE_SHIFT2_RBW 4000 // use shift2_level_offset if actual_rbw_x10 is larger then this. #define USE_SHIFT2_RBW 4000 // use shift2_level_offset if actual_rbw_x10 is larger then this.
#ifdef __NEW_SWITCHES__ #ifdef __NEW_SWITCHES__
@ -338,7 +339,7 @@ extern bool level_error;
#else #else
extern const int8_t drive_dBm []; extern const int8_t drive_dBm [];
#endif #endif
extern int test_output; extern int force_signal_path;
extern int test_output_switch; extern int test_output_switch;
extern int test_output_drive; extern int test_output_drive;
extern int test_output_attenuate; extern int test_output_attenuate;
@ -367,7 +368,7 @@ int search_is_greater(void);
void set_auto_attenuation(void); void set_auto_attenuation(void);
void set_auto_reflevel(bool); void set_auto_reflevel(bool);
int is_paused(void); int is_paused(void);
void set_actual_power(float); float set_actual_power(float);
void SetGenerate(int); void SetGenerate(int);
void set_RBW(uint32_t rbw_x10); void set_RBW(uint32_t rbw_x10);
#ifdef __VBW__ #ifdef __VBW__
@ -719,6 +720,7 @@ typedef struct config {
float harmonic_level_offset; float harmonic_level_offset;
float shift1_level_offset; float shift1_level_offset;
float shift2_level_offset; float shift2_level_offset;
float shift3_level_offset;
float drive1_level_offset; float drive1_level_offset;
float drive2_level_offset; float drive2_level_offset;
float drive3_level_offset; float drive3_level_offset;
@ -750,6 +752,7 @@ typedef struct config {
freq_t direct_stop; freq_t direct_stop;
int8_t ultra; int8_t ultra;
#endif #endif
uint8_t is_calibrated;
uint8_t _mode; uint8_t _mode;
int8_t cor_am; int8_t cor_am;
int8_t cor_wfm; int8_t cor_wfm;
@ -1669,7 +1672,7 @@ enum {PATH_OFF, PATH_LOW, PATH_DIRECT, PATH_LEAKAGE, PATH_ULTRA, PATH_HIGH};
extern const char *path_text[]; extern const char *path_text[];
extern int signal_path; extern int signal_path;
extern int test_path; extern int test_path;
extern int test_output; extern int force_signal_path;
extern void ADF4351_mux(int R); extern void ADF4351_mux(int R);

22
sa_cmd.c
Unescape View File

@ -353,7 +353,7 @@ VNA_SHELL_FUNCTION(cmd_leveloffset)
{ {
// 0 1 2 // 0 1 2
#ifdef TINYSA4 #ifdef TINYSA4
static const char cmd_mode_list[] = "low|high|switch|receive_switch|out_switch|lna|harmonic|shift1|shift2|drive1|drive2|drive3|direct|direct_lna|ultra|ultra_lna"; static const char cmd_mode_list[] = "low|high|switch|receive_switch|out_switch|lna|harmonic|shift1|shift2|shift3|drive1|drive2|drive3|direct|direct_lna|ultra|ultra_lna";
#else #else
static const char cmd_mode_list[] = "low|high|switch|receive_switch"; static const char cmd_mode_list[] = "low|high|switch|receive_switch";
#endif #endif
@ -371,6 +371,7 @@ VNA_SHELL_FUNCTION(cmd_leveloffset)
shell_printf(p, "harmonic", config.harmonic_level_offset); shell_printf(p, "harmonic", config.harmonic_level_offset);
shell_printf(p, "shift1", config.shift1_level_offset); shell_printf(p, "shift1", config.shift1_level_offset);
shell_printf(p, "shift2", config.shift2_level_offset); shell_printf(p, "shift2", config.shift2_level_offset);
shell_printf(p, "shift3", config.shift3_level_offset);
shell_printf(p, "drive1", config.drive1_level_offset); shell_printf(p, "drive1", config.drive1_level_offset);
shell_printf(p, "drive2", config.drive2_level_offset); shell_printf(p, "drive2", config.drive2_level_offset);
shell_printf(p, "drive3", config.drive3_level_offset); shell_printf(p, "drive3", config.drive3_level_offset);
@ -400,13 +401,14 @@ VNA_SHELL_FUNCTION(cmd_leveloffset)
case 6: config.harmonic_level_offset = v; break; case 6: config.harmonic_level_offset = v; break;
case 7: config.shift1_level_offset = v; break; case 7: config.shift1_level_offset = v; break;
case 8: config.shift2_level_offset = v; break; case 8: config.shift2_level_offset = v; break;
case 9: config.drive1_level_offset = v; break; case 9: config.shift3_level_offset = v; break;
case 10: config.drive2_level_offset = v; break; case 10: config.drive1_level_offset = v; break;
case 11: config.drive3_level_offset = v; break; case 11: config.drive2_level_offset = v; break;
case 12: config.direct_level_offset = v; break; case 12: config.drive3_level_offset = v; break;
case 13: config.direct_lna_level_offset = v; break; case 13: config.direct_level_offset = v; break;
case 14: config.ultra_level_offset = v; break; case 14: config.direct_lna_level_offset = v; break;
case 15: config.ultra_lna_level_offset = v; break; case 15: config.ultra_level_offset = v; break;
case 16: config.ultra_lna_level_offset = v; break;
#endif #endif
default: goto usage; default: goto usage;
} }
@ -1164,7 +1166,7 @@ VNA_SHELL_FUNCTION(cmd_q)
if (argc < 1) { if (argc < 1) {
usage: usage:
usage_printf("q [s0..1|d-1,0..18|a0..63|p0..4]\r\n"); usage_printf("q [s0..1|d-1,0..18|a0..63|p0..4]\r\n");
test_output=false; force_signal_path=false;
test_output_switch = false; test_output_switch = false;
test_output_drive = 0; test_output_drive = 0;
test_output_attenuate = 0; test_output_attenuate = 0;
@ -1173,7 +1175,7 @@ VNA_SHELL_FUNCTION(cmd_q)
return; return;
} }
int i = 0; int i = 0;
test_output=true; force_signal_path=true;
dirty = true; dirty = true;
again: again:
if (argc == 0) if (argc == 0)

302
sa_core.c
Unescape View File

@ -190,7 +190,7 @@ void set_output_step_atten(int s)
void set_output_path(freq_t f, float level) void set_output_path(freq_t f, float level)
{ {
if (test_output) { if (force_signal_path) {
signal_path = test_path; signal_path = test_path;
setting.mixer_output = (signal_path == PATH_ULTRA); setting.mixer_output = (signal_path == PATH_ULTRA);
if (test_output_drive >=0) { if (test_output_drive >=0) {
@ -356,7 +356,7 @@ void set_output_path(freq_t f, float level)
static void calculate_static_correction(void); static void calculate_static_correction(void);
void set_input_path(freq_t f) void set_input_path(freq_t f)
{ {
if (test_output) { if (force_signal_path) {
setting.extra_lna = test_path & 0x01; setting.extra_lna = test_path & 0x01;
switch ((test_path & 0xFE)>>1) { switch ((test_path & 0xFE)>>1) {
case 0: signal_path = PATH_LOW; break; case 0: signal_path = PATH_LOW; break;
@ -403,7 +403,7 @@ void set_input_path(freq_t f)
SI4463_init_rx(); SI4463_init_rx();
break; break;
} }
if (test_output) if (force_signal_path)
calculate_static_correction(); calculate_static_correction();
} }
@ -444,6 +444,7 @@ const freq_t fh_high[] = { 480000000, 960000000, 1920000000, 2880000000, 3840000
uint8_t in_selftest = false; uint8_t in_selftest = false;
uint8_t in_step_test = false; uint8_t in_step_test = false;
uint8_t in_calibration = false; uint8_t in_calibration = false;
uint8_t calibration_stage;
void update_min_max_freq(void) void update_min_max_freq(void)
{ {
@ -533,7 +534,7 @@ void reset_settings(int m)
setting.increased_R = false; setting.increased_R = false;
#endif #endif
update_min_max_freq(); update_min_max_freq();
test_output = false; force_signal_path = false;
setting.frequency_var = 0; setting.frequency_var = 0;
sweep_mode |= SWEEP_ENABLE; sweep_mode |= SWEEP_ENABLE;
setting.unit_scale_index = 0; setting.unit_scale_index = 0;
@ -1430,36 +1431,40 @@ void toggle_normalize(int t)
extern float peakLevel; extern float peakLevel;
void set_actual_power(float o) // Set peak level to known value float set_actual_power(float target_level) // Set peak level to known value
{ {
if (!markers[0].index) if (!in_calibration && !markers[0].index)
return; return 0.0;
float new_offset = o - marker_to_value(0); // measured[markers[0].trace][markers[0].index]; // offset based on difference between measured peak level and known peak level float actual_level = marker_to_value(0);
if (o == 100) new_offset = 0; float offset_correction = target_level - actual_level ; // measured[markers[0].trace][markers[0].index]; // offset based on difference between measured peak level and known peak level
if (target_level == 100) offset_correction = 0;
if (setting.mode == M_HIGH) { if (setting.mode == M_HIGH) {
config.high_level_offset += new_offset; config.high_level_offset += offset_correction;
} else if (setting.mode == M_LOW) { } else if (setting.mode == M_LOW) {
#ifdef TINYSA4 #ifdef TINYSA4
// if (in_calibration && SDU1.config->usbp->state == USB_ACTIVE)
// shell_printf ("stage=%d, target=%5.2f, actual=%5.2f, correction=%5.2f, old correction=%5.2f\r\n", calibration_stage, target_level, actual_level, offset_correction, get_level_offset());
if (signal_path == PATH_ULTRA) { if (signal_path == PATH_ULTRA) {
if (setting.extra_lna) if (setting.extra_lna)
config.ultra_lna_level_offset += new_offset; config.ultra_lna_level_offset += offset_correction;
else else
config.ultra_level_offset += new_offset; config.ultra_level_offset += offset_correction;
} else if (signal_path == PATH_DIRECT) { } else if (signal_path == PATH_DIRECT) {
if (setting.extra_lna) if (setting.extra_lna)
config.direct_lna_level_offset += new_offset; config.direct_lna_level_offset += offset_correction;
else else
config.direct_level_offset += new_offset; config.direct_level_offset += offset_correction;
} else if (setting.extra_lna) } else if (setting.extra_lna)
config.lna_level_offset += new_offset; config.lna_level_offset += offset_correction;
else else
#endif #endif
if (setting.atten_step) if (setting.atten_step)
config.receive_switch_offset += new_offset; config.receive_switch_offset += offset_correction;
else else
config.low_level_offset += new_offset; config.low_level_offset += offset_correction;
} }
dirty = true; dirty = true;
return offset_correction;
// config_save(); // config_save();
// dirty = true; // No HW update required, only status panel refresh // dirty = true; // No HW update required, only status panel refresh
} }
@ -1472,7 +1477,7 @@ float get_level_offset(void)
return(config.high_level_offset); return(config.high_level_offset);
} }
if (setting.mode == M_LOW) { if (setting.mode == M_LOW) {
int lev; float lev;
#ifdef TINYSA4 #ifdef TINYSA4
if (signal_path == PATH_DIRECT) { if (signal_path == PATH_DIRECT) {
if (setting.extra_lna) if (setting.extra_lna)
@ -1505,6 +1510,8 @@ int level_is_calibrated(void)
if (setting.mode == M_HIGH && config.high_level_offset != 100) if (setting.mode == M_HIGH && config.high_level_offset != 100)
return 1; return 1;
if (setting.mode == M_LOW) { if (setting.mode == M_LOW) {
if (!config.is_calibrated)
return 0;
#ifdef TINYSA4 #ifdef TINYSA4
if (setting.extra_lna) { if (setting.extra_lna) {
if (config.lna_level_offset != 100) if (config.lna_level_offset != 100)
@ -2119,7 +2126,10 @@ pureRSSI_t get_frequency_correction(freq_t f) // Frequency dependent RSSI c
c = CORRECTION_LOW_ULTRA; c = CORRECTION_LOW_ULTRA;
if (LO_harmonic) { if (LO_harmonic) {
cv += float_TO_PURE_RSSI(config.harmonic_level_offset); // +10.5dB correction. cv += float_TO_PURE_RSSI(config.harmonic_level_offset); // +10.5dB correction.
} else if (f>MAX_ABOVE_IF_FREQ) {
cv += float_TO_PURE_RSSI(config.shift3_level_offset);
} }
break; break;
#ifdef CORRECTION_DIRECT #ifdef CORRECTION_DIRECT
case PATH_DIRECT: case PATH_DIRECT:
@ -3169,7 +3179,7 @@ static void calculate_static_correction(void) // Calculate the
- get_signal_path_loss() - get_signal_path_loss()
+ float_TO_PURE_RSSI( + float_TO_PURE_RSSI(
#ifndef TINYSA4 #ifndef TINYSA4
+ get_level_offset() + get_level_offset() // Moved to frequency dependent part
#endif #endif
+ get_attenuation() + get_attenuation()
#ifdef TINYSA4 #ifdef TINYSA4
@ -3218,7 +3228,7 @@ void clock_at_48MHz(void)
} }
} }
int test_output = false; int force_signal_path = false;
int test_output_switch = false; int test_output_switch = false;
int test_output_drive = 0; int test_output_drive = 0;
int test_path = 0; int test_path = 0;
@ -3392,7 +3402,7 @@ pureRSSI_t perform(bool break_on_operation, int i, freq_t f, int tracking) /
#else #else
int d; int d;
#if 0 #if 0
if (test_output) { if (force_signal_path) {
setting.atten_step = test_output_switch; setting.atten_step = test_output_switch;
d = test_output_drive; d = test_output_drive;
setting.attenuate_x2 = test_output_attenuate; setting.attenuate_x2 = test_output_attenuate;
@ -3446,7 +3456,7 @@ pureRSSI_t perform(bool break_on_operation, int i, freq_t f, int tracking) /
} }
else if (setting.mode == M_GENHIGH) { else if (setting.mode == M_GENHIGH) {
#ifdef TINYSA4 #ifdef TINYSA4
if (test_output) { if (force_signal_path) {
enable_rx_output(!test_output_switch); enable_rx_output(!test_output_switch);
SI4463_set_output_level(test_output_drive); SI4463_set_output_level(test_output_drive);
} else } else
@ -3800,7 +3810,7 @@ again: // Spur redu
else else
{ {
#ifdef TINYSA4 #ifdef TINYSA4
if (lf<2000000) { // below 2MHz if (lf<LOW_SHIFT_FREQ) { // below 2MHz
local_IF += DEFAULT_SPUR_OFFSET-(actual_rbw_x10 > 1000 ? 200000 : 0); // Shift to avoid zero Hz peak local_IF += DEFAULT_SPUR_OFFSET-(actual_rbw_x10 > 1000 ? 200000 : 0); // Shift to avoid zero Hz peak
LO_shifting = true; LO_shifting = true;
} }
@ -4294,7 +4304,7 @@ again: // Spur redu
#ifdef __SI4463__ #ifdef __SI4463__
pureRSSI = Si446x_RSSI(); pureRSSI = Si446x_RSSI();
if (LO_shifting) if (LO_shifting)
pureRSSI += float_TO_PURE_RSSI(actual_rbw_x10>USE_SHIFT2_RBW ? config.shift2_level_offset : config.shift1_level_offset); pureRSSI += float_TO_PURE_RSSI(actual_rbw_x10>USE_SHIFT2_RBW ? config.shift2_level_offset : (lf < LOW_SHIFT_FREQ ? config.shift1_level_offset: 0.0));
#endif #endif
if (break_on_operation && operation_requested) // allow aborting a wait for trigger if (break_on_operation && operation_requested) // allow aborting a wait for trigger
@ -4332,7 +4342,7 @@ again: // Spur redu
#ifdef TINYSA4 #ifdef TINYSA4
if (SI4432_step_delay && (ADF4351_frequency_changed || SI4463_frequency_changed)) { if (SI4432_step_delay && (ADF4351_frequency_changed || SI4463_frequency_changed)) {
int my_step_delay = SI4432_step_delay; int my_step_delay = SI4432_step_delay;
if (f < 2000000 && actual_rbw_x10 == 3 && !in_step_test) if (f < LOW_SHIFT_FREQ && actual_rbw_x10 == 3 && !in_step_test)
my_step_delay = my_step_delay * 2; my_step_delay = my_step_delay * 2;
// if (LO_spur_shifted) // || SI4463_offset_changed) // if (LO_spur_shifted) // || SI4463_offset_changed)
// my_step_delay = my_step_delay * 2; // my_step_delay = my_step_delay * 2;
@ -4393,7 +4403,7 @@ again: // Spur redu
else { else {
pureRSSI = Si446x_RSSI(); pureRSSI = Si446x_RSSI();
if (LO_shifting) if (LO_shifting)
pureRSSI += float_TO_PURE_RSSI(actual_rbw_x10>USE_SHIFT2_RBW ? config.shift2_level_offset : config.shift1_level_offset); pureRSSI += float_TO_PURE_RSSI(actual_rbw_x10>USE_SHIFT2_RBW ? config.shift2_level_offset : (lf < LOW_SHIFT_FREQ ? config.shift1_level_offset: 0.0));
} }
//#define __DEBUG_FREQUENCY_SETTING__ //#define __DEBUG_FREQUENCY_SETTING__
#ifdef __DEBUG_FREQUENCY_SETTING__ // For debugging the frequency calculation #ifdef __DEBUG_FREQUENCY_SETTING__ // For debugging the frequency calculation
@ -6978,11 +6988,7 @@ abort:
void reset_calibration(void) void reset_calibration(void)
{ {
config.high_level_offset = 100; config.is_calibrated = false;
config.low_level_offset = 100;
#ifdef TINYSA4
config.lna_level_offset = 100;
#endif
} }
void calibrate_modulation(int modulation, int8_t *correction) void calibrate_modulation(int modulation, int8_t *correction)
@ -7004,8 +7010,8 @@ const int power_rbw [5] = { 100, 300, 30, 10, 3 };
#ifdef TINYSA4 #ifdef TINYSA4
#define JUMP_FREQS 4 #define JUMP_FREQS 5
const freq_t jump_freqs[JUMP_FREQS] = {2000000, 2000000, DRIVE1_MAX_FREQ, DRIVE2_MAX_FREQ, }; const freq_t jump_freqs[JUMP_FREQS] = {LOW_SHIFT_FREQ, LOW_SHIFT_FREQ, DRIVE1_MAX_FREQ, DRIVE2_MAX_FREQ, MAX_ABOVE_IF_FREQ };
void set_jump_config(int i, float v) { void set_jump_config(int i, float v) {
@ -7022,6 +7028,9 @@ void set_jump_config(int i, float v) {
case 3: case 3:
config.drive3_level_offset = v; config.drive3_level_offset = v;
break; break;
case 4:
config.shift3_level_offset = v;
break;
} }
} }
@ -7035,6 +7044,8 @@ float get_jump_config(int i) {
return config.drive2_level_offset; return config.drive2_level_offset;
case 3: case 3:
return config.drive3_level_offset; return config.drive3_level_offset;
case 4:
return config.shift3_level_offset;
} }
return 0; return 0;
} }
@ -7109,127 +7120,121 @@ void calibrate(void)
#endif #endif
reset_calibration(); reset_calibration();
in_calibration = true; in_calibration = true;
int calibration_stage = CS_NORMAL; for (calibration_stage = CS_NORMAL; calibration_stage < CS_MAX ; calibration_stage++) {
config.low_level_offset = 0; for (int k = 0; k<3; k++) {
config.high_level_offset = 0; float offset = 0.0;
#ifdef TINYSA4 for (int j= 0; j < CALIBRATE_RBWS; j++ ) {
config.lna_level_offset = 0;
#endif
config.receive_switch_offset = 0;
again:
for (int k = 0; k<2; k++) {
for (int j= 0; j < CALIBRATE_RBWS; j++ ) {
#if 1 #if 1
reset_settings(M_LOW); reset_settings(M_LOW);
set_refer_output(0); set_refer_output(0);
#ifdef TINYSA4 #ifdef TINYSA4
config.ultra = true; // Enable ultra config.ultra = true; // Enable ultra
maxFreq = 12000000000; maxFreq = 12000000000;
ultra = true; ultra = true;
set_attenuation(0); set_attenuation(0);
#else #else
set_attenuation(10); set_attenuation(10);
#endif #endif
set_sweep_frequency(ST_CENTER, 30000000); set_sweep_frequency(ST_CENTER, 30000000);
#ifdef TINYSA4 #ifdef TINYSA4
set_sweep_frequency(ST_SPAN, 1000); set_sweep_frequency(ST_SPAN, 1000);
markers[0].mtype |= M_AVER; markers[0].mtype |= M_AVER;
setting.repeat = 100; setting.repeat = 100;
#else #else
set_sweep_frequency(ST_SPAN, 5000000); set_sweep_frequency(ST_SPAN, 5000000);
setting.repeat = 10; setting.repeat = 10;
#endif #endif
setting.rbw_x10 = 3000; setting.rbw_x10 = 3000;
int test_case = TEST_POWER; int test_case = TEST_POWER;
// setting.atten_step = false; // setting.atten_step = false;
//#ifdef TINYSA4 //#ifdef TINYSA4
// set_extra_lna(false); // set_extra_lna(false);
// setting.below_IF = S_AUTO_OFF; // setting.below_IF = S_AUTO_OFF;
//#endif //#endif
switch(calibration_stage) { switch(calibration_stage) {
case CS_NORMAL: case CS_NORMAL:
break; force_signal_path = false;
case CS_SWITCH: break;
setting.atten_step = true; case CS_SWITCH:
break; setting.atten_step = true;
break;
#ifdef TINYSA4 #ifdef TINYSA4
case CS_ULTRA: case CS_ULTRA:
test_output = true; force_signal_path = true;
test_path = 2; // Ultra path test_path = 2; // Ultra path
break; break;
case CS_ULTRA_LNA: case CS_ULTRA_LNA:
test_output = true; force_signal_path = true;
test_path = 3; // Ultra lna path test_path = 3; // Ultra lna path
break; break;
case CS_LNA: case CS_LNA:
test_output = true; force_signal_path = true;
test_path = 1; // Normal lna path test_path = 1; // Normal lna path
break; break;
case CS_DIRECT_REF: case CS_DIRECT_REF:
set_sweep_frequency(ST_CENTER, DRIRECT_CAL_FREQ); set_sweep_frequency(ST_CENTER, DRIRECT_CAL_FREQ);
test_output = true; force_signal_path = true;
test_path = 0; // Normal path at 900MHz test_path = 0; // Normal path at 900MHz
break; break;
case CS_DIRECT: case CS_DIRECT:
set_sweep_frequency(ST_CENTER, DRIRECT_CAL_FREQ); set_sweep_frequency(ST_CENTER, DRIRECT_CAL_FREQ);
test_output = true; force_signal_path = true;
test_path = 4; // Direct path at 900MHz test_path = 4; // Direct path at 900MHz
break; break;
case CS_DIRECT_LNA: case CS_DIRECT_LNA:
set_sweep_frequency(ST_CENTER, DRIRECT_CAL_FREQ); set_sweep_frequency(ST_CENTER, DRIRECT_CAL_FREQ);
test_output = true; force_signal_path = true;
test_path = 5; // Direct lna path at 900MHz test_path = 5; // Direct lna path at 900MHz
break; break;
#endif #endif
} }
set_average(0, AV_100); set_average(0, AV_100);
for (int m=1; m<=1; m++) { for (int m=1; m<=1; m++) {
test_acquire(test_case); // Acquire test test_acquire(test_case); // Acquire test
local_test_status = test_validate(test_case); local_test_status = test_validate(test_case);
calibration_busy(); calibration_busy();
} }
local_test_status = TS_PASS; local_test_status = TS_PASS;
#else #else
// set_RBW(power_rbw[j]); // set_RBW(power_rbw[j]);
// set_sweep_points(21); // set_sweep_points(21);
#if 0 #if 0
int test_case = TEST_POWER; int test_case = TEST_POWER;
test_prepare(test_case); test_prepare(test_case);
setting.step_delay_mode = SD_PRECISE; setting.step_delay_mode = SD_PRECISE;
#ifndef TINYSA4 #ifndef TINYSA4
setting.agc = S_ON; setting.agc = S_ON;
setting.lna = S_OFF; setting.lna = S_OFF;
// set_RBW(6000); // set_RBW(6000);
#else #else
set_RBW(3000); set_RBW(3000);
#endif #endif
set_attenuation(10); set_attenuation(10);
set_repeat(5); set_repeat(5);
setting.spur_removal = S_OFF; setting.spur_removal = S_OFF;
set_average(0,AV_100); set_average(0,AV_100);
test_acquire(test_case); // Acquire test test_acquire(test_case); // Acquire test
test_acquire(test_case); // Acquire test test_acquire(test_case); // Acquire test
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
int test_case = TEST_LEVEL; int test_case = TEST_LEVEL;
#ifdef TINYSA4 #ifdef TINYSA4
if (calibrate_lna) if (calibrate_lna)
test_case += 1; test_case += 1;
#endif #endif
test_prepare(test_case); test_prepare(test_case);
set_RBW(3000); set_RBW(3000);
set_attenuation(10); set_attenuation(10);
set_average(0,AV_100); set_average(0,AV_100);
test_acquire(test_case); // Acquire test test_acquire(test_case); // Acquire test
test_acquire(test_case); // Acquire test test_acquire(test_case); // Acquire test
test_acquire(test_case); // Acquire test test_acquire(test_case); // Acquire test
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
#endif #endif
if (k ==0 || k == 1) {
if (calibration_stage == CS_NORMAL && peakLevel < -50) { if (calibration_stage == CS_NORMAL && peakLevel < -50) {
ili9341_set_foreground(LCD_BRIGHT_COLOR_RED); ili9341_set_foreground(LCD_BRIGHT_COLOR_RED);
ili9341_drawstring_7x13("Signal level too low", 30, 200); ili9341_drawstring_7x13("Signal level too low", 30, 200);
@ -7241,24 +7246,22 @@ again:
ili9341_set_foreground(LCD_BRIGHT_COLOR_RED); ili9341_set_foreground(LCD_BRIGHT_COLOR_RED);
ili9341_drawstring_7x13("Calibration failed", 30, 200); ili9341_drawstring_7x13("Calibration failed", 30, 200);
goto quit; goto quit;
} else { }
#ifdef TINYSA4 #ifdef TINYSA4
if (calibration_stage == CS_DIRECT_REF) if (calibration_stage == CS_DIRECT_REF)
direct_level = marker_to_value(0); direct_level = marker_to_value(0);
else if (calibration_stage == CS_DIRECT || calibration_stage == CS_DIRECT_LNA) else if (calibration_stage == CS_DIRECT || calibration_stage == CS_DIRECT_LNA)
set_actual_power(direct_level); offset = set_actual_power(direct_level);
else else
#endif #endif
set_actual_power(CAL_LEVEL); // Should be -23.5dBm (V0.2) OR 25 (V0.3) offset = set_actual_power(CAL_LEVEL); // Should be -23.5dBm (V0.2) OR 25 (V0.3)
calibration_busy(); calibration_busy();
chThdSleepMilliseconds(500); chThdSleepMilliseconds(500);
}
} }
if (offset > -0.2 && offset < 0.2)
k = 3;
} }
} }
calibration_stage++;
if (calibration_stage < CS_MAX)
goto again;
setting.below_IF = S_AUTO_OFF; setting.below_IF = S_AUTO_OFF;
in_calibration = false; in_calibration = false;
#ifdef TINYSA4 #ifdef TINYSA4
@ -7292,6 +7295,7 @@ again:
} }
#endif #endif
config.is_calibrated = true;
config_save(); config_save();
ili9341_set_foreground(LCD_BRIGHT_COLOR_GREEN); ili9341_set_foreground(LCD_BRIGHT_COLOR_GREEN);
ili9341_drawstring_7x13("Calibration complete", 40, 200); ili9341_drawstring_7x13("Calibration complete", 40, 200);

12
ui_sa.c
Unescape View File

@ -698,7 +698,7 @@ static UI_FUNCTION_CALLBACK(menu_input_curve_prepare_cb)
{ {
(void)item; (void)item;
(void)data; (void)data;
if (config.low_level_offset == 100) if (!config.is_calibrated)
return; return;
kp_help_text = "Enter actual input level"; kp_help_text = "Enter actual input level";
kp_buf[0]=0; kp_buf[0]=0;
@ -714,7 +714,7 @@ static UI_FUNCTION_CALLBACK(menu_lna_curve_prepare_cb)
{ {
(void)item; (void)item;
(void)data; (void)data;
if (config.low_level_offset == 100) if (!config.is_calibrated)
return; return;
kp_help_text = "Enter actual input level"; kp_help_text = "Enter actual input level";
kp_buf[0]=0; kp_buf[0]=0;
@ -730,7 +730,7 @@ static UI_FUNCTION_CALLBACK(menu_lna_u_curve_prepare_cb)
{ {
(void)item; (void)item;
(void)data; (void)data;
if (config.low_level_offset == 100) if (!config.is_calibrated)
return; return;
kp_help_text = "Enter actual input level"; kp_help_text = "Enter actual input level";
kp_buf[0]=0; kp_buf[0]=0;
@ -746,7 +746,7 @@ static UI_FUNCTION_CALLBACK(menu_ultra_curve_prepare_cb)
{ {
(void)item; (void)item;
(void)data; (void)data;
if (config.low_level_offset == 100) if (!config.is_calibrated)
return; return;
kp_help_text = "Enter actual input level"; kp_help_text = "Enter actual input level";
kp_buf[0]=0; kp_buf[0]=0;
@ -1021,7 +1021,7 @@ static UI_FUNCTION_ADV_CALLBACK(menu_lowoutput_settings_acb)
if (b){ if (b){
if (data == 255) { if (data == 255) {
plot_printf(mode_string, sizeof mode_string, "%s %s %s %s", plot_printf(mode_string, sizeof mode_string, "%s %s %s %s",
(!test_output ? "" : path_text[test_path]), (!force_signal_path ? "" : path_text[test_path]),
(get_sweep_frequency(ST_START) < MINIMUM_DIRECT_FREQ ? "SINUS" : "" ), (get_sweep_frequency(ST_START) < MINIMUM_DIRECT_FREQ ? "SINUS" : "" ),
(get_sweep_frequency(ST_STOP) >= MINIMUM_DIRECT_FREQ ? "SQUARE WAVE" : ""), (get_sweep_frequency(ST_STOP) >= MINIMUM_DIRECT_FREQ ? "SQUARE WAVE" : ""),
(get_sweep_frequency(ST_STOP) > MAX_LOW_OUTPUT_FREQ && setting.mixer_output ? "MIXER" : "")); (get_sweep_frequency(ST_STOP) > MAX_LOW_OUTPUT_FREQ && setting.mixer_output ? "MIXER" : ""));
@ -3978,7 +3978,7 @@ redraw_cal_status:
y += 2*YSTEP + YSTEP/2; y += 2*YSTEP + YSTEP/2;
} }
if (test_output){ if (force_signal_path){
ili9341_set_foreground(LCD_BRIGHT_COLOR_RED); ili9341_set_foreground(LCD_BRIGHT_COLOR_RED);
lcd_printf(x, y, "Path:\n%s", path_text[signal_path]); lcd_printf(x, y, "Path:\n%s", path_text[signal_path]);
y += 2*YSTEP + YSTEP/2; y += 2*YSTEP + YSTEP/2;

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.