From a1164eea60f69b1f93ef4c3e8b4764db6cb1f642 Mon Sep 17 00:00:00 2001
From: DJ2LS <dj2ls@proton.me>
Date: Fri, 12 Jan 2024 20:34:07 +0100
Subject: [PATCH] RADIO MANAGER - WIP implemented s-meter - possibly broken

---
 gui/src/js/eventHandler.js | 6 ++++++
 modem/radio_manager.py     | 2 +-
 modem/state_manager.py     | 6 ++++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/gui/src/js/eventHandler.js b/gui/src/js/eventHandler.js
index 1aa24db7..70bf46e3 100644
--- a/gui/src/js/eventHandler.js
+++ b/gui/src/js/eventHandler.js
@@ -32,6 +32,12 @@ export function stateDispatcher(data) {
     stateStore.dbfs_level_percent = Math.round(
       Math.pow(10, data["audio_dbfs"] / 20) * 100,
     );
+
+    stateStore.s_meter_strength_raw = Math.round(data["s_meter_strength"]);
+    stateStore.s_meter_strength_percent = Math.round(
+      Math.pow(10, data["s_meter_strength"] / 20) * 100,
+    );
+
     stateStore.channel_busy_slot = data["channel_busy_slot"];
     stateStore.beacon_state = data["is_beacon_running"];
     stateStore.radio_status = data["radio_status"];
diff --git a/modem/radio_manager.py b/modem/radio_manager.py
index dce38664..5f0c214a 100644
--- a/modem/radio_manager.py
+++ b/modem/radio_manager.py
@@ -52,7 +52,7 @@ class RadioManager:
 
             if self.state_manager.isTransmitting():
                 self.radio_alc = parameters['alc']
-            self.state_manager.set("radio_strength", parameters['strength'])
+            self.state_manager.set("s_meter_strength", parameters['strength'])
             time.sleep(self.refresh_rate)
     def stop(self):
         self.radio.disconnect()
diff --git a/modem/state_manager.py b/modem/state_manager.py
index 74352cba..83563788 100644
--- a/modem/state_manager.py
+++ b/modem/state_manager.py
@@ -44,7 +44,7 @@ class StateManager:
         self.radio_mode = None
         self.radio_bandwidth = 0
         self.radio_rf_level = 0
-        self.radio_strength = 0
+        self.s_meter_strength = 0
         # Set rig control status regardless or rig control method
         self.radio_status = False
 
@@ -85,6 +85,7 @@ class StateManager:
             "radio_status": self.radio_status,
             "radio_frequency": self.radio_frequency,
             "radio_mode": self.radio_mode,
+            "s_meter_strength": self.s_meter_strength,
             "channel_busy_slot": self.channel_busy_slot,
             "audio_dbfs": self.audio_dbfs,
             "activities": self.activities_list,
@@ -183,5 +184,6 @@ class StateManager:
             "radio_status": self.radio_status,
             "radio_frequency": self.radio_frequency,
             "radio_mode": self.radio_mode,
-            "radio_rf_level": self.radio_rf_level
+            "radio_rf_level": self.radio_rf_level,
+            "s_meter_strength": self.s_meter_strength,
         }
\ No newline at end of file