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

Output freq display, new correction tables,

Browse Source
pwm
erikkaashoek 3 years ago
parent 6ebe72f173
commit 6e496ed1ff
3 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File

30
main.c
Unescape View File

@ -1015,24 +1015,24 @@ config_t config = {
/* ultra */ { 30000000, 700000000, 880000000, 1540000000, 1660000000, 1850000000, 2210000000, 2420000000, 2650000000, 2800000000, 2810000000, 3420000000, 3900000000, 4340000000, 4490000000, 4880000000, 4970000000, 5300000000, 5490000000, 6000000000},
/* ultra lna */ { 30000000, 700000000, 1720000000, 2270000000, 2530000000, 2800000000, 2810000000, 3160000000, 3420000000, 3780000000, 4260000000, 4340000000, 4450000000, 4540000000, 4940000000, 5150000000, 5280000000, 5380000000, 5640000000, 6000000000},
/* direct */ { 140000000, 150000000, 160000000, 180000000, 280000000, 380000000, 390000000, 410000000, 490000000, 560000000, 830000000, 840000000, 890000000, 900000000, 920000000, 940000000, 980000000, 1020000000, 1070000000, 1130000000},
/* direct lna */ { 140000000, 160000000, 180000000, 280000000, 300000000, 380000000, 390000000, 450000000, 490000000, 560000000, 830000000, 880000000, 920000000, 930000000, 950000000, 1010000000, 1040000000, 1070000000, 1120000000, 1130000000},
/* out */ { 10000, 20000, 50000, 100000, 200000, 500000, 2000000, 8000000, 30000000, 150000000, 390000000, 470000000, 640000000, 740000000, 770000000, 800000000, 810000000, 820000000, 823000000, 830000000, },
/* direct */ { 500000000, 823000000, 830000000, 840000000, 890000000, 920000000, 930000000, 940000000, 950000000, 970000000, 990000000, 1000000000, 1020000000, 1030000000, 1040000000, 1050000000, 1060000000, 1080000000, 1110000000, 1130000000, },
/* adf */ { 500000000, 700000000, 823000000, 980000000, 1050000000, 1300000000, 1550000000, 1850000000, 2030000000, 2800000000, 2810000000, 2970000000, 3100000000, 3210000000, 3470000000, 3780000000, 3910000000, 4060000000, 4190000000, 4400000000, },
/* ultra */ { 10000, 20000, 70000, 200000, 500000, 3000000, 140000000, 480000000, 910000000, 1210000000, 1580000000, 2000000000, 2480000000, 2800000000, 2810000000, 3710000000, 4230000000, 4940000000, 5200000000, 5400000000, },
/* direct lna */ { 140000000, 160000000, 180000000, 280000000, 300000000, 380000000, 390000000, 450000000, 490000000, 560000000, 830000000, 880000000, 920000000, 930000000, 950000000, 1010000000, 1040000000, 1070000000, 1120000000, 1130000000, },
/* out */ { 30000, 100000, 200000, 600000, 5000000, 10000000, 110000000, 120000000, 240000000, 300000000, 400000000, 490000000, 650000000, 690000000, 750000000, 780000000, 800000000, 810000000, 823000000, 830000000, },
/* direct */ { 500000000, 823000000, 830000000, 850000000, 860000000, 870000000, 880000000, 890000000, 900000000, 910000000, 920000000, 930000000, 1030000000, 1040000000, 1050000000, 1060000000, 1080000000, 1100000000, 1120000000, 1130000000, },
/* adf */ { 500000000, 1130000000, 1240000000, 1400000000, 1500000000, 1560000000, 1610000000, 1850000000, 1970000000, 2210000000, 2350000000, 2600000000, 2800000000, 2810000000, 2940000000, 3000000000, 3250000000, 3480000000, 3830000000, 4400000000, },
/* ultra */ { 823000000, 1020000000, 1470000000, 1640000000, 1950000000, 2230000000, 2510000000, 2800000000, 2810000000, 2980000000, 3110000000, 3190000000, 3300000000, 3360000000, 3380000000, 3640000000, 3890000000, 4220000000, 5030000000, 5400000000, },
},
.correction_value =
{
/* low */ { 14.18, 9.5, 7.6, 3.78, 1.47, 0.12, 0.29, 0, 0, -0.77, 0.68, 0.37, 1.42, 0.97, 0.78, 0.69, 2.62, 5.22, 6.9, 9.54},
/* low lna */ { 12.89, 9.66, 7.23, 5.19, 3.51, 0.97, 0.86, 0.28, 0, 0.05, -0.1, 0.88, 1.3, 0.41, 0.8, 1.7, 2.33, 5.94, 7.03, 9.74},
/* ultra */ { 0, 0.46, 0.63, 2.59, 2.7, 2.3, 2.59, 3.34, 3.48, 2.89, 3.98, 6.47, 7.47, 7.34, 8.68, 11.35, 11.6, 11, 11.09, 13.21},
/* ultra lna */ { 0, 0.74, 1.93, 1.81, 2.64, 1.55, 2.45, 5.1, 7.78, 9.46, 13.98, 15.34, 18.41, 19.96, 23.21, 21.82, 22.09, 24.23, 25.42, 26.02},
/* direct */ { 4.98, 3.43, 2.6, 0, -8.46, -14.19, -13.67, -15.69, -18.7, -21.64, -30.68, -30.3, -30.13, -29.18, -29.46, -28.56, -27.77, -26.79, -25.11, -24.06},
/* direct lna */ { 4.98, 3, 0, -9.4, -11, -15.63, -16.11, -18.7, -20.79, -23.52, -31.62, -31.58, -31.03, -30.36, -30.43, -28.56, -27.31, -27.05, -25.41, -25.41},
/* out */ { 8.21, 5.86, 3.02, 0.76, -1.17, -2.75, -3.77, -4.3, -4.58, -4.66, -2.6, -3.27, -3.38, -2.34, -1.47, 0.51, 1.48, 2.83, 3.41, 5.57, },
/* direct */ { -8.86, -4.93, -4.84, -4.74, -4.2, -3.88, -3.78, -3.63, -3.51, -3.23, -2.95, -2.77, -2.56, -2.46, -2.33, -2.21, -2.08, -1.74, -1.48, -1.22, },
/* adf */ { -1.88, -4.15, -6.6, -6.7, -7.92, -4.23, -1.31, -0.36, -0.79, 0.19, -0.95, -1.8, -0.71, -0.97, 0.98, 5.56, 7.16, 7.49, 6.83, 6.68, },
/* ultra */ { 7.83, 5.55, 1.5, -1.54, -2.96, -4.15, -4.87, -3.68, -3.78, -2.51, -0.46, -2.17, -0.7, 1.5, 0.51, 2.84, 1.87, 7.65, 6.73, 7.13, },
/* low */ { 14.18, 9.5, 7.6, 3.78, 1.47, 0.12, 0.29, 0, 0, -0.77, 0.68, 0.37, 1.42, 0.97, 0.78, 0.69, 2.62, 5.22, 6.9, 9.54, },
/* low lna */ { 12.89, 9.66, 7.23, 5.19, 3.51, 0.97, 0.86, 0.28, 0, 0.05, -0.1, 0.88, 1.3, 0.41, 0.8, 1.7, 2.33, 5.94, 7.03, 9.74, },
/* ultra */ { 0, 0.46, 0.63, 2.59, 2.7, 2.3, 2.59, 3.34, 3.48, 2.89, 3.98, 6.47, 7.47, 7.34, 8.68, 11.35, 11.6, 11, 11.09, 13.21, },
/* ultra lna */ { 0, 0.74, 1.93, 1.81, 2.64, 1.55, 2.45, 5.1, 7.78, 9.46, 13.98, 15.34, 18.41, 19.96, 23.21, 21.82, 22.09, 24.23, 25.42, 26.02, },
/* direct */ { 4.98, 3.43, 2.6, 0, -8.46, -14.19, -13.67, -15.69, -18.7, -21.64, -30.68, -30.3, -30.13, -29.18, -29.46, -28.56, -27.77, -26.79, -25.11, -24.06, },
/* direct lna */ { 4.98, 3, 0, -9.4, -11, -15.63, -16.11, -18.7, -20.79, -23.52, -31.62, -31.58, -31.03, -30.36, -30.43, -28.56, -27.31, -27.05, -25.41, -25.41, },
/* out */ { 4.88, 1.05, -1.13, -3, -3.97, -4.02, -4.56, -4.78, -3.73, -3.68, -2.8, -3.48, -3.44, -2.99, -2.18, -1.12, 0, 0.82, 2.66, 4.88, },
/* direct */ { -7.92, -4.27, -4.13, -3.93, -3.73, -3.67, -3.57, -3.43, -3.34, -3.17, -3.2, -3, -1.65, -1.67, -1.37, -1.41, -0.94, -0.77, -0.53, 0.35, },
/* adf */ { 0.11, 0.57, 3.36, 7.95, 10.25, 11.22, 11.28, 9.39, 8.15, 7.71, 8.22, 7.92, 6.97, 6.1, 4.45, 4.3, 4.46, 6.46, 11.25, 15.5, },
/* ultra */ { -3.67, -3.04, -0.55, -0.59, -2.18, -1.98, -0.92, 1.04, 0.17, 0.13, 1.16, 0.8, 1.5, 1.78, 1.13, 1.78, 0.99, 1.06, 7.35, 6.5, },
},
.setting_frequency_30mhz = 30000000ULL * FREQ_MULTIPLIER,
.cor_am = 0,

3
sa_core.c
Unescape View File

@ -1275,6 +1275,9 @@ void set_level(float v) // Set the output level in dB in high/low output
}
#endif
setting.level = v;
#ifdef TINYSA4
set_output_path(get_sweep_frequency(ST_CENTER), v);
#endif
if (setting.mode == M_GENHIGH) correct_high_output_level();
dirty = true;
}

7
ui.c
Unescape View File

@ -4546,7 +4546,12 @@ static void fetch_numeric_target(uint8_t mode)
break;
case KM_CENTER:
uistat.freq_value = get_sweep_frequency(ST_CENTER) + (setting.frequency_offset - FREQUENCY_SHIFT);
plot_printf(uistat.text, sizeof uistat.text, "%.3QHz", uistat.freq_value);
#ifdef TINYSA4
if (uistat.freq_value > 990000000UL)
plot_printf(uistat.text, sizeof uistat.text, "%.9QHz", uistat.freq_value);
else
#endif
plot_printf(uistat.text, sizeof uistat.text, "%.6QHz", uistat.freq_value);
break;
case KM_SPAN:
uistat.freq_value = get_sweep_frequency(ST_SPAN);

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.