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

Improved output correction table

Browse Source
Removed_REF_marker
erikkaashoek 5 years ago
parent 47a4b2fadc
commit ecd7d207e3
3 changed files with 53 additions and 19 deletions
Show Stats Download Patch File Download Diff File

12
main.c
Unescape View File

@ -1014,19 +1014,19 @@ config_t config = {
.low_level_offset = 100.0, // Uncalibrated .low_level_offset = 100.0, // Uncalibrated
.high_level_offset = 100.0, // Uncalibrated .high_level_offset = 100.0, // Uncalibrated
.lna_level_offset = 100, .lna_level_offset = 100,
.low_level_output_offset = 0.0, // Uncalibrated .low_level_output_offset = 100.0, // Uncalibrated
.high_level_output_offset = 0.0, // Uncalibrated .high_level_output_offset = 100.0, // Uncalibrated
.correction_frequency = .correction_frequency =
{ {
{ 10000, 100000, 300000, 1000000, 30000000, 500000000, 750000000, 750000010, 1000000000, 1500000000, 1520000000, 2000000000, 2500000000, 3000000000, 3500000000, 4000000000, 4500000000, 5000000000, 5500000000, 6000000000 }, { 10000, 100000, 300000, 1000000, 30000000, 500000000, 750000000, 750000010, 1000000000, 1500000000, 1520000000, 2000000000, 2500000000, 3000000000, 3500000000, 4000000000, 4500000000, 5000000000, 5500000000, 6000000000 },
{ 10000, 100000, 300000, 1000000, 30000000, 500000000, 750000000, 750000010, 1000000000, 1500000000, 1520000000, 2000000000, 2500000000, 3000000000, 3500000000, 4000000000, 4500000000, 5000000000, 5500000000, 6000000000 }, { 10000, 100000, 300000, 1000000, 30000000, 500000000, 750000000, 750000010, 1000000000, 1500000000, 1520000000, 2000000000, 2500000000, 3000000000, 3500000000, 4000000000, 4500000000, 5000000000, 5500000000, 6000000000 },
{ 10000, 100000, 300000, 1000000, 30000000, 500000000, 750000000, 750000010, 1000000000, 1500000000, 1520000000, 2000000000, 2500000000, 3000000000, 3500000000, 4000000000, 4500000000, 5000000000, 5500000000, 6000000000 }, { 10000, 80000, 150000, 300000, 1000000, 5000000, 80000000, 180000000, 650000000, 700000000, 760000000, 780000000, 790000000, 800000000, 800000000, 800000000, 800000000, 800000000, 800000000, 800000000 },
}, },
.correction_value = .correction_value =
{ {
{ 10.5, +4.9, +1.6, +0.6, 0, 0, +2, +0, +2, +2, +2, +2, +3.5, +6.5, +6.5, +9, +9, +9, +11, +11,}, { 10.5, +4.9, +1.6, +0.6, 0, 0, +2, +0, +2, +2, +2, +2, +3.5, +6.5, +6.5, +9, +9, +9, +11, +11,}, // low in
{ 10.5, +4.9, +1.6, +0.6, 0, 0, +2, +0, +2, +2, +2, +2, +6, +9, +11.5, +14.5, +23, +25, +36, +46,}, { 10.5, +4.9, +1.6, +0.6, 0, 0, +2, +0, +2, +2, +2, +2, +6, +9, +11.5, +14.5, +23, +25, +36, +46,}, // LNA in
{ 10.5, +4.9, +1.6, +0.6, 0, 0, +2, +0, +2, +2, +2, +2, +3.5, +6.5, +6.5, +9, +9, +9, +11, +11,}, { 11.5, 6, 3.5, 1.5, 0.5, -0.2, 0, -0.5, +1.5, +2, +4, +6.5, +9, +13, +13, +13, +13, +13, +13, +13, }, // low out
}, },
.setting_frequency_30mhz = 30000000, .setting_frequency_30mhz = 30000000,
.cor_am = 0, .cor_am = 0,

6
nanovna.h
Unescape View File

@ -392,8 +392,14 @@ void set_IF2(int f);
void set_R(int f); void set_R(int f);
extern void set_modulo(uint32_t f); extern void set_modulo(uint32_t f);
extern void fill_spur_table(void); extern void fill_spur_table(void);
extern float low_out_offset(void);
extern float high_out_offset(void);
#define LOW_OUT_OFFSET low_out_offset()
#define HIGH_OUT_OFFSET high_out_offset()
#else #else
void set_10mhz(freq_t); void set_10mhz(freq_t);
#define LOW_OUT_OFFSET config.low_level_output_offset
#define HIGH_OUT_OFFSET config.high_level_output_offset
#endif #endif
#ifdef __AUDIO__ #ifdef __AUDIO__

54
sa_core.c
Unescape View File

@ -296,8 +296,8 @@ void reset_settings(int m)
#endif #endif
setting.correction_frequency = config.correction_frequency[CORRECTION_LOW_OUT]; setting.correction_frequency = config.correction_frequency[CORRECTION_LOW_OUT];
setting.correction_value = config.correction_value[CORRECTION_LOW_OUT]; setting.correction_value = config.correction_value[CORRECTION_LOW_OUT];
level_min = SL_GENLOW_LEVEL_MIN + config.low_level_output_offset; level_min = SL_GENLOW_LEVEL_MIN + LOW_OUT_OFFSET;
level_max = SL_GENLOW_LEVEL_MAX + config.low_level_output_offset; level_max = SL_GENLOW_LEVEL_MAX + LOW_OUT_OFFSET;
level_range = level_max - level_min; level_range = level_max - level_min;
break; break;
case M_HIGH: case M_HIGH:
@ -668,7 +668,7 @@ float level_min(void)
{ {
int l; int l;
if (setting.mode == M_GENLOW) if (setting.mode == M_GENLOW)
l = SL_GENLOW_LEVEL_MIN + config.low_level_output_offset; l = SL_GENLOW_LEVEL_MIN + LOW_OUT_OFFSET;
else else
l = SL_GENHIGH_LEVEL_MIN + config.high_level_output_offset; l = SL_GENHIGH_LEVEL_MIN + config.high_level_output_offset;
return l; return l;
@ -677,7 +677,7 @@ float level_min(void)
float level_max(void) float level_max(void)
{ {
if (setting.mode == M_GENLOW) if (setting.mode == M_GENLOW)
return SL_GENLOW_LEVEL_MAX + config.low_level_output_offset; return SL_GENLOW_LEVEL_MAX + LOW_OUT_OFFSET;
else else
return SL_GENHIGH_LEVEL_MAX + config.high_level_output_offset; return SL_GENHIGH_LEVEL_MAX + config.high_level_output_offset;
} }
@ -690,6 +690,33 @@ float level_range(void)
} }
#endif #endif
#ifdef TINYSA4
float low_out_offset()
{
if (config.low_level_output_offset == 100)
{
if (config.low_level_offset == 100)
return 0;
else
return config.low_level_offset;
} else
return config.low_level_output_offset;
}
float high_out_offset()
{
if (config.high_level_output_offset == 100)
{
if (config.high_level_offset == 100)
return 0;
else
return config.high_level_offset;
} else
return config.high_level_output_offset;
}
#endif
static pureRSSI_t get_signal_path_loss(void){ static pureRSSI_t get_signal_path_loss(void){
#ifdef TINYSA4 #ifdef TINYSA4
if (setting.mode == M_LOW) if (setting.mode == M_LOW)
@ -722,13 +749,13 @@ void set_level(float v) // Set the output level in dB in high/low output
set_lo_drive(d); set_lo_drive(d);
#endif #endif
} else { // This MUST be low output level } else { // This MUST be low output level
v -= config.low_level_output_offset; v -= LOW_OUT_OFFSET;
if (v < SL_GENLOW_LEVEL_MIN) if (v < SL_GENLOW_LEVEL_MIN)
v = SL_GENLOW_LEVEL_MIN; v = SL_GENLOW_LEVEL_MIN;
if (v > SL_GENLOW_LEVEL_MAX) if (v > SL_GENLOW_LEVEL_MAX)
v = SL_GENLOW_LEVEL_MAX; v = SL_GENLOW_LEVEL_MAX;
v += config.low_level_output_offset; v += LOW_OUT_OFFSET;
// set_attenuation(setting.level - config.low_level_output_offset); // set_attenuation(setting.level - LOW_OUT_OFFSET);
} }
setting.level = v; setting.level = v;
dirty = true; dirty = true;
@ -740,7 +767,7 @@ float get_level(void)
if (setting.mode == M_GENHIGH) { if (setting.mode == M_GENHIGH) {
return v; // drive_dBm[setting.lo_drive] + config.high_level_output_offset; return v; // drive_dBm[setting.lo_drive] + config.high_level_output_offset;
} else { } else {
// setting.level = get_attenuation() + config.low_level_output_offset; // setting.level = get_attenuation() + LOW_OUT_OFFSET;
return setting.level; return setting.level;
} }
#endif #endif
@ -923,7 +950,7 @@ float get_level_offset(void)
} }
} }
if (setting.mode == M_GENLOW) { if (setting.mode == M_GENLOW) {
return(config.low_level_output_offset); return(LOW_OUT_OFFSET);
} }
if (setting.mode == M_GENHIGH) { if (setting.mode == M_GENHIGH) {
return(config.high_level_output_offset); return(config.high_level_output_offset);
@ -2562,7 +2589,7 @@ pureRSSI_t perform(bool break_on_operation, int i, freq_t f, int tracking) /
ls -= 0.5; ls -= 0.5;
float a = ((int)((setting.level + ((float)i / sweep_points) * ls)*2.0)) / 2.0; float a = ((int)((setting.level + ((float)i / sweep_points) * ls)*2.0)) / 2.0;
correct_RSSI_freq = get_frequency_correction(f); correct_RSSI_freq = get_frequency_correction(f);
a += PURE_TO_float(correct_RSSI_freq); a += PURE_TO_float(correct_RSSI_freq) + 3.0; // Always 3dB in attenuator
if (a != old_a) { if (a != old_a) {
int very_low_flag = false; int very_low_flag = false;
old_a = a; old_a = a;
@ -2602,11 +2629,12 @@ pureRSSI_t perform(bool break_on_operation, int i, freq_t f, int tracking) /
#ifdef __SI4463__ #ifdef __SI4463__
SI4463_set_output_level(d); SI4463_set_output_level(d);
#endif #endif
a -= 3.0; // Always at least 3dB attenuation
if (a > 0) if (a > 0)
a = 0; a = 0;
if (a < -31.5) if (a < -31.5)
a = -31.5; a = -31.5;
a = -a; a = -a - 0.25; // Rounding
#ifdef __PE4302__ #ifdef __PE4302__
setting.attenuate_x2 = (int)(a * 2); setting.attenuate_x2 = (int)(a * 2);
PE4302_Write_Byte(setting.attenuate_x2); PE4302_Write_Byte(setting.attenuate_x2);
@ -2674,10 +2702,10 @@ pureRSSI_t perform(bool break_on_operation, int i, freq_t f, int tracking) /
if (setting.frequency_step != 0) if (setting.frequency_step != 0)
correct_RSSI_freq = get_frequency_correction(f); correct_RSSI_freq = get_frequency_correction(f);
} }
//#define DEBUG_CORRECTION // #define DEBUG_CORRECTION
#ifdef DEBUG_CORRECTION #ifdef DEBUG_CORRECTION
if (SDU1.config->usbp->state == USB_ACTIVE) { if (SDU1.config->usbp->state == USB_ACTIVE) {
shell_printf ("%d:%Q %d\r\n", i, f, correct_RSSI_freq); shell_printf ("%d:%Q %f\r\n", i, f, PURE_TO_float(correct_RSSI_freq));
osalThreadSleepMilliseconds(2); osalThreadSleepMilliseconds(2);
} }
#endif #endif

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.