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

table updates

Browse Source
pull/96/head
erikkaashoek 1 year ago committed by Bohdan Kmit
parent 469826174b
commit afcdcb4332
4 changed files with 38 additions and 81 deletions
Show Stats Download Patch File Download Diff File

1
.gitignore vendored
Unescape View File

@ -19,3 +19,4 @@ ChibiOS
Rubbish* Rubbish*
desktop.ini desktop.ini
*.xml *.xml
.megaignore

28
main.c
Unescape View File

@ -3121,31 +3121,33 @@ int main(void)
#endif #endif
int reset_state = btn_side(); int reset_state = btn_side();
#ifdef TINYSA4 #ifdef TINYSA4
if (hw_if) {
ULTRA_THRESHOLD = 800000000ULL;
NORMAL_MAX_FREQ = 900000000ULL;
config.frequency_IF1 = DEFAULT_IF_PLUS;
} else {
ULTRA_THRESHOLD = 700000000ULL;
NORMAL_MAX_FREQ = 800000000ULL;
config.frequency_IF1 = DEFAULT_IF;
}
if (hwid >= 100) { if (hwid >= 100) {
max2871 = true; max2871 = true;
memcpy(config.correction_frequency, v5_2_correction_frequency, sizeof(config.correction_frequency)); memcpy(config.correction_frequency, v5_2_correction_frequency, sizeof(config.correction_frequency));
memcpy(config.correction_value, v5_2_correction_value, sizeof(config.correction_value)); memcpy(config.correction_value, v5_2_correction_value, sizeof(config.correction_value));
config.harmonic_level_offset = v5_2_harmonic_level_offset; config.harmonic_level_offset = v5_2_harmonic_level_offset;
config.harmonic_lna_level_offset = v5_2_harmonic_lna_level_offset; config.harmonic_lna_level_offset = v5_2_harmonic_lna_level_offset;
if (hwid >= 103) ULTRA_MAX_FREQ = 6300000000 + config.frequency_IF1;
config.frequency_IF1 = DEFAULT_IF_PLUS;
ULTRA_MAX_FREQ = 7300000000ULL;
} else { } else {
if (hw_if) { if (hw_if) {
memcpy(config.correction_frequency, v4_6_correction_frequency, sizeof(config.correction_frequency)); memcpy(config.correction_frequency, v4_6_correction_frequency, sizeof(config.correction_frequency));
memcpy(config.correction_value, v4_6_correction_value, sizeof(config.correction_value)); memcpy(config.correction_value, v4_6_correction_value, sizeof(config.correction_value));
config.harmonic_level_offset = v4_6_harmonic_level_offset; config.harmonic_level_offset = v4_6_harmonic_level_offset;
config.harmonic_lna_level_offset = v4_6_harmonic_lna_level_offset; config.harmonic_lna_level_offset = v4_6_harmonic_lna_level_offset;
ULTRA_MAX_FREQ = 5450000000ULL; // ULTRA_MAX_FREQ = 5450000000ULL;
} else }
ULTRA_MAX_FREQ = 5340000000ULL; // else
} // ULTRA_MAX_FREQ = 5340000000ULL;
if (hw_if) { ULTRA_MAX_FREQ = 4350000000 + config.frequency_IF1;
ULTRA_THRESHOLD = 800000000ULL;
NORMAL_MAX_FREQ = 900000000ULL;
} else {
ULTRA_THRESHOLD = 700000000ULL;
NORMAL_MAX_FREQ = 800000000ULL;
} }
set_freq_boundaries(); set_freq_boundaries();
#endif #endif

2
nanovna.h
Unescape View File

