From 0e07697a98f5aa956281a7e108050eb8faedcd12 Mon Sep 17 00:00:00 2001
From: DJ2LS <75909252+DJ2LS@users.noreply.github.com>
Date: Thu, 7 Mar 2024 15:33:42 +0100
Subject: [PATCH] removed beacon interval change, send beacon when enabling it

---
 gui/src/components/settings_modem.vue | 20 --------------------
 gui/src/store/settingsStore.js        |  1 -
 modem/config.ini.example              |  1 -
 modem/config.py                       |  3 +--
 modem/schedule_manager.py             |  3 +--
 modem/server.py                       |  3 +++
 6 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/gui/src/components/settings_modem.vue b/gui/src/components/settings_modem.vue
index a5d5ba06..2d9d1138 100644
--- a/gui/src/components/settings_modem.vue
+++ b/gui/src/components/settings_modem.vue
@@ -193,26 +193,6 @@ const audioStore = useAudioStore();
       <option value="250">250</option>
     </select>
   </div>
-  <div class="input-group input-group-sm mb-1">
-    <span class="input-group-text w-50">Beacon interval</span>
-    <select
-      class="form-select form-select-sm"
-      aria-label=".form-select-sm"
-      id="beaconInterval"
-      style="width: 6rem"
-      @change="onChange"
-      v-model.number="settings.remote.MODEM.beacon_interval"
-    >
-      <option value="60">60 secs</option>
-      <option value="90">90 secs</option>
-      <option value="120">2 mins</option>
-      <option selected value="300">5 mins</option>
-      <option value="600">10 mins</option>
-      <option value="900">15 mins</option>
-      <option value="1800">30 mins</option>
-      <option value="3600">60 mins</option>
-    </select>
-  </div>
 
   <div class="input-group input-group-sm mb-1">
     <label class="input-group-text w-50">Enable 250Hz bandwidth mode</label>
diff --git a/gui/src/store/settingsStore.js b/gui/src/store/settingsStore.js
index 97dd16f9..291e53c0 100644
--- a/gui/src/store/settingsStore.js
+++ b/gui/src/store/settingsStore.js
@@ -61,7 +61,6 @@ const defaultConfig = {
       tuning_range_fmax: 0,
       tuning_range_fmin: 0,
       tx_delay: 0,
-      beacon_interval: 0,
       enable_hamc: false,
       enable_morse_identifier: false,
     },
diff --git a/modem/config.ini.example b/modem/config.ini.example
index 42146b30..f2265ce6 100644
--- a/modem/config.ini.example
+++ b/modem/config.ini.example
@@ -54,7 +54,6 @@ enable_morse_identifier = False
 respond_to_cq = True
 rx_buffer_size = 64
 tx_delay = 200
-beacon_interval = 300
 
 [MESSAGES]
 enable_auto_repeat = False
diff --git a/modem/config.py b/modem/config.py
index 57bfcdd5..c05a769c 100644
--- a/modem/config.py
+++ b/modem/config.py
@@ -64,8 +64,7 @@ class CONFIG:
             'enable_low_bandwidth_mode': bool,
             'respond_to_cq': bool,
             'rx_buffer_size': int,
-            'tx_delay': int,
-            'beacon_interval': int,
+            'tx_delay': int
         },
         'MESSAGES': {
             'enable_auto_repeat': bool,
diff --git a/modem/schedule_manager.py b/modem/schedule_manager.py
index 5b8abbc9..7c74072f 100644
--- a/modem/schedule_manager.py
+++ b/modem/schedule_manager.py
@@ -16,13 +16,12 @@ class ScheduleManager:
         self.state_manager = state_manger
         self.event_manager = event_manager
         self.config = self.config_manager.read()
-        self.beacon_interval = self.config['MODEM']['beacon_interval']
 
         self.scheduler = sched.scheduler(time.time, time.sleep)
         self.events = {
             'check_for_queued_messages': {'function': self.check_for_queued_messages, 'interval': 10},
             'explorer_publishing': {'function': self.push_to_explorer, 'interval': 60},
-            'transmitting_beacon': {'function': self.transmit_beacon, 'interval': self.beacon_interval},
+            'transmitting_beacon': {'function': self.transmit_beacon, 'interval': 600},
             'beacon_cleanup': {'function': self.delete_beacons, 'interval': 600},
         }
         self.running = False  # Flag to control the running state
diff --git a/modem/server.py b/modem/server.py
index f6a80421..f36a4f8d 100644
--- a/modem/server.py
+++ b/modem/server.py
@@ -13,6 +13,7 @@ import json
 import websocket_manager as wsm
 import api_validations as validations
 import command_cq
+import command_beacon
 import command_ping
 import command_feq
 import command_test
@@ -150,6 +151,8 @@ def post_beacon():
 
     if not app.state_manager.is_beacon_running:
         app.state_manager.set('is_beacon_running', request.json['enabled'])
+        if not app.state_manager.getARQ():
+            enqueue_tx_command(command_beacon.BeaconCommand, request.json)
     else:
         app.state_manager.set('is_beacon_running', request.json['enabled'])