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

Merge branch 'master' into tinySA-V4-SI4463

Browse Source
Removed_REF_marker
erikkaashoek 5 years ago
parent e8d23a7047 5162b521a0
commit 36d27d4caa
4 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File

13
main.c
Unescape View File

@ -953,13 +953,16 @@ config_t config = {
.low_level_output_offset = 0.0, // Uncalibrated .low_level_output_offset = 0.0, // Uncalibrated
.high_level_output_offset = 0.0, // Uncalibrated .high_level_output_offset = 0.0, // Uncalibrated
#ifdef TINYSA3 #ifdef TINYSA3
.correction_frequency = { 10000, 100000, 200000, 500000, 50000000, 140000000, 200000000, 300000000, 330000000, 350000000 }, .low_correction_frequency = { 10000, 100000, 200000, 500000, 50000000, 140000000, 200000000, 300000000, 330000000, 350000000 },
.correction_value = { +6.0, +2.8, +1.6, -0.4, 0.0, -0.4, +0.4, +3.0, +4.0, +8.1 }, .low_correction_value = { +6.0, +2.8, +1.6, -0.4, 0.0, -0.4, +0.4, +3.0, +4.0, +8.1 },
.high_correction_frequency = { 240000000, 280000000, 300000000, 400000000, 500000000, 600000000, 700000000, 800000000, 900000000, 960000000 },
.high_correction_value = { 0, 0, 0, 0, 0.0, 0, 0, 0, 0, 0 },
#endif #endif
#ifdef TINYSA4 #ifdef TINYSA4
.correction_frequency = { 10000, 100000, 200000, 500000, 1000000000U, 1500000000U, 2500000000U, 2800000000U, 3000000000U, 3300000000U }, .low_correction_frequency = { 10000, 100000, 200000, 500000, 50000000, 140000000, 200000000, 300000000, 330000000, 350000000 },
.correction_value = { 0, 0, 0, 0, 0.0, 0, 0, 0, 0, 0 }, .low_correction_value = { 0, 0, 0, 0, 0.0, 0, 0, 0, 0, 0 },
// .correction_value = { 0, 0, 0, 0, 0.0, 1.5, 3, 6, 10, 10 }, .high_correction_frequency = { 10000, 100000, 200000, 500000, 50000000, 140000000, 200000000, 300000000, 330000000, 350000000 },
.high_correction_value = { 0, 0, 0, 0, 0.0, 0, 0, 0, 0, 0 },
#endif #endif
.setting_frequency_30mhz = 30000000, .setting_frequency_30mhz = 30000000,
.cor_am = -5, .cor_am = -5,

4
nanovna.h
Unescape View File

@ -573,6 +573,8 @@ typedef struct config {
float high_level_output_offset; float high_level_output_offset;
freq_t low_correction_frequency[CORRECTION_POINTS]; freq_t low_correction_frequency[CORRECTION_POINTS];
float low_correction_value[CORRECTION_POINTS]; float low_correction_value[CORRECTION_POINTS];
freq_t high_correction_frequency[CORRECTION_POINTS];
float high_correction_value[CORRECTION_POINTS];
uint32_t deviceid; uint32_t deviceid;
freq_t setting_frequency_30mhz; freq_t setting_frequency_30mhz;
@ -880,6 +882,8 @@ typedef struct setting
int extra_lna; int extra_lna;
int ultra; int ultra;
int R; int R;
freq_t *correction_frequency;
float *correction_value;
uint32_t dummy; uint32_t dummy;
uint32_t checksum; // must be last uint32_t checksum; // must be last
}setting_t; }setting_t;

10
sa_cmd.c
Unescape View File