@ -156,7 +156,7 @@ typedef uint64_t freq_t;
#define FREQ_MULTIPLIER 100 // Multiplier of the 30MHz reference to get accurate frequency correction #define FREQ_MULTIPLIER 100 // Multiplier of the 30MHz reference to get accurate frequency correction
#define VARIANT(X,Y) (Y) #define VARIANT(X,Y) (Y)
#define DEFAULT_IF ((freq_t)977400000) #define DEFAULT_IF ((freq_t)977400000)
#define DEFAULT_IF_PLUS ((freq_t)1069000000) #define DEFAULT_IF_PLUS ((freq_t)1069500000)
extern uint16_t hw_if; extern uint16_t hw_if;
#define DEFAULT_SPUR_OFFSET ((freq_t)(actual_rbw_x10 > 3000 ? 1500000 : 1000000)) #define DEFAULT_SPUR_OFFSET ((freq_t)(actual_rbw_x10 > 3000 ? 1500000 : 1000000))
#define STATIC_DEFAULT_SPUR_OFFSET ((freq_t) 1500000) #define STATIC_DEFAULT_SPUR_OFFSET ((freq_t) 1500000)

88
sa_core.c
Unescape View File

@ -2268,7 +2268,7 @@ pureRSSI_t get_frequency_correction(freq_t f) // Frequency dependent RSSI c
actual_drive = 3; actual_drive = 3;
// else if (f < DRIVE0_MAX_FREQ) // below 600MHz // else if (f < DRIVE0_MAX_FREQ) // below 600MHz
// actual_drive = 0; // Never use drive zero // actual_drive = 0; // Never use drive zero
else if (f < DRIVE1_MAX_FREQ) // below 1.2GHz else if (f < DRIVE1_MAX_FREQ || hw_if) // below 1.2GHz of v4.6
actual_drive = 1; actual_drive = 1;
else if (f < DRIVE2_MAX_FREQ) // below 2.1GHz else if (f < DRIVE2_MAX_FREQ) // below 2.1GHz
actual_drive = 2; actual_drive = 2;
@ -3129,62 +3129,9 @@ static const freq_t static_spur_table[STATIC_SPUR_TABLE_SIZE] = // Valid fo
#define static_spur_IF_plus DEFAULT_IF_PLUS // The IF frequency for which the spur table is value #define static_spur_IF_plus DEFAULT_IF_PLUS // The IF frequency for which the spur table is value
static const freq_t static_spur_table_plus[] = // Valid for IF=977.4MHz static const freq_t static_spur_table_plus[] = // Valid for IF=977.4MHz
{ {
5233000, 266906127,
6300000, 533812254,
16483000, 712374836
16783000,
21300000,
26134000,
36300000,
41134000,
51300000,
66000000,
66300000,
70800000,
72000000,
78000000,
85200000,
101134000,
113134000,
114000000,
115200000,
243881127,
471300000,
487750054,
487762254,
501300000,
508800000,
650974672,
688800000,
699667000,
702865000,
703094000,
703465000,
706616000,
707216000,
708667000,
710366000,
710966000,
711667000,
711667000,
714115000,
714668000,
718465000,
718800000,
721616000,
722216000,
726300000,
729715000,
732865000,
738667000,
740366000,
740966000,
741667000,
747865000,
756667000,
759116000,
793465000,
797216000,
}; };
#define STATIC_SPUR_TABLE_SIZE_PLUS sizeof(static_spur_table_plus)/8 #define STATIC_SPUR_TABLE_SIZE_PLUS sizeof(static_spur_table_plus)/8
@ -3289,7 +3236,7 @@ void fill_spur_table(void)
return; return;
} }
if (actual_rbw_x10 < RBW_FOR_STATIC_TABLE) { // if less then 1100kHz use static table if (actual_rbw_x10 < RBW_FOR_STATIC_TABLE) { // if less then 1100kHz use static table
if (hwid >= 103) { if (hw_if) {
spur_table = (freq_t *)static_spur_table_plus; spur_table = (freq_t *)static_spur_table_plus;
spur_table_size = STATIC_SPUR_TABLE_SIZE_PLUS; spur_table_size = STATIC_SPUR_TABLE_SIZE_PLUS;
spur_IF = static_spur_IF_plus; spur_IF = static_spur_IF_plus;
@ -4389,7 +4336,7 @@ again: // Spur redu
#define TCXO 30000000 #define TCXO 30000000
#define TXCO_DIV3 10000000 #define TXCO_DIV3 10000000
#define AVOID_MULTI 100 #define AVOID_MULTI 150
#ifdef __SI5351__ #ifdef __SI5351__
if (si5351_available) { if (si5351_available) {
@ -4445,7 +4392,7 @@ again: // Spur redu
} else if (lf < 25000000 && max2871) { } else if (lf < 25000000 && max2871) {
ADF4351_R_counter(-1); ADF4351_R_counter(-1);
ADF4351_modulo(200); ADF4351_modulo(200);
} else if (lf > 8000000 /* && lf < 3000000000*/ && MODE_INPUT(setting.mode)) { } else if (lf > 8000000 && !(lf > 1000000000 && hw_if) && MODE_INPUT(setting.mode)) {
if (local_modulo == 0) { if (local_modulo == 0) {
if (max2871) if (max2871)
ADF4351_modulo(100); ADF4351_modulo(100);
@ -4464,9 +4411,12 @@ again: // Spur redu
} else { } else {
if ( (tf / TCXO) & 1 ) { // Odd harmonic of 30MHz if ( (tf / TCXO) & 1 ) { // Odd harmonic of 30MHz
ADF4351_R_counter(-3); ADF4351_R_counter(-3);
} else {
if (hw_if)
ADF4351_R_counter(7);
else
ADF4351_R_counter(4);
} }
else
ADF4351_R_counter(4);
} }
} }
#if 0 #if 0
@ -4483,8 +4433,12 @@ again: // Spur redu
freq_t tf = ((lf + actual_rbw_x10*1000) / TXCO_DIV3) * TXCO_DIV3; freq_t tf = ((lf + actual_rbw_x10*1000) / TXCO_DIV3) * TXCO_DIV3;
if (tf + actual_rbw_x10*1000 >= lf && tf < lf + actual_rbw_x10*1000) // 10MHz if (tf + actual_rbw_x10*1000 >= lf && tf < lf + actual_rbw_x10*1000) // 10MHz
ADF4351_R_counter(-4); // To avoid PLL Loop shoulders at multiple of 10MHz ADF4351_R_counter(-4); // To avoid PLL Loop shoulders at multiple of 10MHz
else else {
ADF4351_R_counter(3); // To avoid PLL Loop shoulders if (hw_if)
ADF4351_R_counter(1);
else
ADF4351_R_counter(3); // To avoid PLL Loop shoulders
}
} else } else
ADF4351_R_counter(1); ADF4351_R_counter(1);
} }
@ -4534,7 +4488,7 @@ again: // Spur redu
actual_drive = 3; actual_drive = 3;
// else if (lf < DRIVE0_MAX_FREQ) // below 600MHz // else if (lf < DRIVE0_MAX_FREQ) // below 600MHz
// actual_drive = 0; // actual_drive = 0;
else if (lf < DRIVE1_MAX_FREQ) // below 1.2GHz else if (lf < DRIVE1_MAX_FREQ || hw_if) // below 1.2GHz
actual_drive = 1; actual_drive = 1;
else if (lf < DRIVE2_MAX_FREQ) // below 2GHz else if (lf < DRIVE2_MAX_FREQ) // below 2GHz
actual_drive = 2; actual_drive = 2;
@ -5983,8 +5937,8 @@ static volatile int dummy;
#else #else
#define OIP3_SPAN 12 #define OIP3_SPAN 12
#endif #endif
markers[2].enabled = search_maximum(2, lf - (rf - lf), 40); markers[2].enabled = search_maximum(2, lf - (rf - lf), 10);
markers[3].enabled = search_maximum(3, rf + (rf - lf), 40); markers[3].enabled = search_maximum(3, rf + (rf - lf), 10);
} else if (setting.measurement == M_PHASE_NOISE && markers[0].index > 10) { // ------------Phase noise measurement } else if (setting.measurement == M_PHASE_NOISE && markers[0].index > 10) { // ------------Phase noise measurement
// Position phase noise marker at requested offset // Position phase noise marker at requested offset
set_marker_index(1, markers[0].index + (setting.mode == M_LOW ? WIDTH/4 : -WIDTH/4)); set_marker_index(1, markers[0].index + (setting.mode == M_LOW ? WIDTH/4 : -WIDTH/4));

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.