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

Freq_t errors corrected

Browse Source
Removed_REF_marker
erikkaashoek 5 years ago
parent 731946b16d
commit bc36944f24
2 changed files with 75 additions and 43 deletions
Show Stats Download Patch File Download Diff File

4
nanovna.h
Unescape View File

@ -72,7 +72,9 @@
#define DEFAULT_MAX_FREQ ((freq_t)800000000) #define DEFAULT_MAX_FREQ ((freq_t)800000000)
#define HIGH_MIN_FREQ_MHZ 136// 825 #define HIGH_MIN_FREQ_MHZ 136// 825
#define HIGH_MAX_FREQ_MHZ 1130 #define HIGH_MAX_FREQ_MHZ 1130
#define ULTRA_MAX_FREQ 5290000000ULL #define ULTRA_MAX_FREQ 5350000000ULL
//#define ULTRA_MAX_FREQ 2900000000ULL
#define MAX_LO_FREQ 4350000000ULL
#define LOW_MAX_FREQ 800000000ULL #define LOW_MAX_FREQ 800000000ULL
#endif #endif
/* /*

114
sa_core.c
Unescape View File

@ -47,13 +47,13 @@ int high_out_adf4350 = true;
int debug_frequencies = false; int debug_frequencies = false;
static unsigned long old_freq[5] = { 0, 0, 0, 0,0}; static freq_t old_freq[5] = { 0, 0, 0, 0,0};
static unsigned long real_old_freq[5] = { 0, 0, 0, 0,0}; static freq_t real_old_freq[5] = { 0, 0, 0, 0,0};
static long real_offset = 0; static long real_offset = 0;
void clear_frequency_cache(void) void clear_frequency_cache(void)
{ {
for (unsigned int i = 0; i < sizeof(old_freq)/sizeof(unsigned long) ; i++) { for (unsigned int i = 0; i < sizeof(old_freq)/sizeof(freq_t) ; i++) {
old_freq[i] = 0; old_freq[i] = 0;
real_old_freq[i] = 0; real_old_freq[i] = 0;
} }
@ -92,7 +92,7 @@ void update_min_max_freq(void)
case M_GENHIGH: case M_GENHIGH:
if (high_out_adf4350) { if (high_out_adf4350) {
minFreq = 136000000; minFreq = 136000000;
maxFreq = 4390000000ULL; maxFreq = MAX_LO_FREQ;
} else { } else {
minFreq = 136000000; minFreq = 136000000;
maxFreq = 1150000000U; maxFreq = 1150000000U;
@ -743,8 +743,8 @@ void set_harmonic(int h)
minFreq = setting.harmonic * 135000000 + config.frequency_IF1; minFreq = setting.harmonic * 135000000 + config.frequency_IF1;
#endif #endif
maxFreq = 9900000000.0; maxFreq = 9900000000.0;
if (setting.harmonic != 0 && (4400000000.0 * setting.harmonic + config.frequency_IF1 )< 9900000000.0) if (setting.harmonic != 0 && (MAX_LO_FREQ * setting.harmonic + config.frequency_IF1 )< 9900000000.0)
maxFreq = (4400000000.0 * setting.harmonic + config.frequency_IF1 ); maxFreq = (MAX_LO_FREQ * setting.harmonic + config.frequency_IF1 );
set_sweep_frequency(ST_START, minFreq); set_sweep_frequency(ST_START, minFreq);
set_sweep_frequency(ST_STOP, maxFreq); set_sweep_frequency(ST_STOP, maxFreq);
} }
@ -1177,16 +1177,21 @@ 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))
return(0.0);
if (setting.extra_lna) { if (setting.extra_lna) {
if (f > 2100000000U) { if (f > 2100000000U) {
cv = float_TO_PURE_RSSI(+13); cv += float_TO_PURE_RSSI(+13);
} else { } else {
cv = float_TO_PURE_RSSI( (float)f * 6.0 / 1000000000); // +6dBm at 1GHz cv += float_TO_PURE_RSSI( (float)f * 6.0 / 1000000000); // +6dBm at 1GHz
} }
} }
if (!(setting.mode == M_LOW || setting.mode == M_GENLOW)) if (f > ULTRA_MAX_FREQ) {
return(0.0); cv += float_TO_PURE_RSSI(+4); // 4dB loss in harmonic mode
}
int i = 0; int i = 0;
while (f > config.correction_frequency[i] && i < CORRECTION_POINTS) while (f > config.correction_frequency[i] && i < CORRECTION_POINTS)
i++; i++;
@ -1272,7 +1277,7 @@ void setup_sa(void)
static int fast_counter = 0; static int fast_counter = 0;
void set_freq(int V, unsigned long freq) // translate the requested frequency into a setting of the SI4432 void set_freq(int V, freq_t freq) // translate the requested frequency into a setting of the SI4432
{ {
if (old_freq[V] == freq) // Do not change HW if not needed if (old_freq[V] == freq) // Do not change HW if not needed
return; return;
@ -1833,13 +1838,13 @@ void fill_spur_table(void)
{ {
for (uint8_t i=0; i < sizeof(spur_div)/sizeof(uint8_t); i++) for (uint8_t i=0; i < sizeof(spur_div)/sizeof(uint8_t); i++)
{ {
volatile uint64_t corr_IF = config.frequency_IF1; freq_t corr_IF = config.frequency_IF1;
if (i != 4) if (i != 4)
corr_IF -= IF_OFFSET; corr_IF -= IF_OFFSET;
else else
corr_IF -= IF_OFFSET/2; corr_IF -= IF_OFFSET/2;
volatile uint64_t target = (corr_IF * (uint64_t)spur_mul[i] ) / (uint64_t) spur_div[i]; freq_t target = (corr_IF * (uint64_t)spur_mul[i] ) / (uint64_t) spur_div[i];
// volatile uint64_t actual_freq = ADF4351_set_frequency(0, target + config.frequency_IF1); // volatile uint64_t actual_freq = ADF4351_set_frequency(0, target + config.frequency_IF1);
// volatile uint64_t delta = target + (uint64_t) config.frequency_IF1 - actual_freq ; // volatile uint64_t delta = target + (uint64_t) config.frequency_IF1 - actual_freq ;
// volatile uint64_t spur = target - delta; // volatile uint64_t spur = target - delta;
@ -2124,7 +2129,7 @@ modulation_again:
// if (lf > -offs) // No negative frequencies // if (lf > -offs) // No negative frequencies
if (offs >= 0 || lf > (unsigned int)(-offs)) if (offs >= 0 || lf > (unsigned int)(-offs))
lf += offs; lf += offs;
// if (lf > 4290000000U) // if (lf > MAX_LO_FREQ)
// lf = 0; // lf = 0;
} }
// -------------- Calculate the IF ----------------------------- // -------------- Calculate the IF -----------------------------
@ -2134,10 +2139,12 @@ modulation_again:
freq_t local_IF; freq_t local_IF;
spur_second_pass = false; spur_second_pass = false;
again: // Spur reduction jumps to here for second measurement again: // Spur reduction jumps to here for second measurement
local_IF=0; // to get rid of warning local_IF=0; // to get rid of warning
int LO_shifted = false; int LO_shifted = false;
int LO_mirrored = false;
int LO_harmonic = false;
if (MODE_HIGH(setting.mode)) { if (MODE_HIGH(setting.mode)) {
local_IF = 0; local_IF = 0;
} else if (MODE_LOW(setting.mode)){ // All low mode } else if (MODE_LOW(setting.mode)){ // All low mode
@ -2156,16 +2163,25 @@ modulation_again:
#endif #endif
} else { } else {
#ifdef __SI4468__ #ifdef __SI4468__
if (S_IS_AUTO(setting.spur_removal)) { if (S_IS_AUTO(setting.spur_removal)) {
if (lf >= config.ultra_threshold) { if (lf >= config.ultra_threshold) {
setting.spur_removal= S_AUTO_ON; setting.spur_removal= S_AUTO_ON;
} else { } else {
setting.spur_removal= S_AUTO_OFF; setting.spur_removal= S_AUTO_OFF;
}
} }
}
#endif #endif
if (S_IS_AUTO(setting.below_IF)) {
if ((uint64_t)lf + (uint64_t)local_IF> MAX_LO_FREQ && lf < ULTRA_MAX_FREQ)
setting.below_IF = S_AUTO_ON; // Only way to reach this range.
else
setting.below_IF = S_AUTO_OFF; // default is above IF
}
if (S_STATE(setting.spur_removal)){ // If in low input mode and spur reduction is on if (S_STATE(setting.spur_removal)){ // If in low input mode and spur reduction is on
if (false && S_IS_AUTO(setting.below_IF) && (lf < local_IF / 2 || lf > local_IF) ) // if below 150MHz and auto_below_IF <-------------------TODO --------------------- if (S_IS_AUTO(setting.below_IF) &&
( lf > ULTRA_MAX_FREQ || lf < local_IF/2 /* || ( (uint64_t)lf + (uint64_t)local_IF< MAX_LO_FREQ && lf + local_IF > 136000000ULL) */)
)
{ // else low/above IF { // else low/above IF
if (spur_second_pass) if (spur_second_pass)
setting.below_IF = S_AUTO_ON; // use below IF in second pass setting.below_IF = S_AUTO_ON; // use below IF in second pass
@ -2184,15 +2200,15 @@ modulation_again:
} }
} }
} else if(!in_selftest && avoid_spur(lf)) { // check if alternate IF is needed to avoid spur. } else if(!in_selftest && avoid_spur(lf)) { // check if alternate IF is needed to avoid spur.
if (setting.auto_IF) { if (setting.auto_IF) {
local_IF = local_IF + DEFAULT_SPUR_OFFSET; local_IF = local_IF + DEFAULT_SPUR_OFFSET;
// if (actual_rbw_x10 == 6000 ) // if (actual_rbw_x10 == 6000 )
// local_IF = local_IF + 50000; // local_IF = local_IF + 50000;
LO_shifted = true; LO_shifted = true;
} }
#ifdef __DEBUG_SPUR__ // For debugging the spur avoidance control #ifdef __DEBUG_SPUR__ // For debugging the spur avoidance control
if (!setting.auto_IF) if (!setting.auto_IF)
stored_t[i] = -60.0; // Display when to do spur shift in the stored trace stored_t[i] = -60.0; // Display when to do spur shift in the stored trace
#endif #endif
} }
} }
@ -2239,12 +2255,14 @@ modulation_again:
{ // Else set LO ('s) { // Else set LO ('s)
uint64_t target_f; uint64_t target_f;
int inverted_f = false; int inverted_f = false;
if (setting.mode == M_LOW && !setting.tracking && ( S_STATE(setting.below_IF) || (uint64_t)lf + (uint64_t)local_IF> 4290000000U) ) { // if in low input mode and below IF if (setting.mode == M_LOW && !setting.tracking && S_STATE(setting.below_IF)) { // if in low input mode and below IF
if (lf < local_IF) if (lf < local_IF)
target_f = (uint64_t)local_IF-(uint64_t)lf; // set LO SI4432 to below IF frequency target_f = (uint64_t)local_IF-(uint64_t)lf; // set LO SI4432 to below IF frequency
else else {
target_f = (uint64_t)lf - (uint64_t)local_IF; // set LO SI4432 to below IF frequency target_f = (uint64_t)lf - (uint64_t)local_IF; // set LO SI4432 to below IF frequency
inverted_f = true; inverted_f = true;
LO_mirrored = true;
}
} }
else else
target_f = (uint64_t)local_IF+(uint64_t)lf; // otherwise to above IF, local_IF == 0 in high mode target_f = (uint64_t)local_IF+(uint64_t)lf; // otherwise to above IF, local_IF == 0 in high mode
@ -2330,6 +2348,7 @@ modulation_again:
#endif #endif
if (setting.harmonic && f > ULTRA_MAX_FREQ) { if (setting.harmonic && f > ULTRA_MAX_FREQ) {
target_f /= setting.harmonic; target_f /= setting.harmonic;
LO_harmonic = true;
} }
set_freq(ADF4351_LO, target_f); set_freq(ADF4351_LO, target_f);
#if 1 // Compensate frequency ADF4350 error with SI4468 #if 1 // Compensate frequency ADF4350 error with SI4468
@ -2394,19 +2413,27 @@ modulation_again:
} }
if (debug_frequencies ) { if (debug_frequencies ) {
freq_t f; freq_t mult = (LO_harmonic ? 3 : 1);
if (setting.mode == M_LOW || setting.mode == M_GENLOW) freq_t f_low, f_high;
f = real_old_freq[ADF4351_LO] - (real_old_freq[SI4463_RX] + real_offset); if (setting.mode == M_LOW || setting.mode == M_GENLOW) {
else if (real_old_freq[ADF4351_LO] > (real_old_freq[SI4463_RX] + real_offset))
f = real_old_freq[SI4463_RX] + real_offset; f_low = (mult*real_old_freq[ADF4351_LO]) - (real_old_freq[SI4463_RX] + real_offset); // f below LO
float f_error; else
f_low = (real_old_freq[SI4463_RX] + real_offset) - (mult*real_old_freq[ADF4351_LO]);
f_high = (mult*real_old_freq[ADF4351_LO]) + (real_old_freq[SI4463_RX] + real_offset); // f above LO
} else
f_low = f_high = real_old_freq[SI4463_RX] + real_offset;
float f_error_low, f_error_high;
if (setting.frequency_step == 0) { if (setting.frequency_step == 0) {
f_error = ((float)f-(float)frequencies[i]); f_error_low = ((float)frequencies[i] - (float)f_low);
f_error_high = ((float)f_high-(float)frequencies[i]);
} else { } else {
f_error = ((float)f-(float)frequencies[i])/setting.frequency_step; f_error_low = ((float)f_low-(float)frequencies[i])/setting.frequency_step;
f_error_high = ((float)f_high-(float)frequencies[i])/setting.frequency_step;
} }
char spur = ' '; char spur = ' ';
int delta=0; int delta=0;
freq_t f = (LO_mirrored ? f_high : f_low);
if ( f * 4 < real_old_freq[SI4463_RX] + real_offset) { if ( f * 4 < real_old_freq[SI4463_RX] + real_offset) {
delta = real_old_freq[SI4463_RX] + real_offset - 4*f; delta = real_old_freq[SI4463_RX] + real_offset - 4*f;
if (delta < actual_rbw_x10*100) if (delta < actual_rbw_x10*100)
@ -2418,7 +2445,10 @@ modulation_again:
} }
char shifted = ( LO_shifted ? '>' : ' '); char shifted = ( LO_shifted ? '>' : ' ');
if (SDU1.config->usbp->state == USB_ACTIVE) if (SDU1.config->usbp->state == USB_ACTIVE)
shell_printf ("%d:LO=%11.6q:%11.6q\t%c%cIF=%11.6q:%11.6q\tOF=%11.6q\tF=%11.6q\tD=%.2f\r\n", i, old_freq[ADF4351_LO],real_old_freq[ADF4351_LO], spur, shifted, old_freq[SI4463_RX], real_old_freq[SI4463_RX], (int32_t)real_offset, f , f_error); shell_printf ("%d:%c%c%c%cLO=%11.6Lq:%11.6Lq\tIF=%11.6Lq:%11.6Lq\tOF=%11.6q\tF=%11.6Lq:%11.6Lq\tD=%.2f:%.2f\r\n",
i, spur, shifted,(LO_mirrored ? 'm' : ' '), (LO_harmonic ? 'h':' ' ),
old_freq[ADF4351_LO],real_old_freq[ADF4351_LO],
old_freq[SI4463_RX], real_old_freq[SI4463_RX], (int32_t)real_offset, f_low, f_high , f_error_low, f_error_high);
osalThreadSleepMilliseconds(100); osalThreadSleepMilliseconds(100);
} }
// ------------------------- end of processing when in output mode ------------------------------------------------ // ------------------------- end of processing when in output mode ------------------------------------------------

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.