@ -730,13 +730,13 @@ VNA_SHELL_FUNCTION(cmd_correction)
if (argc == 0) { if (argc == 0) {
shell_printf("index frequency value\r\n"); shell_printf("index frequency value\r\n");
for (int i=0; i<CORRECTION_POINTS; i++) { for (int i=0; i<CORRECTION_POINTS; i++) {
shell_printf("%d %Ld %.1f\r\n", i, config.correction_frequency[i], config.correction_value[i]); shell_printf("%d %Ld %.1f\r\n", i, setting.correction_frequency[i], setting.correction_value[i]);
} }
return; return;
} }
if (argc == 1 && (strcmp(argv[0],"reset") == 0)) { if (argc == 1 && (strcmp(argv[0],"reset") == 0)) {
for (int i=0; i<CORRECTION_POINTS; i++) { for (int i=0; i<CORRECTION_POINTS; i++) {
config.correction_value[i] = 0.0; setting.correction_value[i] = 0.0;
} }
shell_printf("correction table reset\r\n"); shell_printf("correction table reset\r\n");
return; return;
@ -748,10 +748,10 @@ VNA_SHELL_FUNCTION(cmd_correction)
int i = my_atoi(argv[0]); int i = my_atoi(argv[0]);
freq_t f = my_atoui(argv[1]); freq_t f = my_atoui(argv[1]);
float v = my_atof(argv[2]); float v = my_atof(argv[2]);
config.correction_frequency[i] = f; setting.correction_frequency[i] = f;
config.correction_value[i] = v; setting.correction_value[i] = v;
redraw_request|=REDRAW_AREA; // to ensure the change in level will be visible redraw_request|=REDRAW_AREA; // to ensure the change in level will be visible
shell_printf("updated %d to %Ld %.1f\r\n", i, config.correction_frequency[i], config.correction_value[i]); shell_printf("updated %d to %Ld %.1f\r\n", i, setting.correction_frequency[i], setting.correction_value[i]);
} }
VNA_SHELL_FUNCTION(cmd_scanraw) VNA_SHELL_FUNCTION(cmd_scanraw)

26
sa_core.c
Unescape View File

