From e91cf49f215177b925fe79a536f29701e781f7a8 Mon Sep 17 00:00:00 2001
From: DJ2LS <dj2ls@proton.me>
Date: Thu, 21 Dec 2023 17:47:48 +0100
Subject: [PATCH] make beacon a service

---
 modem/beacon.py          |  8 ++++----
 modem/command_beacon.py  | 11 ++++++-----
 modem/modem.py           |  6 +-----
 modem/server.py          |  9 ++++++++-
 modem/service_manager.py | 19 ++++++++++++++++++-
 5 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/modem/beacon.py b/modem/beacon.py
index 55df9260..7f4fd7c4 100644
--- a/modem/beacon.py
+++ b/modem/beacon.py
@@ -6,13 +6,13 @@ class Beacon:
 
     BEACON_LOOP_INTERVAL = 1
 
-    def __init__(self, config, states, event_queue, logger, modem_tx_queue):
+    def __init__(self, config, states, event_queue, logger, modem):
 
         self.modem_config = config
         self.states = states
         self.event_queue = event_queue
         self.log = logger
-        self.tx_frame_queue = modem_tx_queue
+        self.modem = modem
 
         self.loop_running = True
         self.paused = False
@@ -39,8 +39,8 @@ class Beacon:
                 True):
                 #not self.states.channel_busy):
 
-                cmd = command_beacon.BeaconCommand(self.modem_config, self.log)
-                cmd.run(self.event_queue, self.tx_frame_queue)
+                cmd = command_beacon.BeaconCommand(self.modem_config, self.states, self.event_queue)
+                cmd.run(self.event_queue, self.modem)
                 self.event.wait(self.modem_config['MODEM']['beacon_interval'])
 
             self.event.wait(self.BEACON_LOOP_INTERVAL)
diff --git a/modem/command_beacon.py b/modem/command_beacon.py
index bb902c92..d8afc749 100644
--- a/modem/command_beacon.py
+++ b/modem/command_beacon.py
@@ -5,8 +5,9 @@ class BeaconCommand(TxCommand):
     def build_frame(self):
         return self.frame_factory.build_beacon()
 
-    def transmit(self, modem):
-        super().transmit(modem)
-        if self.config['MODEM']['enable_morse_identifier']:
-            mycall = f"{self.config['STATION']['mycall']}-{self.config['STATION']['myssid']}"
-            modem.transmit_morse("morse", 1, 0, mycall)
+
+    #def transmit(self, modem):
+    #    super().transmit(modem)
+    #    if self.config['MODEM']['enable_morse_identifier']:
+    #        mycall = f"{self.config['STATION']['mycall']}-{self.config['STATION']['myssid']}"
+    #        modem.transmit_morse("morse", 1, 0, mycall)
diff --git a/modem/modem.py b/modem/modem.py
index 5bbe2923..74389ebb 100644
--- a/modem/modem.py
+++ b/modem/modem.py
@@ -23,7 +23,6 @@ import cw
 from queues import RIGCTLD_COMMAND_QUEUE
 import audio
 import event_manager
-import beacon
 import demodulator
 
 TESTMODE = False
@@ -101,8 +100,7 @@ class RF:
                                             self.fft_queue
                                                    )
 
-        self.beacon = beacon.Beacon(self.config, self.states, event_queue, 
-                                    self.log, self.modem_transmit_queue)
+
 
     def tci_tx_callback(self, audio_48k) -> None:
         self.radio.set_ptt(True)
@@ -134,8 +132,6 @@ class RF:
             if not TESTMODE:
                 atexit.register(self.sd_input_stream.stop)
 
-            # init beacon
-            self.beacon.start()
         else:
             return False
 
diff --git a/modem/server.py b/modem/server.py
index 53baf14a..6a154d07 100644
--- a/modem/server.py
+++ b/modem/server.py
@@ -143,7 +143,14 @@ def post_beacon():
         api_abort(f"Incorrect value for 'enabled'. Shoud be bool.")
     if not app.state_manager.is_modem_running:
         api_abort('Modem not running', 503)
-    app.state_manager.set('is_beacon_running', request.json['enabled'])
+
+    if not app.state_manager.is_beacon_running:
+        app.state_manager.set('is_beacon_running', request.json['enabled'])
+        app.modem_service.put("start_beacon")
+    else:
+        app.state_manager.set('is_beacon_running', request.json['enabled'])
+        app.modem_service.put("stop_beacon")
+
     return api_response(request.json)
 
 @app.route('/modem/ping_ping', methods=['POST'])
diff --git a/modem/service_manager.py b/modem/service_manager.py
index 642a142f..4226328d 100644
--- a/modem/service_manager.py
+++ b/modem/service_manager.py
@@ -5,6 +5,7 @@ import structlog
 import audio
 import ujson as json
 import explorer
+import beacon
 
 
 class SM:
@@ -12,6 +13,7 @@ class SM:
         self.log = structlog.get_logger("service")
 
         self.modem = False
+        self.beacon = False
         self.data_handler = False
         self.app = app
         self.config = self.app.config_manager.read()
@@ -48,6 +50,14 @@ class SM:
                 threading.Event().wait(0.5)
                 if self.start_modem():
                     self.modem_events.put(json.dumps({"freedata": "modem-event", "event": "restart"}))
+            elif cmd in ['start_beacon']:
+                self.start_beacon()
+
+            elif cmd in ['stop_beacon']:
+                self.stop_beacon()
+
+
+
             else:
                 self.log.warning("[SVC] modem command processing failed", cmd=cmd, state=self.states.is_modem_running)
 
@@ -97,4 +107,11 @@ class SM:
         self.log.info("tested audio devices", result=audio_test)
 
         return audio_test
-    
\ No newline at end of file
+
+
+    def start_beacon(self):
+        self.beacon = beacon.Beacon(self.config, self.states, self.modem_events, self.log, self.modem)
+        self.beacon.start()
+
+    def stop_beacon(self):
+        del self.beacon