From a955d455184b8ebc7747a4a5612bf83147965409 Mon Sep 17 00:00:00 2001
From: DJ2LS <dj2ls@proton.me>
Date: Sun, 11 Feb 2024 08:48:49 +0100
Subject: [PATCH] adjusted settings

---
 gui/src/components/main_startup_check.vue | 79 ++++++++---------------
 modem/config.py                           |  2 +-
 modem/helpers.py                          |  3 +-
 modem/rigctld.py                          |  2 +-
 4 files changed, 30 insertions(+), 56 deletions(-)

diff --git a/gui/src/components/main_startup_check.vue b/gui/src/components/main_startup_check.vue
index d9d47de5..da8ae4e2 100644
--- a/gui/src/components/main_startup_check.vue
+++ b/gui/src/components/main_startup_check.vue
@@ -9,6 +9,7 @@ import pinia from "../store/index";
 setActivePinia(pinia);
 
 import { settingsStore as settings, onChange } from "../store/settingsStore.js";
+import { sendModemCQ } from "../js/api.js";
 
 import { useStateStore } from "../store/stateStore.js";
 const state = useStateStore(pinia);
@@ -61,7 +62,7 @@ function getRigControlStuff() {
 }
 
 function testHamlib() {
-  alert("Not yet implemented.");
+  sendḾodemCQ();
 }
 </script>
 
@@ -295,57 +296,7 @@ function testHamlib() {
                   >
                     <!-- Shown when rigctld is selected-->
 
-                    <div class="input-group input-group-sm mb-1">
-                      <label class="input-group-text w-25"
-                        >Rigctld control</label
-                      >
-                      <label class="input-group-text">
-                        <button
-                          type="button"
-                          class="btn btn-sm btn-outline-success"
-                          data-bs-toggle="tooltip"
-                          data-bs-trigger="hover"
-                          data-bs-html="false"
-                          title="Start rigctld"
-                          v-bind:class="{
-                            disabled: state.rigctld_started == 'true',
-                          }"
-                        >
-                          <i class="bi bi-play-fill"></i>
-                        </button> </label
-                      ><label class="input-group-text">
-                        <button
-                          type="button"
-                          class="btn btn-sm btn-outline-danger"
-                          data-bs-toggle="tooltip"
-                          data-bs-trigger="hover"
-                          data-bs-html="false"
-                          title="Stop rigctld"
-                          v-bind:class="{
-                            disabled:
-                              state.rigctld_started == 'false' ||
-                              state.rigctld_started === undefined,
-                          }"
-                        >
-                          <i class="bi bi-stop-fill"></i>
-                        </button>
-                      </label>
-                      <label class="input-group-text">
-                        <button
-                          type="button"
-                          id="testHamlib"
-                          class="btn btn-sm btn-outline-secondary"
-                          data-bs-placement="bottom"
-                          data-bs-toggle="tooltip"
-                          data-bs-trigger="hover"
-                          data-bs-html="true"
-                          @click="testHamlib"
-                          title="Test your hamlib settings and toggle PTT once. Button will become <strong class='text-success'>green</strong> on success and <strong class='text-danger'>red</strong> if fails."
-                        >
-                          PTT test
-                        </button>
-                      </label>
-                    </div>
+
 
                     <div class="input-group input-group-sm mb-1">
                       <span class="input-group-text" style="width: 180px"
@@ -368,6 +319,30 @@ function testHamlib() {
                         </option>
                       </select>
                     </div>
+
+                    <div class="input-group input-group-sm mb-1">
+                      <label class="input-group-text w-25"
+                        >Rigctld Test</label
+                      >
+
+                      <label class="input-group-text">
+                        <button
+                          type="button"
+                          id="testHamlib"
+                          class="btn btn-sm btn-outline-secondary"
+                          data-bs-placement="bottom"
+                          data-bs-toggle="tooltip"
+                          data-bs-trigger="hover"
+                          data-bs-html="true"
+                          @click="testHamlib"
+                          title="Test your hamlib settings and toggle PTT once. Button will become <strong class='text-success'>green</strong> on success and <strong class='text-danger'>red</strong> if fails."
+                        >
+                          Send a CQ
+                        </button>
+                      </label>
+                    </div>
+
+
                   </div>
                   <div
                     :class="
diff --git a/modem/config.py b/modem/config.py
index 446c2aea..62851a68 100644
--- a/modem/config.py
+++ b/modem/config.py
@@ -157,7 +157,7 @@ class CONFIG:
         """
         read config file
         """
-        self.log.info("[CFG] reading...")
+        #self.log.info("[CFG] reading...")
         if not self.config_exists():
             return False
         
diff --git a/modem/helpers.py b/modem/helpers.py
index 37870d40..aff3b06d 100644
--- a/modem/helpers.py
+++ b/modem/helpers.py
@@ -767,5 +767,4 @@ def kill_and_execute(binary_path, additional_args=None):
 
     # Execute the binary with additional arguments non-blocking
     command = [binary_path] + (additional_args if additional_args else [])
-    process = subprocess.Popen(command)
-    return process
\ No newline at end of file
+    return subprocess.Popen(command)
\ No newline at end of file
diff --git a/modem/rigctld.py b/modem/rigctld.py
index bf652b4b..d1cb1881 100644
--- a/modem/rigctld.py
+++ b/modem/rigctld.py
@@ -224,7 +224,7 @@ class radio:
 
         # Helper function to check if the value should be ignored
         def should_ignore(value):
-            return value == 'ignore' or value == 0
+            return value in ['ignore', 0]
 
         # Model ID, Serial Port, and Speed
         if not should_ignore(config.get('model_id', "0")):