From 72663310c5ddfadcf8aec1477e9488678f069edd Mon Sep 17 00:00:00 2001
From: Russ Woodman - K5TUX <k5tux@k5tux.us>
Date: Sat, 19 Mar 2022 14:05:46 -0500
Subject: [PATCH] Fixed broken implementation of "set_level RFPOWER" in rigctld

---
 rigcommander.cpp | 6 +++---
 rigctld.cpp      | 6 +++++-
 rigstate.h       | 4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/rigcommander.cpp b/rigcommander.cpp
index d497c0d..e53a2d6 100644
--- a/rigcommander.cpp
+++ b/rigcommander.cpp
@@ -1407,7 +1407,7 @@ void rigCommander::parseLevels()
             case '\x0A':
                 // TX RF level
                 emit haveTxPower(level);
-                state.set(TXPOWER, level, false);
+                state.set(RFPOWER, level, false);
                 break;
             case '\x0B':
                 // Mic Gain
@@ -4397,9 +4397,9 @@ void rigCommander::stateUpdated()
                 }
                 getSql();
                 break;
-            case TXPOWER:
+            case RFPOWER:
                 if (i.value()._valid) {
-                    setTxPower(state.getChar(TXPOWER));
+                    setTxPower(state.getChar(RFPOWER));
                 }
                 getTxLevel();
                 break;
diff --git a/rigctld.cpp b/rigctld.cpp
index e7c8c46..a3eadae 100644
--- a/rigctld.cpp
+++ b/rigctld.cpp
@@ -710,7 +710,7 @@ void rigCtlClient::socketReadyRead()
                 resp.append(QString("%1").arg((float)rigState->getChar(ANTIVOXGAIN) / 255.0));
             }
             else if (command[1] == "RFPOWER") {
-                resp.append(QString("%1").arg((float)rigState->getChar(TXPOWER) / 255.0));
+                resp.append(QString("%1").arg((float)rigState->getChar(RFPOWER) / 255.0));
             }
             else if (command[1] == "PREAMP") {
                 resp.append(QString("%1").arg(rigState->getChar(PREAMP)*10));
@@ -736,6 +736,10 @@ void rigCtlClient::socketReadyRead()
                 value = command[2].toFloat() * 255;
                 rigState->set(RFGAIN, value, true);
             }
+            else if (command[1] == "RFPOWER") {
+		value = command[2].toFloat() * 255;
+		rigState->set(RFPOWER, value, true);
+            }
             else if (command[1] == "SQL") {
                 value = command[2].toFloat() * 255;
                 rigState->set(SQUELCH, value, true);
diff --git a/rigstate.h b/rigstate.h
index 8722f9e..13c66cf 100644
--- a/rigstate.h
+++ b/rigstate.h
@@ -13,7 +13,7 @@
 
 // Meters at the end as they are ALWAYS updated from the rig!
 enum stateTypes { VFOAFREQ, VFOBFREQ, CURRENTVFO, PTT, MODE, FILTER, DUPLEX, DATAMODE, ANTENNA, RXANTENNA, CTCSS, TSQL, DTCS, CSQL,
-                  PREAMP, AGC, ATTENUATOR, MODINPUT, AFGAIN, RFGAIN, SQUELCH, TXPOWER, MICGAIN, COMPLEVEL, MONITORLEVEL, VOXGAIN, ANTIVOXGAIN,
+                  PREAMP, AGC, ATTENUATOR, MODINPUT, AFGAIN, RFGAIN, SQUELCH, RFPOWER, MICGAIN, COMPLEVEL, MONITORLEVEL, VOXGAIN, ANTIVOXGAIN,
                   FAGCFUNC, NBFUNC, COMPFUNC, VOXFUNC, TONEFUNC, TSQLFUNC, SBKINFUNC, FBKINFUNC, ANFFUNC, NRFUNC, AIPFUNC, APFFUNC, MONFUNC, MNFUNC,RFFUNC,
                   AROFUNC, MUTEFUNC, VSCFUNC, REVFUNC, SQLFUNC, ABMFUNC, BCFUNC, MBCFUNC, RITFUNC, AFCFUNC, SATMODEFUNC, SCOPEFUNC,
                   NBLEVEL, NBDEPTH, NBWIDTH, NRLEVEL, RIGINPUT, POWERONOFF, RITVALUE, 
@@ -124,4 +124,4 @@ private:
     QMutex _mutex;
 };
 
-#endif
\ No newline at end of file
+#endif