From ec4590df8decc4c47a57e6dc78e92871b92c230e Mon Sep 17 00:00:00 2001 From: George Baltz N3GB Date: Mon, 23 Jun 2025 12:55:12 -0400 Subject: [PATCH] Restore TS-590S/SG RIG_LEVEL_RFPOWER_METER --- rigs/kenwood/ts590.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/rigs/kenwood/ts590.c b/rigs/kenwood/ts590.c index 3cc9cc786..9f2e3c464 100644 --- a/rigs/kenwood/ts590.c +++ b/rigs/kenwood/ts590.c @@ -1014,15 +1014,14 @@ static int ts590_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) case RIG_LEVEL_RFPOWER_METER: case RIG_LEVEL_RFPOWER_METER_WATTS: { - static cal_table_t power_meter = + int raw_value; + const static cal_table_t power_meter = { 7, { { 0, 0}, { 3, 5}, { 6, 10}, { 8, 15}, {12, 25}, { 17, 50}, { 30, 100} } }; - int raw_value; - if (CACHE(rig)->ptt == RIG_PTT_OFF) { val->f = 0; @@ -1038,8 +1037,6 @@ static int ts590_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) sscanf(ackbuf, "SM0%d", &raw_value); -// val->f = (float) raw_value / 30.0f; - if (level == RIG_LEVEL_RFPOWER_METER_WATTS) { val->f = roundf(rig_raw2val(raw_value, &power_meter)); @@ -1050,7 +1047,11 @@ static int ts590_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) } } - + else + { + val->f = (float) raw_value / 30.0f; + } + break; }