diff --git a/main.c b/main.c index 8ee83f6..5b6e640 100644 --- a/main.c +++ b/main.c @@ -1002,12 +1002,12 @@ config_t config = { .ultra_lna_level_offset = 0, .correction_frequency = { -/* low */ { 10000, 20000, 30000, 70000, 100000, 500000, 600000, 900000, 2000000, 30000000, 130000000, 350000000, 490000000, 540000000, 600000000, 720000000, 790000000, 810000000, 820000000, 830000000 }, -/* low lna */ { 10000, 20000, 30000, 80000, 100000, 200000, 700000, 1000000, 3000000, 30000000, 130000000, 290000000, 600000000, 650000000, 720000000, 760000000, 790000000, 810000000, 820000000, 830000000 }, -/* ultra */ { 30000000, 700000000, 1070000000, 1560000000, 1900000000, 2430000000, 2800000000, 2810000000, 3120000000, 3430000000, 3770000000, 4000000000, 4220000000, 4370000000, 4800000000, 5220000000, 5350000000, 5360000000, 5640000000, 6000000000 }, -/* ultra LNA*/ { 30000000, 700000000, 790000000, 800000000, 1480000000, 2070000000, 2650000000, 2800000000, 2810000000, 3180000000, 3420000000, 3750000000, 3810000000, 4230000000, 4480000000, 5080000000, 5350000000, 5360000000, 5590000000, 6000000000 }, -/* direct */ { 140000000, 150000000, 170000000, 180000000, 275000000, 345000000, 365000000, 385000000, 415000000, 425000000, 565000000, 823000000, 840000000, 930000000, 960000000, 970000000, 990000000, 1040000000, 1110000000, 1130000000 }, -/* direct LNA*/ { 140000000, 150000000, 170000000, 180000000, 275000000, 315000000, 325000000, 405000000, 475000000, 565000000, 823000000, 840000000, 900000000, 930000000, 960000000, 970000000, 990000000, 1040000000, 1110000000, 1130000000 }, + /* low */ { 10000, 40000, 100000, 300000, 500000, 900000, 4000000, 6000000, 30000000, 90000000, 210000000, 300000000, 380000000, 510000000, 600000000, 690000000, 780000000, 810000000, 820000000, 830000000}, + /* low lna */ { 10000, 40000, 100000, 300000, 500000, 900000, 4000000, 6000000, 30000000, 90000000, 150000000, 300000000, 380000000, 570000000, 600000000, 750000000, 770000000, 810000000, 820000000, 830000000}, + /* 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, 30000, 70000, 100000, 300000, 500000, 800000, 2000000, 5000000, 8000000, 30000000, 90000000, 140000000, 370000000, 630000000, 750000000, 790000000, 810000000, 820000000, 830000000}, /* direct */ { 500000000, 823000000, 830000000, 840000000, 850000000, 860000000, 910000000, 920000000, 930000000, 970000000, 990000000, 1030000000, 1040000000, 1070000000, 1080000000, 1090000000, 1100000000, 1110000000, 1120000000, 1130000000}, /* adf */ { 500000000, 700000000, 820000000, 840000000, 950000000, 1000000000, 1040000000, 1070000000, 1320000000, 1570000000, 1750000000, 2220000000, 2800000000, 2810000000, 3000000000, 3250000000, 3440000000, 3800000000, 4060000000, 4350000000}, @@ -1015,12 +1015,12 @@ config_t config = { }, .correction_value = { -/* low */ { 13.62, 11.41, 10.51, 8.79, 7.81, 3.88, 2.05, 0.75, 0.15, 0, -0.7, 1.17, 0.62, 1.53, 0.41, 1.51, 3.98, 7.06, 9.07, 12.6 }, -/* low lna */ { 11.62, 9.91, 9.01, 5.98, 9.31, 7.02, 2.01, 0.67, 0.34, 0, -0.2, 1.06, 1.07, 0.94, 1.92, 2.16, 3.73, 6.4, 7.95, 11.68 }, -/* ultra */ { 0, 0.5, 1.9, 3.34, 3.23, 4.84, 4.8, 5.97, 6.76, 8.56, 9.68, 9.77, 8.9, 9.22, 12.58, 12.03, 12.53, 12.5, 15.8, 14.7 }, -/* ultra LNA*/ { 0, 0.75, 0.64, 1.18, 2.82, 2.88, 4, 4.18, 5.13, 8.05, 10.97, 10.15, 10.74, 18.63, 20.92, 23.27, 27.13, 27.13, 29.5, 29.0 }, -/* direct */ { 1.38, 0.00001, -2.73, -3.11, -11.53, -15.93, -16.27, -18.09, -19.78, -19.59, -25.48, -33.58, -34.05, -33.21, -32.13, -32.38, -31.56, -30.72, -28.55, -28.49 }, -/* direct LNA*/ { 1.04, 0.00001, -2.19, -3.45, -12.87, -15.6, -15.9, -20.67, -23.1, -27.29, -35.01, -35.62, -35.32, -34.46, -34.56, -34.06, -33.58, -32, -30.39, -29.9 }, + /* 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.5, 6.04, 3.55, 2.42, -0.04, -1.06, -1.46, -2.16, -2.71, -2.56, -3.08, -3.47, -3.15, -1.03, -1.75, -0.21, 1.53, 3.81, 5.69, 9.4}, /* direct */ { -6.71, -2.48, -2.46, -2.2, -2.24, -1.96, -1.37, -1.41, -1.14, -0.55, -0.5, 0.11, 0.06, 0.69, 0.64, 0.71, 0.96, 0.93, 1.35, 1.52}, /* adf */ { -1, -5.25, -8.11, -8.35, -8.1, -8.91, -10.3, -10.05, -5.19, -2.69, -2.31, -2.68, -1.31, -2.36, -2.93, -1.94, -0.37, 4.33, 7.17, 9.02}, diff --git a/ui_sa.c b/ui_sa.c index 6d542d1..b514f54 100644 --- a/ui_sa.c +++ b/ui_sa.c @@ -3532,8 +3532,13 @@ static void fetch_numeric_target(uint8_t mode) plot_printf(uistat.text, sizeof uistat.text, "%.3Fs", uistat.value); break; case KM_TRIGGER: - uistat.value = setting.trigger_level; - plot_printf(uistat.text, sizeof uistat.text, "%.1fdB", uistat.value); + uistat.value = value(setting.trigger_level); + char *format; + if (UNIT_IS_LINEAR(setting.unit)) + format = "%.3F%s"; // 5 characters incl u, m, etc... + else + format = "%.1f%s"; + plot_printf(uistat.text, sizeof uistat.text, format, uistat.value,unit_string[setting.unit]); break; case KM_MARKER: if (active_marker >=0) {