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

Many improvements

Browse Source
Removed_REF_marker
erikkaashoek 5 years ago
parent 894a149025
commit 2687191e19
6 changed files with 234 additions and 117 deletions
Show Stats Download Patch File Download Diff File

2
main.c
Unescape View File

@ -885,6 +885,7 @@ config_t config = {
.lcd_palette = LCD_DEFAULT_PALETTE, .lcd_palette = LCD_DEFAULT_PALETTE,
.vbat_offset = 500, .vbat_offset = 500,
#ifdef TINYSA4 #ifdef TINYSA4
.frequency_IF1 = DEFAULT_IF,
.frequency_IF2 = 0, .frequency_IF2 = 0,
.lpf_switch = 600000000, .lpf_switch = 600000000,
#endif #endif
@ -2399,6 +2400,7 @@ static const VNAShellCommand commands[] =
{"color" , cmd_color , 0}, {"color" , cmd_color , 0},
#endif #endif
{ "if", cmd_if, 0 }, { "if", cmd_if, 0 },
{ "if1", cmd_if1, 0 },
{ "attenuate", cmd_attenuate, 0 }, { "attenuate", cmd_attenuate, 0 },
{ "level", cmd_level, 0 }, { "level", cmd_level, 0 },
{ "sweeptime", cmd_sweeptime, 0 }, { "sweeptime", cmd_sweeptime, 0 },

11
nanovna.h
Unescape View File

@ -43,7 +43,7 @@
#define __SCROLL__ #define __SCROLL__
#define __ICONS__ #define __ICONS__
#define __MEASURE__ #define __MEASURE__
//#define __LINEARITY__ // Not available #define __LINEARITY__ // Not available
#define __SELFTEST__ #define __SELFTEST__
#define __CALIBRATE__ #define __CALIBRATE__
#define __FAST_SWEEP__ // Pre-fill SI4432 RSSI buffer to get fastest sweep in zero span mode #define __FAST_SWEEP__ // Pre-fill SI4432 RSSI buffer to get fastest sweep in zero span mode
@ -64,7 +64,7 @@
#endif #endif
#ifdef TINYSA4 #ifdef TINYSA4
#define DEFAULT_IF ((uint32_t)977000000) #define DEFAULT_IF ((uint32_t)977000000)
#define DEFAULT_SPUR_IF ((uint32_t)978500000) #define DEFAULT_SPUR_OFFSET ((uint32_t)1500000)
#define DEFAULT_MAX_FREQ ((uint32_t)800000000) #define DEFAULT_MAX_FREQ ((uint32_t)800000000)
#define HIGH_MIN_FREQ_MHZ 825 #define HIGH_MIN_FREQ_MHZ 825
#define HIGH_MAX_FREQ_MHZ 1130 #define HIGH_MAX_FREQ_MHZ 1130
@ -254,6 +254,8 @@ void set_spur(int v);
void toggle_spur(void); void toggle_spur(void);
void toggle_mirror_masking(void); void toggle_mirror_masking(void);
#endif #endif
void toggle_high_out_adf4350(void);
extern int high_out_adf4350;
void set_average(int); void set_average(int);
int GetAverage(void); int GetAverage(void);
//extern int setting.average; //extern int setting.average;
@ -530,6 +532,7 @@ typedef struct config {
uint16_t gridlines; uint16_t gridlines;
uint16_t hambands; uint16_t hambands;
#ifdef TINYSA4 #ifdef TINYSA4
uint32_t frequency_IF1;
uint32_t frequency_IF2; uint32_t frequency_IF2;
uint32_t lpf_switch; uint32_t lpf_switch;
#endif #endif
@ -859,7 +862,7 @@ enum { SD_NORMAL, SD_PRECISE, SD_FAST, SD_MANUAL };
extern uint32_t frequencies[POINTS_COUNT]; extern uint32_t frequencies[POINTS_COUNT];
extern const float unit_scale_value[]; extern const float unit_scale_value[];
extern const char * const unit_scale_text[]; extern const char * const unit_scale_text[];
extern int debug_frequencies;
#if 1 // Still sufficient flash #if 1 // Still sufficient flash
// Flash save area - flash7 : org = 0x0801B000, len = 20k in *.ld file // Flash save area - flash7 : org = 0x0801B000, len = 20k in *.ld file
// 2k - for config save // 2k - for config save
@ -1149,7 +1152,7 @@ extern void SI4463_init_rx(void);
extern void SI4463_init_tx(void); extern void SI4463_init_tx(void);
extern void SI4463_start_tx(uint8_t CHANNEL); extern void SI4463_start_tx(uint8_t CHANNEL);
extern void SI4463_set_output_level(int t); extern void SI4463_set_output_level(int t);
extern void SI4463_set_freq(uint32_t freq); extern uint32_t SI4463_set_freq(uint32_t freq);
extern uint16_t set_rbw(uint16_t rbw_x10); extern uint16_t set_rbw(uint16_t rbw_x10);
extern uint16_t force_rbw(int f); extern uint16_t force_rbw(int f);
extern void SI4463_do_api(void* data, uint8_t len, void* out, uint8_t outLen); extern void SI4463_do_api(void* data, uint8_t len, void* out, uint8_t outLen);

16
sa_cmd.c
Unescape View File

@ -1,5 +1,4 @@
/* /*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3, or (at your option) * the Free Software Foundation; either version 3, or (at your option)
* any later version. * any later version.
@ -311,6 +310,21 @@ VNA_SHELL_FUNCTION(cmd_if)
} }
} }
VNA_SHELL_FUNCTION(cmd_if1)
{
if (argc != 1) {
usage:
shell_printf("usage: if1 {975M..979M}\r\n");
return;
} else {
uint32_t a = (uint32_t)my_atoi(argv[0]);
if (a!= 0 &&( a < (DEFAULT_IF - (uint32_t)2000000) || a>(DEFAULT_IF + (uint32_t)2000000)))
goto usage;
config.frequency_IF1 = a;
config_save();
}
}
VNA_SHELL_FUNCTION(cmd_trigger) VNA_SHELL_FUNCTION(cmd_trigger)
{ {

261
sa_core.c
Unescape View File

@ -1,5 +1,4 @@
/* All rights reserved. /* This is free software; you can redistribute it and/or modify
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3, or (at your option) * the Free Software Foundation; either version 3, or (at your option)
* any later version. * any later version.
@ -43,6 +42,9 @@ uint32_t maxFreq = 520000000;
int spur_gate = 100; int spur_gate = 100;
uint32_t old_CFGR; uint32_t old_CFGR;
uint32_t orig_CFGR; uint32_t orig_CFGR;
int high_out_adf4350 = true;
int debug_frequencies = false;
static unsigned long old_freq[5] = { 0, 0, 0, 0,0}; static unsigned long old_freq[5] = { 0, 0, 0, 0,0};
static unsigned long real_old_freq[5] = { 0, 0, 0, 0,0}; static unsigned long real_old_freq[5] = { 0, 0, 0, 0,0};
@ -77,14 +79,13 @@ void update_min_max_freq(void)
maxFreq = HIGH_MAX_FREQ_MHZ * 1000000; maxFreq = HIGH_MAX_FREQ_MHZ * 1000000;
break; break;
case M_GENHIGH: case M_GENHIGH:
//#define __HIGH_OUT_ADF4351__ if (high_out_adf4350) {
#ifdef __HIGH_OUT_ADF4351__ minFreq = 135000000;
minFreq = 135000000; maxFreq = 4290000000U;
maxFreq = 4290000000U; } else {
#else minFreq = 850000000;
minFreq = 850000000; maxFreq = 1150000000U;
maxFreq = 1150000000U; }
#endif
break; break;
} }
} }
@ -129,7 +130,7 @@ void reset_settings(int m)
setting.repeat = 1; setting.repeat = 1;
setting.tracking_output = false; setting.tracking_output = false;
setting.measurement = M_OFF; setting.measurement = M_OFF;
setting.frequency_IF = DEFAULT_IF; setting.frequency_IF = config.frequency_IF1;
setting.auto_IF = true; setting.auto_IF = true;
setting.offset = 0.0; setting.offset = 0.0;
setting.trigger = T_AUTO; setting.trigger = T_AUTO;
@ -147,7 +148,10 @@ void reset_settings(int m)
setting.mute = true; setting.mute = true;
#ifdef __SPUR__ #ifdef __SPUR__
#ifdef TINYSA4 #ifdef TINYSA4
setting.spur_removal = S_AUTO_OFF; if (m == M_LOW)
setting.spur_removal = S_AUTO_OFF;
else
setting.spur_removal = S_OFF;
#else #else
setting.spur_removal = S_OFF; setting.spur_removal = S_OFF;
#endif #endif
@ -179,7 +183,7 @@ void reset_settings(int m)
break; break;
#endif #endif
case M_GENLOW: case M_GENLOW:
setting.rx_drive=8; setting.rx_drive=13;
setting.lo_drive=1; setting.lo_drive=1;
set_sweep_frequency(ST_CENTER, 10000000); set_sweep_frequency(ST_CENTER, 10000000);
set_sweep_frequency(ST_SPAN, 0); set_sweep_frequency(ST_SPAN, 0);
@ -367,6 +371,12 @@ void toggle_tracking_output(void)
dirty = true; dirty = true;
} }
void toggle_high_out_adf4350(void)
{
high_out_adf4350 = !high_out_adf4350;
dirty = true;
}
void toggle_extra_lna(void) void toggle_extra_lna(void)
{ {
setting.extra_lna = !setting.extra_lna; setting.extra_lna = !setting.extra_lna;
@ -480,9 +490,17 @@ void set_modulo(uint32_t f)
#define POWER_STEP 0 // Should be 5 dB but apparently it is lower #define POWER_STEP 0 // Should be 5 dB but apparently it is lower
#define POWER_OFFSET 15 #define POWER_OFFSET 15
#define SWITCH_ATTENUATION 30
#define RECEIVE_SWITCH_ATTENUATION 21 #define RECEIVE_SWITCH_ATTENUATION 21
#ifdef TINYSA4
#define SI_DRIVE_STEP 4
#define SWITCH_ATTENUATION 34
#else
#define SI_DRIVE_STEP 3
#define SWITCH_ATTENUATION 30
#endif
void set_auto_attenuation(void) void set_auto_attenuation(void)
{ {
@ -501,6 +519,7 @@ void set_auto_reflevel(int v)
setting.auto_reflevel = v; setting.auto_reflevel = v;
} }
float get_attenuation(void) float get_attenuation(void)
{ {
float actual_attenuation = setting.attenuate_x2 / 2.0; float actual_attenuation = setting.attenuate_x2 / 2.0;
@ -508,7 +527,7 @@ float get_attenuation(void)
if (setting.atten_step) if (setting.atten_step)
return ( -(POWER_OFFSET + actual_attenuation - (setting.atten_step-1)*POWER_STEP + SWITCH_ATTENUATION)); return ( -(POWER_OFFSET + actual_attenuation - (setting.atten_step-1)*POWER_STEP + SWITCH_ATTENUATION));
else else
return ( -POWER_OFFSET - actual_attenuation + (setting.rx_drive & 7) * 3); return ( -POWER_OFFSET - actual_attenuation + (setting.rx_drive & 7) * SI_DRIVE_STEP);
} else if (setting.atten_step) { } else if (setting.atten_step) {
if (setting.mode == M_LOW) if (setting.mode == M_LOW)
return actual_attenuation + RECEIVE_SWITCH_ATTENUATION; return actual_attenuation + RECEIVE_SWITCH_ATTENUATION;
@ -523,9 +542,9 @@ static pureRSSI_t get_signal_path_loss(void){
if (setting.mode == M_ULTRA) if (setting.mode == M_ULTRA)
return float_TO_PURE_RSSI(-15); // Loss in dB, -9.5 for v0.1, -12.5 for v0.2 return float_TO_PURE_RSSI(-15); // Loss in dB, -9.5 for v0.1, -12.5 for v0.2
#endif #endif
// if (setting.mode == M_LOW) if (setting.mode == M_LOW)
// return float_TO_PURE_RSSI(-5.5); // Loss in dB, -9.5 for v0.1, -12.5 for v0.2 return float_TO_PURE_RSSI(-25); // Loss in dB, -9.5 for v0.1, -12.5 for v0.2
return float_TO_PURE_RSSI(0); // Loss in dB (+ is gain) return float_TO_PURE_RSSI(-4.5); // Loss in dB (+ is gain)
} }
static const int drive_dBm [16] = {-38,-35,-33,-30,-27,-24,-21,-19,-7,-4,-2, 1, 4, 7, 10, 13}; static const int drive_dBm [16] = {-38,-35,-33,-30,-27,-24,-21,-19,-7,-4,-2, 1, 4, 7, 10, 13};
@ -534,11 +553,11 @@ void set_level(float v) // Set the output level in dB in high/low output
{ {
if (setting.mode == M_GENHIGH) { if (setting.mode == M_GENHIGH) {
int d = 0; int d = 0;
while (drive_dBm[d] < v - 1 && d < 16) // while (drive_dBm[d] < v - 1 && d < 16)
d++; // d++;
if (d == 8 && v < -12) // Round towards closest level // if (d == 8 && v < -12) // Round towards closest level
d = 7; // d = 7;
set_rx_drive(d); set_lo_drive(v);
} else { } else {
setting.level = v; setting.level = v;
set_attenuation((int)v); set_attenuation((int)v);
@ -550,15 +569,15 @@ void set_attenuation(float a) // Is used both in low output mode and high/
{ {
if (setting.mode == M_GENLOW) { if (setting.mode == M_GENLOW) {
a = a + POWER_OFFSET; a = a + POWER_OFFSET;
if (a > 6) { // +9dB if (a > 2*SI_DRIVE_STEP) { // +9dB
setting.rx_drive = 11; // Maximum save drive for SAW filters. setting.rx_drive = 11; // Maximum save drive for SAW filters.
a = a - 9; a = a - 3*SI_DRIVE_STEP;
} else if (a > 3) { // +6dB } else if (a > SI_DRIVE_STEP) { // +6dB
setting.rx_drive = 10; setting.rx_drive = 10;
a = a - 6; a = a - 2*SI_DRIVE_STEP;
} else if (a > 0) { // +3dB } else if (a > 0) { // +3dB
setting.rx_drive = 9; setting.rx_drive = 9;
a = a - 3; a = a - SI_DRIVE_STEP;
} else } else
setting.rx_drive = 8; // defined as 0dB level setting.rx_drive = 8; // defined as 0dB level
if (a > 0) if (a > 0)
@ -1373,8 +1392,7 @@ void set_freq(int V, unsigned long freq) // translate the requested frequency
#else #else
{ {
#endif #endif
SI4463_set_freq(target_f); // Also sets offset to zero real_old_freq[V] = SI4463_set_freq(target_f); // Also sets offset to zero
real_old_freq[V] = target_f;
} }
#else #else
SI4432_Set_Frequency(freq); // Impossible to use offset so set SI4432 to new frequency SI4432_Set_Frequency(freq); // Impossible to use offset so set SI4432 to new frequency
@ -1384,8 +1402,7 @@ void set_freq(int V, unsigned long freq) // translate the requested frequency
#endif #endif
} }
} else { } else {
SI4463_set_freq(freq); // Not in fast mode real_old_freq[V] = SI4463_set_freq(freq); // Not in fast mode
real_old_freq[V] = freq;
} }
} }
old_freq[V] = freq; old_freq[V] = freq;
@ -1437,11 +1454,19 @@ case M_ULTRA:
#endif #endif
#ifdef __SI4463__ #ifdef __SI4463__
SI4463_init_rx(); // Must be before ADF4351_setup!!!! SI4463_init_rx(); // Must be before ADF4351_setup!!!!
#endif if (setting.atten_step) {// use switch as attenuator
enable_rx_output(true);
} else {
enable_rx_output(false);
}
#endif
set_AGC_LNA(); set_AGC_LNA();
ADF4351_enable(true); ADF4351_enable(true);
ADF4351_drive(setting.lo_drive); ADF4351_drive(setting.lo_drive);
ADF4351_enable_aux_out(false); if (setting.tracking_output)
ADF4351_enable_aux_out(true);
else
ADF4351_enable_aux_out(false);
ADF4351_enable_out(true); ADF4351_enable_out(true);
#ifdef __SI4432__ #ifdef __SI4432__
@ -1482,12 +1507,14 @@ mute:
ADF4351_enable_aux_out(false); ADF4351_enable_aux_out(false);
ADF4351_enable_out(false); ADF4351_enable_out(false);
ADF4351_enable(false); ADF4351_enable(false);
if (setting.atten_step) {// use switch as attenuator
enable_rx_output(false); enable_rx_output(true);
} else {
enable_rx_output(false);
}
enable_high(true); enable_high(true);
enable_extra_lna(false); enable_extra_lna(false);
enable_ultra(false); enable_ultra(false);
break; break;
case M_GENLOW: // Mixed output from 0 case M_GENLOW: // Mixed output from 0
if (setting.mute) if (setting.mute)
@ -1545,27 +1572,35 @@ case M_GENHIGH: // Direct output from 1
SI4432_Transmit(setting.lo_drive); SI4432_Transmit(setting.lo_drive);
#endif #endif
#ifdef __HIGH_OUT_ADF4351__ if (high_out_adf4350) {
#ifdef __SI4468__ #ifdef __SI4468__
SI4463_init_rx(); SI4463_init_rx();
enable_rx_output(true); // to protext the SI
#endif #endif
ADF4351_enable(true); ADF4351_enable(true);
#ifndef TINYSA4_PROTO #ifndef TINYSA4_PROTO
ADF4351_enable_aux_out(false); ADF4351_enable_aux_out(false);
ADF4351_enable_out(true); ADF4351_enable_out(true);
#else #else
ADF4351_enable_aux_out(true); ADF4351_enable_aux_out(true);
ADF4351_enable_out(true); // Must be enabled to have aux output ADF4351_enable_out(true); // Must be enabled to have aux output
#endif #endif
ADF4351_aux_drive(setting.lo_drive); ADF4351_aux_drive(setting.lo_drive);
#else } else {
ADF4351_enable_aux_out(false); ADF4351_enable_aux_out(false);
ADF4351_enable_out(false); ADF4351_enable_out(false);
#ifdef __SI4468__ #ifdef __SI4468__
SI4463_init_tx(); // SI4463_set_output_level(setting.rx_drive);
#endif SI4463_init_tx();
if (setting.lo_drive < 32) {
enable_rx_output(false); // use switch as attenuator
} else {
enable_rx_output(true);
}
SI4463_set_output_level(setting.lo_drive & 0x01F);
#endif #endif
enable_rx_output(true); }
enable_high(true); enable_high(true);
enable_extra_lna(false); enable_extra_lna(false);
enable_ultra(false); enable_ultra(false);
@ -1576,8 +1611,8 @@ case M_GENHIGH: // Direct output from 1
void update_rbw(void) // calculate the actual_rbw and the vbwSteps (# steps in between needed if frequency step is largen than maximum rbw) void update_rbw(void) // calculate the actual_rbw and the vbwSteps (# steps in between needed if frequency step is largen than maximum rbw)
{ {
vbwSteps = 1; // starting number for all modes
if (!MODE_INPUT(setting.mode)) { if (!MODE_INPUT(setting.mode)) {
vbwSteps = 1;
actual_rbw_x10 = 1; // To force substepping of the SI4463 actual_rbw_x10 = 1; // To force substepping of the SI4463
return; return;
} }
@ -1625,15 +1660,15 @@ void update_rbw(void) // calculate the actual_rbw and the vbwSteps (#
// actual_rbw_x10 = 3000; // if spur suppression reduce max rbw to fit within BPF // actual_rbw_x10 = 3000; // if spur suppression reduce max rbw to fit within BPF
#endif #endif
actual_rbw_x10 = set_rbw(actual_rbw_x10); // see what rbw the SI4432 can realize actual_rbw_x10 = set_rbw(actual_rbw_x10); // see what rbw the SI4432 can realize
if (setting.vbw_x10 > actual_rbw_x10 && setting.frequency_step > 0 && MODE_INPUT(setting.mode)) { // When doing frequency scanning in input mode if (setting.frequency_step > 0 && MODE_INPUT(setting.mode)) { // When doing frequency scanning in input mode
vbwSteps = (setting.vbw_x10 / actual_rbw_x10 ) + 1; //((int)(2 * (setting.vbw_x10 + (actual_rbw_x10/8)) / actual_rbw_x10)); // calculate # steps in between each frequency step due to rbw being less than frequency step if (setting.vbw_x10 > actual_rbw_x10)
vbwSteps = 1+(setting.vbw_x10 / actual_rbw_x10); //((int)(2 * (setting.vbw_x10 + (actual_rbw_x10/8)) / actual_rbw_x10)); // calculate # steps in between each frequency step due to rbw being less than frequency step
if (vbwSteps < 1) // at least one step, should never happen
vbwSteps = 1;
if (setting.step_delay_mode==SD_PRECISE) // if in Precise scanning if (setting.step_delay_mode==SD_PRECISE) // if in Precise scanning
vbwSteps *= 2; // use twice as many steps vbwSteps *= 2; // use twice as many steps
if (vbwSteps < 1) // at least one step
vbwSteps = 1;
} else { // in all other modes } else { // in all other modes
setting.vbw_x10 = actual_rbw_x10; setting.vbw_x10 = actual_rbw_x10;
vbwSteps = 1; // only one vbwSteps
} }
} }
@ -1742,14 +1777,15 @@ search_maximum(int m, int center, int span)
} }
//static int spur_old_stepdelay = 0; //static int spur_old_stepdelay = 0;
static const unsigned int spur_IF = DEFAULT_IF; // The IF frequency for which the spur table is value //static const unsigned int spur_IF = DEFAULT_IF; // The IF frequency for which the spur table is value
static const unsigned int spur_alternate_IF = DEFAULT_SPUR_IF; // if the frequency is found in the spur table use this IF frequency //static const unsigned int spur_alternate_IF = DEFAULT_SPUR_IF; // if the frequency is found in the spur table use this IF frequency
static const int spur_table[] = // Frequencies to avoid static const uint32_t spur_table[] = // Frequencies to avoid
{ {
117716000, 117716000,
243781200, 243775000,
244250000, 244250000,
325666667, 324875000,
325190000,
487541650, // This is linked to the MODULO of the ADF4350 487541650, // This is linked to the MODULO of the ADF4350
// 487993000, // 487993000,
// 488020700, // 488020700,
@ -1759,8 +1795,7 @@ static const int spur_table[] = // Frequencies t
650700000, 650700000,
651333333, 651333333,
732750000, 732750000,
746083000, 746083000
977000000
/* /*
* 144.3 * 144.3
* 159 * 159
@ -1808,12 +1843,12 @@ static const int spur_table[] = // Frequencies t
#endif #endif
}; };
int binary_search(int f) int binary_search(uint32_t f)
{ {
int L = 0; int L = 0;
int R = (sizeof spur_table)/sizeof(int) - 1; int R = (sizeof spur_table)/sizeof(int) - 1;
int fmin = f - actual_rbw_x10 * spur_gate; uint32_t fmin = f - actual_rbw_x10 * spur_gate;
int fplus = f + actual_rbw_x10 * spur_gate; uint32_t fplus = f + actual_rbw_x10 * spur_gate;
while (L <= R) { while (L <= R) {
int m = (L + R) / 2; int m = (L + R) / 2;
if (spur_table[m] < fmin) if (spur_table[m] < fmin)
@ -1823,16 +1858,20 @@ int binary_search(int f)
else else
return true; // index is m return true; // index is m
} }
if (!setting.auto_IF && setting.frequency_IF > fmin && setting.frequency_IF < fplus)
return true;
if(config.frequency_IF1 > fmin && config.frequency_IF1 < fplus)
return true;
return false; return false;
} }
int avoid_spur(int f) // find if this frequency should be avoided int avoid_spur(uint32_t f) // find if this frequency should be avoided
{ {
// int window = ((int)actual_rbw ) * 1000*2; // int window = ((int)actual_rbw ) * 1000*2;
// if (window < 50000) // if (window < 50000)
// window = 50000; // window = 50000;
if (setting.mode != M_LOW || !setting.auto_IF) if (setting.mode != M_LOW /* || !setting.auto_IF */)
return(false); return(false);
return binary_search(f); return binary_search(f);
} }
@ -1947,33 +1986,43 @@ pureRSSI_t perform(bool break_on_operation, int i, uint32_t f, int tracking)
a += PURE_TO_float(get_frequency_correction(f)); a += PURE_TO_float(get_frequency_correction(f));
if (a != old_a) { if (a != old_a) {
old_a = a; old_a = a;
#ifdef __SI4432__ int d = 10; // Start at lowest drive level;
int d = 0; // Start at lowest drive level;
a = a + POWER_OFFSET; a = a + POWER_OFFSET;
if (a > 0) { if (a > 0) {
d++; d++;
a = a - 3; a = a - SI_DRIVE_STEP;
} }
if (a > 0) { if (a > 0) {
d++; d++;
a = a - 3; a = a - SI_DRIVE_STEP;
} }
if (a > 0) { if (a > 0) {
d++; d++;
a = a - 3; a = a - SI_DRIVE_STEP;
} }
#ifdef __SI4432__
SI4432_Sel = SI4432_RX ; SI4432_Sel = SI4432_RX ;
SI4432_Drive(d); SI4432_Drive(d);
#endif
#ifdef __SI4463__
SI4463_set_output_level(d);
#endif
if (a > 0) if (a > 0)
a = 0; a = 0;
if( a > - SWITCH_ATTENUATION) { if( a > - SWITCH_ATTENUATION) {
#ifdef TINYSA3
set_switch_transmit(); set_switch_transmit();
#else
enable_rx_output(true);
#endif
} else { } else {
a = a + SWITCH_ATTENUATION; a = a + SWITCH_ATTENUATION;
#ifdef TINYSA3
set_switch_receive(); set_switch_receive();
} #else
enable_rx_output(false);
#endif #endif
}
if (a < -31) if (a < -31)
a = -31; a = -31;
a = -a; a = -a;
@ -2010,7 +2059,7 @@ pureRSSI_t perform(bool break_on_operation, int i, uint32_t f, int tracking)
modulation_delay += config.cor_nfm; // -17 default modulation_delay += config.cor_nfm; // -17 default
// modulation_index = 0; // default value // modulation_index = 0; // default value
} }
if ((setting.mode == M_GENLOW && f > ((uint32_t)480000000) - DEFAULT_IF) || if ((setting.mode == M_GENLOW && f > ((uint32_t)480000000) - config.frequency_IF1) ||
(setting.mode == M_GENHIGH && f > ((uint32_t)480000000) ) ) (setting.mode == M_GENHIGH && f > ((uint32_t)480000000) ) )
modulation_index += 2; modulation_index += 2;
current_fm_modulation = (int *)fm_modulation[modulation_index]; current_fm_modulation = (int *)fm_modulation[modulation_index];
@ -2073,7 +2122,6 @@ modulation_again:
if (lf > 4000000000U) if (lf > 4000000000U)
lf = 0; lf = 0;
} }
// -------------- Calculate the IF ----------------------------- // -------------- Calculate the IF -----------------------------
if (/* MODE_INPUT(setting.mode) && */ i > 0 && FREQ_IS_CW()) // In input mode in zero span mode after first setting of the LO's if (/* MODE_INPUT(setting.mode) && */ i > 0 && FREQ_IS_CW()) // In input mode in zero span mode after first setting of the LO's
@ -2084,13 +2132,14 @@ modulation_again:
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;
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
if (!setting.auto_IF) if (!setting.auto_IF)
local_IF = setting.frequency_IF; local_IF = setting.frequency_IF;
else else
local_IF = DEFAULT_IF; local_IF = config.frequency_IF1;
if (setting.mode == M_LOW) { if (setting.mode == M_LOW) {
if (tracking) { // VERY SPECIAL CASE!!!!! Measure BPF if (tracking) { // VERY SPECIAL CASE!!!!! Measure BPF
#if 0 // Isolation test #if 0 // Isolation test
@ -2101,14 +2150,6 @@ modulation_again:
lf = reffer_freq[setting.refer]; lf = reffer_freq[setting.refer];
#endif #endif
} else { } else {
if(!in_selftest && avoid_spur(lf)) { // check if alternate IF is needed to avoid spur.
if (setting.auto_IF)
local_IF = spur_alternate_IF;
#ifdef __DEBUG_SPUR__ // For debugging the spur avoidance control
else
stored_t[i] = -60.0; // Display when to do spur shift in the stored trace
#endif
}
#ifdef __SI4468__ #ifdef __SI4468__
if (S_IS_AUTO(setting.spur_removal)) { if (S_IS_AUTO(setting.spur_removal)) {
if (lf >= config.lpf_switch) { if (lf >= config.lpf_switch) {
@ -2128,14 +2169,23 @@ modulation_again:
} }
else else
{ {
if (spur_second_pass) // If second spur pass if (spur_second_pass) { // If second spur pass
#ifdef __SI4432__ #ifdef __SI4432__
local_IF = local_IF + 500000; // apply IF spur shift local_IF = local_IF + 500000; // apply IF spur shift
#else #else
local_IF = local_IF + 1000000; // apply IF spur shift local_IF = local_IF + DEFAULT_SPUR_OFFSET; // apply IF spur shift
LO_shifted = true;
#endif #endif
}
} }
} else if(!in_selftest && setting.auto_IF && avoid_spur(lf)) { // check if alternate IF is needed to avoid spur.
local_IF = config.frequency_IF1 + DEFAULT_SPUR_OFFSET;
LO_shifted = true;
} }
#ifdef __DEBUG_SPUR__ // For debugging the spur avoidance control
else if (!setting.auto_IF)
stored_t[i] = -60.0; // Display when to do spur shift in the stored trace
#endif
} }
} else { // Output mode } else { // Output mode
if (setting.modulation == MO_EXTERNAL) // VERY SPECIAL CASE !!!!!! LO input via high port if (setting.modulation == MO_EXTERNAL) // VERY SPECIAL CASE !!!!!! LO input via high port
@ -2272,14 +2322,14 @@ modulation_again:
} else if (setting.mode == M_HIGH) { } else if (setting.mode == M_HIGH) {
set_freq (SI4463_RX, lf); // sweep RX, local_IF = 0 in high mode set_freq (SI4463_RX, lf); // sweep RX, local_IF = 0 in high mode
} else if (setting.mode == M_GENHIGH) { } else if (setting.mode == M_GENHIGH) {
#ifndef __HIGH_OUT_ADF4351__ // Let SI TX only if (high_out_adf4350) {
set_freq (SI4463_RX, lf); // sweep RX, local_IF = 0 in high mode
local_IF = 0;
#else
set_freq (ADF4351_LO, lf); // sweep LO, local_IF = 0 in high mode set_freq (ADF4351_LO, lf); // sweep LO, local_IF = 0 in high mode
local_IF = lf; local_IF = lf;
#endif } else {
set_freq (SI4463_RX, lf); // sweep RX, local_IF = 0 in high mode
local_IF = 0;
} }
}
// STOP_PROFILE; // STOP_PROFILE;
#endif #endif
} }
@ -2301,8 +2351,13 @@ modulation_again:
my_microsecond_delay(200); // To prevent lockup of SI4432 my_microsecond_delay(200); // To prevent lockup of SI4432
#endif #endif
} }
if (debug_frequencies && SDU1.config->usbp->state == USB_ACTIVE) {
uint32_t f = real_old_freq[ADF4351_LO] - real_old_freq[SI4463_RX];
float f_error = ((float)f-(float)frequencies[i])/setting.frequency_step;
char shifted = ( LO_shifted ? '>' : ' ');
shell_printf ("%d:LO=%11.6q\t%cIF=%11.6q\tF=%11.6q\tD=%.2f\r\n", i, real_old_freq[ADF4351_LO], shifted, real_old_freq[SI4463_RX], f , f_error);
osalThreadSleepMilliseconds(100);
}
// ------------------------- end of processing when in output mode ------------------------------------------------ // ------------------------- end of processing when in output mode ------------------------------------------------
skip_LO_setting: skip_LO_setting:
@ -3535,7 +3590,7 @@ void test_prepare(int i)
{ {
setting.tracking = false; //Default test setup setting.tracking = false; //Default test setup
setting.atten_step = false; setting.atten_step = false;
setting.frequency_IF = DEFAULT_IF; // Default frequency setting.frequency_IF = config.frequency_IF1; // Default frequency
setting.auto_IF = true; setting.auto_IF = true;
setting.auto_attenuation = false; setting.auto_attenuation = false;
setting.spur_removal = S_OFF; setting.spur_removal = S_OFF;
@ -3559,7 +3614,7 @@ common_silent:
set_mode(M_LOW); set_mode(M_LOW);
setting.tracking = true; //Sweep BPF setting.tracking = true; //Sweep BPF
setting.auto_IF = false; setting.auto_IF = false;
setting.frequency_IF = DEFAULT_IF+200000; // Center on SAW filters setting.frequency_IF = config.frequency_IF1+200000; // Center on SAW filters
set_refer_output(2); set_refer_output(2);
goto common; goto common;
case TP_10MHZ: // 10MHz input case TP_10MHZ: // 10MHz input
@ -3706,7 +3761,7 @@ void self_test(int test)
reset_settings(M_LOW); reset_settings(M_LOW);
test_prepare(TEST_SILENCE); test_prepare(TEST_SILENCE);
setting.auto_IF = false; setting.auto_IF = false;
setting.frequency_IF=DEFAULT_IF; setting.frequency_IF=config.frequency_IF1;
setting.frequency_step = 30000; setting.frequency_step = 30000;
if (setting.test_argument > 0) if (setting.test_argument > 0)
setting.frequency_step=setting.test_argument; setting.frequency_step=setting.test_argument;
@ -3771,7 +3826,7 @@ void self_test(int test)
in_selftest = true; in_selftest = true;
// reset_settings(M_LOW); // reset_settings(M_LOW);
setting.auto_IF = false; setting.auto_IF = false;
setting.frequency_IF=DEFAULT_IF; setting.frequency_IF=config.frequency_IF1;
ui_mode_normal(); ui_mode_normal();
test_prepare(TEST_RBW); test_prepare(TEST_RBW);
setting.step_delay = 8000; setting.step_delay = 8000;
@ -3946,7 +4001,11 @@ void calibrate(void)
ili9341_drawstring_7x13("Calibration failed", 30, 140); ili9341_drawstring_7x13("Calibration failed", 30, 140);
goto quit; goto quit;
} else { } else {
#ifdef TINYSA4
set_actual_power(-29.0); // Should be -23.5dBm (V0.2) OR 25 (V0.3)
#else
set_actual_power(-25.0); // Should be -23.5dBm (V0.2) OR 25 (V0.3) set_actual_power(-25.0); // Should be -23.5dBm (V0.2) OR 25 (V0.3)
#endif
chThdSleepMilliseconds(1000); chThdSleepMilliseconds(1000);
} }
} }

