From 87002745a5876ee27f53be82ba79a63294e05ea9 Mon Sep 17 00:00:00 2001
From: DJ2LS <dj2ls@proton.me>
Date: Fri, 12 Jan 2024 20:21:22 +0100
Subject: [PATCH] RADIO MANAGER - WIP fixed set mode and power

---
 gui/src/components/grid/grid_active_rig_control.vue | 4 ++--
 gui/src/js/api.js                                   | 1 +
 modem/radio_manager.py                              | 5 ++++-
 modem/rigctld.py                                    | 8 ++++----
 modem/server.py                                     | 3 ++-
 modem/state_manager.py                              | 3 ++-
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/gui/src/components/grid/grid_active_rig_control.vue b/gui/src/components/grid/grid_active_rig_control.vue
index 3ab750c7..2042fe3e 100644
--- a/gui/src/components/grid/grid_active_rig_control.vue
+++ b/gui/src/components/grid/grid_active_rig_control.vue
@@ -47,7 +47,7 @@ function set_radio_parameters() {
             <select
               class="form-control"
               v-model="state.mode"
-              @click="set_hamlib_mode()"
+              @click="set_radio_parameters()"
               v-bind:class="{
                 disabled: state.hamlib_status === 'disconnected',
               }"
@@ -69,7 +69,7 @@ function set_radio_parameters() {
             <select
               class="form-control"
               v-model="state.rf_level"
-              @click="set_hamlib_rf_level()"
+              @click="set_radio_parameters()"
               v-bind:class="{
                 disabled: state.hamlib_status === 'disconnected',
               }"
diff --git a/gui/src/js/api.js b/gui/src/js/api.js
index 61444076..4dd9b641 100644
--- a/gui/src/js/api.js
+++ b/gui/src/js/api.js
@@ -121,6 +121,7 @@ export function setRadioParameters(frequency, mode, rf_level) {
   return apiPost("/radio", {
     radio_frequency: frequency,
     radio_mode: mode,
+    radio_rf_level: rf_level,
   });
 }
 export function getRadioStatus() {
diff --git a/modem/radio_manager.py b/modem/radio_manager.py
index 1ddbc68b..dce38664 100644
--- a/modem/radio_manager.py
+++ b/modem/radio_manager.py
@@ -39,13 +39,16 @@ class RadioManager:
     def set_mode(self, mode):
         self.radio.set_mode(mode)
 
+    def set_rf_level(self, level):
+        self.radio.set_rf_level(level)
+
     def update_parameters(self):
         while not self.stop_event.is_set():
             parameters = self.radio.get_parameters()
             self.state_manager.set("radio_frequency", parameters['frequency'])
             self.state_manager.set("radio_mode", parameters['mode'])
             self.state_manager.set("radio_bandwidth", parameters['bandwidth'])
-            self.state_manager.set("radio_rf_power", parameters['rf'])
+            self.state_manager.set("radio_rf_level", parameters['rf'])
 
             if self.state_manager.isTransmitting():
                 self.radio_alc = parameters['alc']
diff --git a/modem/rigctld.py b/modem/rigctld.py
index ac8d2c7d..b4e5eda7 100644
--- a/modem/rigctld.py
+++ b/modem/rigctld.py
@@ -110,7 +110,7 @@ class radio:
         """
         if self.connected:
             try:
-                command = f"M {mode}"
+                command = f"M {mode} 0"
                 self.send_command(command)
                 self.parameters['mode'] = mode
                 return True
@@ -159,7 +159,7 @@ class radio:
                 self.connected = False
         return False
 
-    def set_rf(self, rf):
+    def set_rf_level(self, rf):
         """Set the RF.
 
         Args:
@@ -170,7 +170,7 @@ class radio:
         """
         if self.connected:
             try:
-                command = f"l RF {rf}"
+                command = f"L RFPOWER {rf/100}" #RF RFPOWER --> RFPOWER == IC705
                 self.send_command(command)
                 self.parameters['rf'] = rf
                 return True
@@ -199,7 +199,7 @@ class radio:
 
             self.parameters['alc'] = self.send_command('l ALC')
             self.parameters['strength'] = self.send_command('l STRENGTH')
-            self.parameters['rf'] = self.send_command('l RF')
+            self.parameters['rf'] = self.send_command('l RFPOWER') # RF, RFPOWER
 
         """Return the latest fetched parameters."""
         return self.parameters
diff --git a/modem/server.py b/modem/server.py
index edc8695b..12804952 100644
--- a/modem/server.py
+++ b/modem/server.py
@@ -246,7 +246,8 @@ def post_modem_send_raw_stop():
 def get_post_radio():
     if request.method in ['POST']:
         app.radio_manager.set_frequency(request.json['radio_frequency'])
-        #app.radio_manager.set_mode(request.json['radio_mode'])
+        app.radio_manager.set_mode(request.json['radio_mode'])
+        app.radio_manager.set_rf_level(int(request.json['radio_rf_level']))
 
         return api_response(request.json)
     elif request.method == 'GET':
diff --git a/modem/state_manager.py b/modem/state_manager.py
index b99f7f94..74352cba 100644
--- a/modem/state_manager.py
+++ b/modem/state_manager.py
@@ -43,7 +43,7 @@ class StateManager:
         self.radio_frequency = 0
         self.radio_mode = None
         self.radio_bandwidth = 0
-        self.radio_rf_power = 0
+        self.radio_rf_level = 0
         self.radio_strength = 0
         # Set rig control status regardless or rig control method
         self.radio_status = False
@@ -183,4 +183,5 @@ class StateManager:
             "radio_status": self.radio_status,
             "radio_frequency": self.radio_frequency,
             "radio_mode": self.radio_mode,
+            "radio_rf_level": self.radio_rf_level
         }
\ No newline at end of file