From 176c49240d5d3006a02db2d2db4ef84c6209825b Mon Sep 17 00:00:00 2001
From: George Baltz N3GB <GeoBaltz@gmail.com>
Date: Mon, 13 Nov 2023 13:24:52 -0500
Subject: [PATCH] Use general meter reader to get SWR value for TS-990.

---
 rigs/kenwood/kenwood.c | 9 ---------
 rigs/kenwood/ts990s.c  | 6 +-----
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c
index f6aaed97c..9ff8b125c 100644
--- a/rigs/kenwood/kenwood.c
+++ b/rigs/kenwood/kenwood.c
@@ -1100,15 +1100,6 @@ int kenwood_open(RIG *rig)
     // mismatched IDs can still be tested
     rig->state.rigport.retry = retry_save;
 
-
-    // TS-990S needs to ensure all RM meters are turned off as first one with read on gets read
-    // Any RM commands need to be ON/READ/OFF to allow other apps or threads to read meters
-
-    if (RIG_IS_TS990S)
-    {
-        kenwood_transaction(rig, "RM10;RM20;RM30;RM40;RM50;RM60;", NULL, 0);
-    }
-
     RETURNFUNC(RIG_OK);
 }
 
diff --git a/rigs/kenwood/ts990s.c b/rigs/kenwood/ts990s.c
index 39a5c9a07..112c3cba3 100644
--- a/rigs/kenwood/ts990s.c
+++ b/rigs/kenwood/ts990s.c
@@ -647,16 +647,12 @@ int ts990s_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
         break;
 
     case RIG_LEVEL_SWR:
-        // we need to turn on read, read it, and turn it off again
-        // first RM meter with read on is the that gets read with RM;
-        retval = kenwood_safe_transaction(rig, "RM21;RM;RM20", lvlbuf, sizeof(lvlbuf), 8);
-
+        retval = get_kenwood_meter_reading(rig, '2', &lvl);
         if (retval != RIG_OK)
         {
             return retval;
         }
 
-        sscanf(lvlbuf, "RM2%d", &lvl);
         val->f = rig_raw2val_float(lvl, &rig->caps->swr_cal);
         val->f = round(val->f*10)/10.0;  // 1 decimal place precision 
         break;