9
si4432.c
Unescape View File

@ -2299,7 +2299,7 @@ static const RBW_t RBW_choices[] =
{SI4463_RBW_30kHz, 0,300}, {SI4463_RBW_30kHz, 0,300},
{SI4463_RBW_100kHz,0,1000}, {SI4463_RBW_100kHz,0,1000},
{SI4463_RBW_300kHz,0,3000}, {SI4463_RBW_300kHz,0,3000},
{SI4463_RBW_850kHz,0,8500}, {SI4463_RBW_850kHz,0,7000},
}; };
const int SI4432_RBW_count = ((int)(sizeof(RBW_choices)/sizeof(RBW_t))); const int SI4432_RBW_count = ((int)(sizeof(RBW_choices)/sizeof(RBW_t)));
@ -2336,7 +2336,7 @@ uint16_t force_rbw(int f)
uint16_t set_rbw(uint16_t WISH) { uint16_t set_rbw(uint16_t WISH) {
int i; int i;
for (i=0; i < (int)(sizeof(RBW_choices)/sizeof(RBW_t)) - 1; i++) for (i=0; i < (int)(sizeof(RBW_choices)/sizeof(RBW_t)) - 1; i++)
if (WISH <= RBW_choices[i].RBWx10 * 15/10) if (WISH <= RBW_choices[i].RBWx10)
break; break;
return force_rbw(i); return force_rbw(i);
} }
@ -2346,7 +2346,7 @@ uint16_t set_rbw(uint16_t WISH) {
static int refresh_count = 0; static int refresh_count = 0;
void SI4463_set_freq(uint32_t freq) uint32_t SI4463_set_freq(uint32_t freq)
{ {
// SI4463_set_gpio(3,GPIO_HIGH); // SI4463_set_gpio(3,GPIO_HIGH);
int S = 4 ; // Aprox 100 Hz channels int S = 4 ; // Aprox 100 Hz channels
@ -2373,7 +2373,7 @@ void SI4463_set_freq(uint32_t freq)
SI4463_outdiv = 24; SI4463_outdiv = 24;
} }
if (SI4463_band == -1) if (SI4463_band == -1)
return; return 0;
//#ifdef TINYSA4_PROTO //#ifdef TINYSA4_PROTO
#define freq_xco 29999960 #define freq_xco 29999960
//#else //#else
@ -2518,6 +2518,7 @@ void SI4463_set_freq(uint32_t freq)
// SI4463_set_gpio(3,GPIO_LOW); // SI4463_set_gpio(3,GPIO_LOW);
SI4463_frequency_changed = true; SI4463_frequency_changed = true;
prev_band = SI4463_band; prev_band = SI4463_band;
return actual_freq;
} }
void SI4463_init_rx(void) void SI4463_init_rx(void)

