From c36933d62294ef703e76f10ca27327b0ab88a9ea Mon Sep 17 00:00:00 2001
From: DJ2LS <dj2ls@proton.me>
Date: Sun, 8 Oct 2023 22:09:09 +0200
Subject: [PATCH] adjusted daemon for starting rigctld

---
 gui_vue/src/components/main_rig_control.vue |  5 +++++
 gui_vue/src/js/daemon.js                    |  9 +++++++++
 gui_vue/src/store/stateStore.js             |  8 +++++++-
 tnc/daemon.py                               |  5 ++---
 tnc/sock.py                                 | 22 ++++++++++++++-------
 5 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/gui_vue/src/components/main_rig_control.vue b/gui_vue/src/components/main_rig_control.vue
index e9e79ba3..e209c2df 100644
--- a/gui_vue/src/components/main_rig_control.vue
+++ b/gui_vue/src/components/main_rig_control.vue
@@ -11,6 +11,9 @@ setActivePinia(pinia);
 import { useSettingsStore } from "../store/settingsStore.js";
 const settings = useSettingsStore(pinia);
 
+import { useStateStore } from "../store/stateStore.js";
+const state = useStateStore(pinia);
+
 function selectRadioControl() {
 // @ts-expect-error
   switch (event.target.id) {
@@ -177,6 +180,8 @@ alert("not yet implemented")
                 id="hamlib_rigctld_status"
                 aria-label="State"
                 aria-describedby="basic-addon1"
+                v-model="state.rigctld_started"
+
               />
 
               <button
diff --git a/gui_vue/src/js/daemon.js b/gui_vue/src/js/daemon.js
index 451005f5..5bfe1e6d 100644
--- a/gui_vue/src/js/daemon.js
+++ b/gui_vue/src/js/daemon.js
@@ -148,6 +148,7 @@ daemon.on("data", function (socketdata) {
         }
       }
 
+      console.log(data)
       if (data["command"] == "daemon_state") {
         let Data = {
           input_devices: data["input_devices"],
@@ -165,8 +166,16 @@ daemon.on("data", function (socketdata) {
         audioStore.inputDevices = data["input_devices"];
         audioStore.outputDevices = data["output_devices"];
         state.tnc_running_state = data["daemon_state"][0]["status"];
+
+        state.rigctld_started = data["rigctld_state"][0]["status"];
+        //state.rigctld_process = data["daemon_state"][0]["rigctld_process"];
+
+
       }
 
+
+
+
       if (data["command"] == "test_hamlib") {
         let Data = {
           hamlib_result: data["result"],
diff --git a/gui_vue/src/store/stateStore.js b/gui_vue/src/store/stateStore.js
index 3a994c7e..42621968 100644
--- a/gui_vue/src/store/stateStore.js
+++ b/gui_vue/src/store/stateStore.js
@@ -53,6 +53,10 @@ export const useStateStore = defineStore("stateStore", () => {
   var arq_seconds_until_timeout = ref();
   var arq_seconds_until_timeout_percent = ref();
 
+  var rigctld_started = ref();
+  var rigctld_process = ref();
+
+
   function updateTncState(state) {
     tnc_connection.value = state;
 
@@ -145,6 +149,8 @@ export const useStateStore = defineStore("stateStore", () => {
     is_codec2_traffic,
     rf_level,
     heard_stations,
-    beacon_state
+    beacon_state,
+    rigctld_started,
+    rigctld_process
   };
 });
diff --git a/tnc/daemon.py b/tnc/daemon.py
index 2d9b8556..c6468d43 100755
--- a/tnc/daemon.py
+++ b/tnc/daemon.py
@@ -252,17 +252,16 @@ class DAEMON:
             elif sys.platform in ["win32", "win64"]:
                 command.append("rigctld.exe")
 
-            options = ""
+            options = "--version"
             command += options
             proc = subprocess.Popen(command)
             atexit.register(proc.kill)
         except Exception as err:
             self.log.info("[DMN] starting rigctld: ", e=err)
 
-        Daemon.rigctldrocess = proc
+        Daemon.rigctldprocess = proc
         Daemon.rigctldstarted = True
 
-
     def start_tnc(self, data):
         self.log.warning("[DMN] Starting TNC", rig=data[5], port=data[6])
 
diff --git a/tnc/sock.py b/tnc/sock.py
index c13e320f..03514c6a 100644
--- a/tnc/sock.py
+++ b/tnc/sock.py
@@ -956,7 +956,7 @@ class ThreadedTCPRequestHandler(socketserver.StreamRequestHandler):
         if received_json["type"] == "set" and received_json["command"] == "stop_tnc":
             self.daemon_stop_tnc(received_json)
 
-        if received_json["type"] == "set" and received_json["command"] == "start_rigctld":
+        if received_json["type"] == "set" and received_json["command"] == "start_rigctld" and not Daemon.rigctldstarted:
             self.daemon_start_rigctld(received_json)
 
         if received_json["type"] == "set" and received_json["command"] == "stop_rigctld":
@@ -1183,12 +1183,13 @@ class ThreadedTCPRequestHandler(socketserver.StreamRequestHandler):
         try:
             log.warning("[SCK] Stopping rigctld")
 
-            Daemon.rigctldprocess.kill()
-            # unregister process from atexit to avoid process zombies
-            atexit.unregister(Daemon.rigctldprocess.kill)
+            if Daemon.rigctldstarted:
+                Daemon.rigctldprocess.kill()
+                # unregister process from atexit to avoid process zombies
+                atexit.unregister(Daemon.rigctldprocess.kill)
 
-            Daemon.rigctldstarted = False
-            command_response("stop_tnc", True)
+                Daemon.rigctldstarted = False
+                command_response("stop_rigctld", True)
         except Exception as err:
             command_response("stop_tnc", False)
             log.warning("[SCK] command execution error", e=err, command=received_json)
@@ -1208,13 +1209,14 @@ def send_daemon_state():
         output = {
             "command": "daemon_state",
             "daemon_state": [],
+            "rigctld_state": [],
             "python_version": str(python_version),
             "input_devices": AudioParam.audio_input_devices,
             "output_devices": AudioParam.audio_output_devices,
             "serial_devices": Daemon.serial_devices,
             # 'cpu': str(psutil.cpu_percent()),
             # 'ram': str(psutil.virtual_memory().percent),
-            "version": "0.1",
+            "version": TNC.version,
         }
 
         if Daemon.tncstarted:
@@ -1222,6 +1224,11 @@ def send_daemon_state():
         else:
             output["daemon_state"].append({"status": "stopped"})
 
+        if Daemon.rigctldstarted:
+            output["rigctld_state"].append({"status": "running"})
+        else:
+            output["rigctld_state"].append({"status": "stopped"})
+
         return json.dumps(output)
     except Exception as err:
         log.warning("[SCK] error", e=err)
@@ -1277,6 +1284,7 @@ def send_tnc_state():
         "hamlib_status": HamlibParam.hamlib_status,
         "listen": str(TNC.listen),
         "audio_recording": str(AudioParam.audio_record),
+
     }
 
     # add heard stations to heard stations object