From ff0e4c25a25a701e9b5b1c6ac2485bde130d971f Mon Sep 17 00:00:00 2001
From: Pedro <ptsmonteiro@gmail.com>
Date: Sun, 26 Nov 2023 21:51:19 +0100
Subject: [PATCH] Improve beacon

---
 modem/beacon.py                  | 89 ++++++++++++++------------------
 modem/command_beacon.py          |  6 +--
 modem/data_handler_broadcasts.py |  4 +-
 3 files changed, 42 insertions(+), 57 deletions(-)

diff --git a/modem/beacon.py b/modem/beacon.py
index 6a35eb68..0f7559dc 100644
--- a/modem/beacon.py
+++ b/modem/beacon.py
@@ -2,64 +2,53 @@ import threading
 import data_frame_factory
 import time
 import command_beacon
+from state_manager import StateManager
 
-modem_config = None
-states = None
-beacon_interval = 0
-beacon_interval_timer = 0
-beacon_paused = False
-beacon_thread = None
-frame_factory = None
-event_manager = None
-log = None
+class Beacon:
 
-def init(config, modem_states, ev_manager, logger):
-    modem_config = config
-    states = modem_states
-    frame_factory = data_frame_factory.DataFrameFactory(modem_config)
-    event_manager = ev_manager
-    log = logger
+    BEACON_LOOP_INTERVAL = 1
 
-def start():
-    beacon_thread = threading.Thread(
-        target=start, name="beacon", daemon=True
-    )
+    def __init__(self, config, modem_states: StateManager, event_queue, logger, modem_tx_queue):
 
-    beacon_thread.start()
+        self.modem_config = config
+        self.states = modem_states
+        self.event_queue = event_queue
+        self.log = logger
+        self.tx_frame_queue = modem_tx_queue
 
-def run_beacon() -> None:
-    """
-    Controlling function for running a beacon
-    Args:
+        self.paused = False
+        self.thread = None
+        self.event = threading.Event()
 
-        self: arq class
+        self.frame_factory = data_frame_factory.DataFrameFactory(config)
 
-    Returns:
+    def start(self):
+        beacon_thread = threading.Thread(target=self.run_beacon, name="beacon", daemon=True)
+        beacon_thread.start()
 
-    """
-    try:
+    def refresh(self):
+        self.event.set()
+        self.event.clear()
+
+    def run_beacon(self) -> None:
+        """
+        Controlling function for running a beacon
+        Args:
+
+            self: arq class
+
+        Returns:
+
+        """
         while True:
-            threading.Event().wait(0.5)
-            while states.is_beacon_running:
-                if (
-                        not states.is_arq_session
-                        #and not arq_file_transfer
-                        and not beacon_paused
-                        #and not states.channel_busy
-                        and not states.is_modem_busy
-                        and not states.is_arq_state
-                ):
-                    
-                    cmd = command_beacon.BeaconCommand(modem_config, log)
-                    cmd.run()
+            while (self.states.is_beacon_running and 
+                not self.paused and 
+                True):
+                #not self.states.channel_busy):
 
-                beacon_interval_timer = time.time() + beacon_interval
-                while (
-                        time.time() < beacon_interval_timer
-                        and states.is_beacon_running
-                        and not beacon_paused
-                ):
-                    threading.Event().wait(0.01)
+                cmd = command_beacon.BeaconCommand(self.modem_config, self.log)
+                cmd.run(self.event_queue, self.tx_frame_queue)
+                self.event.wait(self.modem_config['MODEM']['beacon_interval'])
 
-    except Exception as err:
-        log.debug("[Modem] run_beacon: ", exception=err)
+            self.event.wait(self.BEACON_LOOP_INTERVAL)
+        
\ No newline at end of file
diff --git a/modem/command_beacon.py b/modem/command_beacon.py
index 2a1c94f4..37eb638d 100644
--- a/modem/command_beacon.py
+++ b/modem/command_beacon.py
@@ -2,15 +2,11 @@ from command import TxCommand
 
 class BeaconCommand(TxCommand):
 
-    def set_params_from_api(self, apiParams):
-        self.enable_morse = apiParams['enable_morse']
-        return super().set_params_from_api(apiParams)
-
     def build_frame(self):
         return self.frame_factory.build_beacon()
 
     def transmit(self, tx_frame_queue):
         super().transmit(tx_frame_queue)
-        if self.enable_morse:
+        if self.config['MODEM']['enable_morse_identifier']:
             mycall = f"{self.config['STATION']['mycall']}-{self.config['STATION']['myssid']}"
             tx_frame_queue.put(["morse", 1, 0, mycall])
diff --git a/modem/data_handler_broadcasts.py b/modem/data_handler_broadcasts.py
index 9cc7be1d..18b7a922 100644
--- a/modem/data_handler_broadcasts.py
+++ b/modem/data_handler_broadcasts.py
@@ -29,8 +29,8 @@ class BROADCAST(DATA):
         
         self.event_manager = event_manager.EventManager([event_queue])
 
-        beacon.init(self.config, self.states, self.event_manager, self.log)
-        beacon.start()
+        self.beacon = beacon.Beacon(self.config, self.states, event_queue, self.log, MODEM_TRANSMIT_QUEUE)
+        self.beacon.start()
 
         # length of signalling frame
         self.length_sig0_frame = 14