From 6670f36ad8f5450d92658d38f3480d84695047da Mon Sep 17 00:00:00 2001
From: DJ2LS <dj2ls@proton.me>
Date: Sun, 19 Nov 2023 09:56:00 +0100
Subject: [PATCH] read config after hot reload

---
 gui/src/store/settingsStore.js | 2 ++
 modem/config.py                | 2 --
 modem/data_handler.py          | 1 -
 modem/server.py                | 2 +-
 modem/server_commands.py       | 4 ++--
 modem/service_manager.py       | 9 +++++++--
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/gui/src/store/settingsStore.js b/gui/src/store/settingsStore.js
index 89c818a9..17f39944 100644
--- a/gui/src/store/settingsStore.js
+++ b/gui/src/store/settingsStore.js
@@ -29,6 +29,8 @@ export const settingsStore = reactive({
       tuning_range_fmin: 0,
       tx_delay: 0,
       beacon_interval: 0,
+      enable_hamc: false,
+      enable_morse_identifier: false,
     },
     RADIO: {
       control: "disabled",
diff --git a/modem/config.py b/modem/config.py
index e539fd35..fa675ef4 100644
--- a/modem/config.py
+++ b/modem/config.py
@@ -66,8 +66,6 @@ class CONFIG:
             'respond_to_cq': bool,
             'rx_buffer_size': int,
             'tx_delay': int,
-            'enable_hmac': bool,
-            'enable_morse_identifier': bool,
             'beacon_interval': int,
         },
     }
diff --git a/modem/data_handler.py b/modem/data_handler.py
index 0ad02a11..68469b29 100644
--- a/modem/data_handler.py
+++ b/modem/data_handler.py
@@ -315,7 +315,6 @@ class DATA:
         while True:
 
             data = self.data_queue_transmit.get()
-            print(data)
             # if we are already in ARQ_STATE, or we're receiving codec2 traffic
             # let's wait with processing data
             # this should avoid weird toggle states where both stations
diff --git a/modem/server.py b/modem/server.py
index 226a8193..75f1b279 100644
--- a/modem/server.py
+++ b/modem/server.py
@@ -100,7 +100,7 @@ def post_cqcqcq():
     if request.method not in ['POST']:
         return api_response({"info": "endpoint for triggering a CQ via POST"})
     if app.states.is_modem_running:
-        server_commands.cqcqcq()
+        server_commands.cqcqcq(request.json)
     return api_response({"cmd": "cqcqcq"})
 
 @app.route('/modem/beacon', methods=['POST'])
diff --git a/modem/server_commands.py b/modem/server_commands.py
index e337f0ab..0c7293ee 100644
--- a/modem/server_commands.py
+++ b/modem/server_commands.py
@@ -3,12 +3,12 @@ import base64
 import structlog
 log = structlog.get_logger("COMMANDS")
 
-def cqcqcq():
+def cqcqcq(data):
     try:
         DATA_QUEUE_TRANSMIT.put(["CQ"])
         return
     except Exception as err:
-        log.warning("[CMD] error while transmiting CQ", e=err)
+        log.warning("[CMD] error while transmiting CQ", e=err, command=data)
 
 def ping_ping(data):
     try:
diff --git a/modem/service_manager.py b/modem/service_manager.py
index b8c6f955..7d02bf45 100644
--- a/modem/service_manager.py
+++ b/modem/service_manager.py
@@ -13,8 +13,8 @@ class SM:
 
         self.modem = False
         self.data_handler = False
-
-        self.config = app.config_manager.read()
+        self.app = app
+        self.config = self.app.config_manager.read()
         self.modem_events = app.modem_events
         self.modem_fft = app.modem_fft
         self.modem_service = app.modem_service
@@ -53,7 +53,12 @@ class SM:
 
 
     def start_modem(self):
+        # read config
+        self.config = self.app.config_manager.read()
+
+        # test audio devices
         audio_test = self.test_audio()
+
         if False not in audio_test and None not in audio_test and not self.states.is_modem_running:
             self.log.info("starting modem....")
             self.modem = modem.RF(self.config, self.modem_events, self.modem_fft, self.modem_service, self.states)