@ -184,6 +184,8 @@ void reset_settings(int m)
setting.sweep_time_us = 0; setting.sweep_time_us = 0;
setting.lo_drive=1; setting.lo_drive=1;
setting.extra_lna = false; setting.extra_lna = false;
setting.correction_frequency = config.low_correction_frequency;
setting.correction_value = config.low_correction_value;
break; break;
#ifdef __ULTRA__ #ifdef __ULTRA__
case M_ULTRA: case M_ULTRA:
@ -201,12 +203,16 @@ void reset_settings(int m)
setting.sweep_time_us = 10*ONE_SECOND_TIME; setting.sweep_time_us = 10*ONE_SECOND_TIME;
setting.step_delay_mode = SD_FAST; setting.step_delay_mode = SD_FAST;
setting.extra_lna = false; setting.extra_lna = false;
setting.correction_frequency = config.low_correction_frequency;
setting.correction_value = config.low_correction_value;
break; break;
case M_HIGH: case M_HIGH:
set_sweep_frequency(ST_START, minFreq); set_sweep_frequency(ST_START, minFreq);
set_sweep_frequency(ST_STOP, maxFreq); set_sweep_frequency(ST_STOP, maxFreq);
setting.sweep_time_us = 0; setting.sweep_time_us = 0;
setting.extra_lna = false; setting.extra_lna = false;
setting.correction_frequency = config.high_correction_frequency;
setting.correction_value = config.high_correction_value;
break; break;
case M_GENHIGH: case M_GENHIGH:
setting.lo_drive=1; setting.lo_drive=1;
@ -215,6 +221,8 @@ void reset_settings(int m)
setting.sweep_time_us = 10*ONE_SECOND_TIME; setting.sweep_time_us = 10*ONE_SECOND_TIME;
setting.step_delay_mode = SD_FAST; setting.step_delay_mode = SD_FAST;
setting.extra_lna = false; setting.extra_lna = false;
setting.correction_frequency = config.high_correction_frequency;
setting.correction_value = config.high_correction_value;
break; break;
} }
for (uint8_t i = 0; i< MARKERS_MAX; i++) { for (uint8_t i = 0; i< MARKERS_MAX; i++) {
@ -1169,11 +1177,11 @@ static int32_t scaled_correction_value[CORRECTION_POINTS];
void calculate_correction(void) void calculate_correction(void)
{ {
scaled_correction_value[0] = config.correction_value[0] * (1 << (SCALE_FACTOR)); scaled_correction_value[0] = setting.correction_value[0] * (1 << (SCALE_FACTOR));
for (int i = 1; i < CORRECTION_POINTS; i++) { for (int i = 1; i < CORRECTION_POINTS; i++) {
scaled_correction_value[i] = config.correction_value[i] * (1 << (SCALE_FACTOR)); scaled_correction_value[i] = setting.correction_value[i] * (1 << (SCALE_FACTOR));
int32_t m = scaled_correction_value[i] - scaled_correction_value[i-1]; int32_t m = scaled_correction_value[i] - scaled_correction_value[i-1];
int32_t d = (config.correction_frequency[i] - config.correction_frequency[i-1]) >> SCALE_FACTOR; int32_t d = (setting.correction_frequency[i] - setting.correction_frequency[i-1]) >> SCALE_FACTOR;
scaled_correction_multi[i] = (int32_t) ( m / d ); scaled_correction_multi[i] = (int32_t) ( m / d );
} }
} }
@ -1183,7 +1191,7 @@ void calculate_correction(void)
pureRSSI_t get_frequency_correction(freq_t f) // Frequency dependent RSSI correction to compensate for imperfect LPF pureRSSI_t get_frequency_correction(freq_t f) // Frequency dependent RSSI correction to compensate for imperfect LPF
{ {
pureRSSI_t cv = 0; pureRSSI_t cv = 0;
if (!(setting.mode == M_LOW || setting.mode == M_GENLOW)) if (setting.mode == M_GENHIGH)
return(0.0); return(0.0);
if (setting.extra_lna) { if (setting.extra_lna) {
@ -1199,7 +1207,7 @@ pureRSSI_t get_frequency_correction(freq_t f) // Frequency dependent RSSI c
} }
int i = 0; int i = 0;
while (f > config.correction_frequency[i] && i < CORRECTION_POINTS) while (f > setting.correction_frequency[i] && i < CORRECTION_POINTS)
i++; i++;
if (i >= CORRECTION_POINTS) { if (i >= CORRECTION_POINTS) {
cv += scaled_correction_value[CORRECTION_POINTS-1] >> (SCALE_FACTOR - 5); cv += scaled_correction_value[CORRECTION_POINTS-1] >> (SCALE_FACTOR - 5);
@ -1209,11 +1217,11 @@ pureRSSI_t get_frequency_correction(freq_t f) // Frequency dependent RSSI c
cv += scaled_correction_value[0] >> (SCALE_FACTOR - 5); cv += scaled_correction_value[0] >> (SCALE_FACTOR - 5);
goto done; goto done;
} }
f = f - config.correction_frequency[i-1]; f = f - setting.correction_frequency[i-1];
#if 0 #if 0
freq_t m = (config.correction_frequency[i] - config.correction_frequency[i-1]) >> SCALE_FACTOR ; freq_t m = (setting.correction_frequency[i] - setting.correction_frequency[i-1]) >> SCALE_FACTOR ;
float multi = (config.correction_value[i] - config.correction_value[i-1]) * (1 << (SCALE_FACTOR -1)) / (float)m; float multi = (setting.correction_value[i] - setting.correction_value[i-1]) * (1 << (SCALE_FACTOR -1)) / (float)m;
float cv = config.correction_value[i-1] + ((f >> SCALE_FACTOR) * multi) / (float)(1 << (SCALE_FACTOR -1)) ; float cv = setting.correction_value[i-1] + ((f >> SCALE_FACTOR) * multi) / (float)(1 << (SCALE_FACTOR -1)) ;
#else #else
int32_t scaled_f = f >> SCALE_FACTOR; int32_t scaled_f = f >> SCALE_FACTOR;
cv += (scaled_correction_value[i-1] + (scaled_f * scaled_correction_multi[i])) >> (SCALE_FACTOR - 5) ; cv += (scaled_correction_value[i-1] + (scaled_f * scaled_correction_multi[i])) >> (SCALE_FACTOR - 5) ;

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.