From 0c8130db00c270af951f9d577de39db83a54f266 Mon Sep 17 00:00:00 2001 From: Michael Black Date: Wed, 25 Mar 2020 23:32:56 -0500 Subject: [PATCH] Add range_list to xg3.c --- rigs/kenwood/xg3.c | 5 +++++ tests/dumpcaps.c | 23 +++++++++++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/rigs/kenwood/xg3.c b/rigs/kenwood/xg3.c index a80a82f08..0c500c472 100644 --- a/rigs/kenwood/xg3.c +++ b/rigs/kenwood/xg3.c @@ -142,6 +142,11 @@ const struct rig_caps xg3_caps = {0, 11, RIG_MTYPE_MEM, XG3_CHANNEL_CAPS}, RIG_CHAN_END, }, + .tx_range_list1 = { // lo power is actually 5e-14W which can't be represented in hamlib as of 20200325 + {kHz(1500), MHz(200), RIG_MODE_CW, 0, 2, RIG_VFO_A, RIG_ANT_1}, + RIG_FRNG_END, + }, + .priv = (void *)& xg3_priv_caps, diff --git a/tests/dumpcaps.c b/tests/dumpcaps.c index b8699f20c..1dc8aa953 100644 --- a/tests/dumpcaps.c +++ b/tests/dumpcaps.c @@ -896,8 +896,27 @@ void range_print(FILE *fout, const struct freq_range_list range_list[], int rx) if (!rx) { - fprintf(fout, "\t\tLow power: %g W, High power: %g W\n", - range_list[i].low_power / 1000.0f, range_list[i].high_power / 1000.0f); + char *label_lo = "W"; + char *label_hi = "W"; + double low = range_list[i].low_power / 1000.0f; + double hi = range_list[i].high_power / 1000.0f; + if (low < 0) { + label_lo = "mW"; + low *= 1000; + } + if (low < 0) { + label_lo = "uW"; + low *= 1000; + } + if (hi < 0) { + label_hi = "mW"; + hi *= 1000; + } + if (hi < 0) { + label_hi = "uW"; + hi *= 1000; + } + fprintf(fout, "\t\tLow power: %g %s, High power: %g %s\n", low, label_lo, hi, label_hi); } } }