52
ui_sa.c
Unescape View File

@ -740,7 +740,12 @@ static UI_FUNCTION_ADV_CALLBACK(menu_sreffer_acb){
menu_push_submenu(menu_reffer); menu_push_submenu(menu_reffer);
} }
#ifdef TINYSA4
const int8_t menu_drive_value[]={-38,-35,-33,-30,-27,-24,-21,-19, -7,-4,-2,1,4,7,10,13};
#else
const int8_t menu_drive_value[]={-38,-35,-33,-30,-27,-24,-21,-19, -7,-4,-2,1,4,7,10,13}; const int8_t menu_drive_value[]={-38,-35,-33,-30,-27,-24,-21,-19, -7,-4,-2,1,4,7,10,13};
#endif
static UI_FUNCTION_ADV_CALLBACK(menu_lo_drive_acb) static UI_FUNCTION_ADV_CALLBACK(menu_lo_drive_acb)
{ {
(void)item; (void)item;
@ -805,6 +810,34 @@ static UI_FUNCTION_ADV_CALLBACK(menu_extra_lna_acb)
ui_mode_normal(); ui_mode_normal();
} }
static UI_FUNCTION_ADV_CALLBACK(menu_adf_out_acb)
{
(void)data;
(void)item;
if (b){
b->icon = high_out_adf4350 == 0 ? BUTTON_ICON_NOCHECK : BUTTON_ICON_CHECK;
return;
}
toggle_high_out_adf4350();
// menu_move_back();
ui_mode_normal();
}
static UI_FUNCTION_ADV_CALLBACK(menu_debug_freq_acb)
{
(void)data;
(void)item;
if (b){
b->icon = debug_frequencies == 0 ? BUTTON_ICON_NOCHECK : BUTTON_ICON_CHECK;
return;
}
debug_frequencies = ! debug_frequencies;
// menu_move_back();
ui_mode_normal();
}
static UI_FUNCTION_ADV_CALLBACK(menu_measure_acb) static UI_FUNCTION_ADV_CALLBACK(menu_measure_acb)
{ {
(void)item; (void)item;
@ -1781,8 +1814,10 @@ static const menuitem_t menu_sweep_speed[] =
static const menuitem_t menu_settings3[] = static const menuitem_t menu_settings3[] =
{ {
{ MT_KEYPAD, KM_10MHZ, "CORRECT\nFREQUENCY", "Enter actual lMHz frequency"}, // { MT_KEYPAD, KM_10MHZ, "CORRECT\nFREQUENCY", "Enter actual lMHz frequency"},
{ MT_KEYPAD, KM_GRIDLINES, "MINIMUM\nGRIDLINES", "Enter minimum horizontal grid divisions"}, // { MT_KEYPAD, KM_GRIDLINES, "MINIMUM\nGRIDLINES", "Enter minimum horizontal grid divisions"},
{ MT_ADV_CALLBACK, 0, "DEBUG\nFREQ", menu_debug_freq_acb},
{ MT_ADV_CALLBACK, 0, "ADF OUT", menu_adf_out_acb},
{ MT_KEYPAD, KM_LPF, "LPF", "Enter LPF max freq"}, { MT_KEYPAD, KM_LPF, "LPF", "Enter LPF max freq"},
#if 0 // only used during development #if 0 // only used during development
{ MT_KEYPAD, KM_COR_AM, "COR\nAM", "Enter AM modulation correction"}, { MT_KEYPAD, KM_COR_AM, "COR\nAM", "Enter AM modulation correction"},
@ -1840,7 +1875,9 @@ static const menuitem_t menu_settings[] =
}; };
static const menuitem_t menu_measure2[] = { static const menuitem_t menu_measure2[] = {
// { MT_ADV_CALLBACK | MT_LOW, M_LINEARITY, "LINEAR", menu_measure_acb}, #ifdef __LINEARITY__
{ MT_ADV_CALLBACK | MT_LOW, M_LINEARITY, "LINEAR", menu_measure_acb},
#endif
{ MT_ADV_CALLBACK, M_AM, "AM", menu_measure_acb}, { MT_ADV_CALLBACK, M_AM, "AM", menu_measure_acb},
{ MT_ADV_CALLBACK, M_FM, "FM", menu_measure_acb}, { MT_ADV_CALLBACK, M_FM, "FM", menu_measure_acb},
{ MT_ADV_CALLBACK, M_THD, "THD", menu_measure_acb}, { MT_ADV_CALLBACK, M_THD, "THD", menu_measure_acb},
@ -2577,11 +2614,12 @@ redraw_cal_status:
} }
// Spur // Spur
#ifdef __SPUR__ #ifdef __SPUR__
if (setting.spur_removal) { if (setting.spur_removal != S_OFF) {
if (S_IS_AUTO(setting.spur_removal)) if (setting.spur_removal == S_ON)
color = LCD_FG_COLOR;
else
ili9341_set_foreground(LCD_BRIGHT_COLOR_GREEN); ili9341_set_foreground(LCD_BRIGHT_COLOR_GREEN);
else
color = LCD_FG_COLOR;
ili9341_drawstring("Spur:", x, y); ili9341_drawstring("Spur:", x, y);
y += YSTEP; y += YSTEP;
if (S_IS_AUTO(setting.spur_removal)) if (S_IS_AUTO(setting.spur_removal))

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.