From e861dde9c8b384712f392c101eec88726ac449fd Mon Sep 17 00:00:00 2001
From: Pedro <ptsmonteiro@gmail.com>
Date: Sat, 18 Nov 2023 16:58:17 +0100
Subject: [PATCH] Eliminate multiple GET /config requests

---
 gui/src/components/main.vue               |  4 ----
 gui/src/components/main_startup_check.vue | 12 +++++-------
 gui/src/js/settingsHandler.ts             | 16 +---------------
 gui/src/store/settingsStore.js            |  4 +++-
 4 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/gui/src/components/main.vue b/gui/src/components/main.vue
index 4fa632cf..069086a8 100644
--- a/gui/src/components/main.vue
+++ b/gui/src/components/main.vue
@@ -3,8 +3,6 @@ import { setActivePinia } from "pinia";
 import pinia from "../store/index";
 setActivePinia(pinia);
 
-import { getRemote } from "../store/settingsStore";
-
 import main_modals from "./main_modals.vue";
 import main_top_navbar from "./main_top_navbar.vue";
 import main_rig_control from "./main_rig_control.vue";
@@ -19,9 +17,7 @@ import main_active_audio_level from "./main_active_audio_level.vue";
 
 import chat from "./chat.vue";
 import infoScreen from "./infoScreen.vue";
-
 import main_modem_healthcheck from "./main_modem_healthcheck.vue";
-getRemote();
 
 function stopAllTransmissions() {
   console.log("stopping transmissions");
diff --git a/gui/src/components/main_startup_check.vue b/gui/src/components/main_startup_check.vue
index a0b2a73b..180f8f18 100644
--- a/gui/src/components/main_startup_check.vue
+++ b/gui/src/components/main_startup_check.vue
@@ -25,10 +25,7 @@ var updateAvailable = process.env.FDUpdateAvail;
 
 // start modemCheck modal once on startup
 onMounted(() => {
-  getModemConfig();
   getModemCurrentState();
-  getModemVersion();
-  getConfig();
   getVersion();
   new Modal("#modemCheck", {}).show();
 });
@@ -45,20 +42,21 @@ function getNetworkState() {
 }
 
 function getRigControlStuff() {
-  switch (settings.radiocontrol) {
+  switch (settings.remote.RADIO.radiocontrol) {
     case "disabled":
       return true;
     case "rigctld":
-      if (state.rigctld_started == "true") {
+      if (state.rigctld_started === true) {
         return true;
       } else {
         return false;
       }
     case "tci":
       return true;
-      break;
     default:
-      console.error("Unknown radio control mode " + settings.radiocontrol);
+      console.error(
+        "Unknown radio control mode " + settings.remote.RADIO.radiocontrol,
+      );
       return "Unknown control type";
   }
 }
diff --git a/gui/src/js/settingsHandler.ts b/gui/src/js/settingsHandler.ts
index b39da800..4337d7fd 100644
--- a/gui/src/js/settingsHandler.ts
+++ b/gui/src/js/settingsHandler.ts
@@ -6,7 +6,7 @@ import { setActivePinia } from "pinia";
 import pinia from "../store/index";
 setActivePinia(pinia);
 
-import { settingsStore as settings} from "../store/settingsStore.js";
+import { settingsStore as settings } from "../store/settingsStore.js";
 
 import { useAudioStore } from "../store/audioStore.js";
 const audioStore = useAudioStore(pinia);
@@ -145,20 +145,6 @@ export function processModemConfig(data) {
   }
 }
 
-export function processModemAudioDevices(data) {
-  console.log(data);
-  audioStore.inputDevices = data["in"];
-  audioStore.outputDevices = data["out"];
-}
-
-export function processModemSerialDevices(data) {
-  settings.serial_devices = data;
-}
-export function processModemVersion(data) {
-  //data = JSON.parse(data);
-  stateStore.modem_version = data["version"];
-}
-
 export function getModemConfigAsJSON() {
   // create json output from settings
   // TODO Can we make this more dynamic? Maybe using a settings object?
diff --git a/gui/src/store/settingsStore.js b/gui/src/store/settingsStore.js
index 5f7b67b8..609fe2e9 100644
--- a/gui/src/store/settingsStore.js
+++ b/gui/src/store/settingsStore.js
@@ -16,4 +16,6 @@ export function getRemote() {
   });
 }
 
-getRemote();
+if (settingsStore.remote["STATION"] === undefined) {
+  getRemote();
+}