From ab433146190c235572d5a804096c7ffeb9327003 Mon Sep 17 00:00:00 2001
From: Mashintime <awh@brainless.us>
Date: Thu, 30 Nov 2023 16:49:43 -0500
Subject: [PATCH 1/5] Initial gui event api handler

---
 gui/src/js/eventHandler.js | 77 ++++++++++++++++++++++++--------------
 1 file changed, 48 insertions(+), 29 deletions(-)

diff --git a/gui/src/js/eventHandler.js b/gui/src/js/eventHandler.js
index d724c64b..f37c6c8d 100644
--- a/gui/src/js/eventHandler.js
+++ b/gui/src/js/eventHandler.js
@@ -23,7 +23,7 @@ export function connectionFailed(endpoint, event) {
 }
 export function stateDispatcher(data) {
   data = JSON.parse(data);
-  console.log(data);
+  //console.log(data);
 
   stateStore.modem_connection = "connected";
 
@@ -143,38 +143,57 @@ export function eventDispatcher(data) {
   if (data["dxcallsign"] == "AA0AA-0" || data["dxcallsign"] == "ZZ9YY-0") {
     return;
   }
+  console.info(data);
+  switch (data["ptt"]) {
+    case true:
+      // get ptt state as a first test
+      console.warn("PTT state true")
+      stateStore.ptt_state = data.ptt;
+      return;
+    default:
+      console.warn("PTT state false")
+        // get ptt state as a first test
+      stateStore.ptt_state = false;
+      return;
+  }
+  switch (data["freedata"]) {
+    case ("modem-event"):
+      switch (data["event"]) {
+        case "start":
+          displayToast("success", "bi-arrow-left-right", "Modem started", 5000);
+          return;
+  
+        case "stop":
+          displayToast("success", "bi-arrow-left-right", "Modem stopped", 5000);
+          return;
+  
+        case "restart":
+          displayToast(
+            "secondary",
+            "bi-bootstrap-reboot",
+            "Modem restarted",
+            5000,
+          );
+          return;
+  
+        case "failed":
+          displayToast(
+            "danger",
+            "bi-bootstrap-reboot",
+            "Modem startup failed | bad config?",
+            5000,
+          );
+          return;
+    default:
+      console.error("Unknown event message received:");
+      console.error(data);
+      break;
+  }
 
-  // get ptt state as a first test
-  stateStore.ptt_state = data.ptt;
 
   // catch modem related events
   if (data["freedata"] == "modem-event") {
-    switch (data["event"]) {
-      case "start":
-        displayToast("success", "bi-arrow-left-right", "Modem started", 5000);
-        return;
-
-      case "stop":
-        displayToast("success", "bi-arrow-left-right", "Modem stopped", 5000);
-        return;
-
-      case "restart":
-        displayToast(
-          "secondary",
-          "bi-bootstrap-reboot",
-          "Modem restarted",
-          5000,
-        );
-        return;
-
-      case "failed":
-        displayToast(
-          "danger",
-          "bi-bootstrap-reboot",
-          "Modem startup failed | bad config?",
-          5000,
-        );
-        return;
+    
     }
   }
 

From b7b51ad46973e4b97b4bf04ce83bf8ff9e2e5e40 Mon Sep 17 00:00:00 2001
From: Mashintime <awh@brainless.us>
Date: Thu, 30 Nov 2023 16:50:10 -0500
Subject: [PATCH 2/5] PTT updates

---
 gui/src/components/main_footer_navbar.vue | 4 ++--
 gui/src/store/stateStore.js               | 2 +-
 modem/event_manager.py                    | 6 +++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/gui/src/components/main_footer_navbar.vue b/gui/src/components/main_footer_navbar.vue
index 66a1edc3..bc821510 100644
--- a/gui/src/components/main_footer_navbar.vue
+++ b/gui/src/components/main_footer_navbar.vue
@@ -18,8 +18,8 @@ const state = useStateStore(pinia);
           <button
             class="btn btn-sm btn-secondary me-1"
             v-bind:class="{
-              'btn-danger': state.ptt_state === 'True',
-              'btn-secondary': state.ptt_state === 'False',
+              'btn-danger': state.ptt_state == true,
+              'btn-secondary': state.ptt_state == false,
             }"
             id="ptt_state"
             type="button"
diff --git a/gui/src/store/stateStore.js b/gui/src/store/stateStore.js
index 0efe305b..0851c718 100644
--- a/gui/src/store/stateStore.js
+++ b/gui/src/store/stateStore.js
@@ -14,7 +14,7 @@ export const useStateStore = defineStore("stateStore", () => {
   var dbfs_level = ref(0);
   var radio_status = ref(false);
 
-  var ptt_state = ref("False");
+  var ptt_state = ref(false);
 
   var speed_level = ref(0);
   var fft = ref();
diff --git a/modem/event_manager.py b/modem/event_manager.py
index 0d70ce19..3110b30d 100644
--- a/modem/event_manager.py
+++ b/modem/event_manager.py
@@ -6,6 +6,7 @@ class EventManager:
     def __init__(self, queues):
         self.queues = queues
         self.log = structlog.get_logger('Event Manager')
+        self.lastpttstate = False
 
     def broadcast(self, data):
         self.log.debug(f"Broadcasting event: {data}")
@@ -13,7 +14,10 @@ class EventManager:
             q.put(data)
 
     def send_ptt_change(self, on:bool = False):
-        self.broadcast({"ptt": str(on)})
+        if (on == self.lastpttstate):
+            return
+        self.lastpttstate= on
+        self.broadcast({"ptt": bool(on)})
 
     def send_scatter_change(self, data):
         self.broadcast({"scatter": str(data)})

From b960dea9c28b7d7637440cf97b2a19f6433ff42e Mon Sep 17 00:00:00 2001
From: Mashintime <awh@brainless.us>
Date: Thu, 30 Nov 2023 21:12:04 -0500
Subject: [PATCH 3/5] GUI scatter

---
 gui/src/js/eventHandler.js  | 15 +++++++++------
 gui/src/store/stateStore.js |  2 +-
 modem/event_manager.py      |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/gui/src/js/eventHandler.js b/gui/src/js/eventHandler.js
index f37c6c8d..f0d0abc2 100644
--- a/gui/src/js/eventHandler.js
+++ b/gui/src/js/eventHandler.js
@@ -143,18 +143,21 @@ export function eventDispatcher(data) {
   if (data["dxcallsign"] == "AA0AA-0" || data["dxcallsign"] == "ZZ9YY-0") {
     return;
   }
+  
   console.info(data);
+  if (data["scatter"] !== undefined) {
+    //console.warn("Got scatter data!!!!");
+    stateStore.scatter = JSON.parse(data["scatter"]);
+    return;
+  }
+
   switch (data["ptt"]) {
     case true:
+    case false:
       // get ptt state as a first test
-      console.warn("PTT state true")
+      //console.warn("PTT state true")
       stateStore.ptt_state = data.ptt;
       return;
-    default:
-      console.warn("PTT state false")
-        // get ptt state as a first test
-      stateStore.ptt_state = false;
-      return;
   }
   switch (data["freedata"]) {
     case ("modem-event"):
diff --git a/gui/src/store/stateStore.js b/gui/src/store/stateStore.js
index 0851c718..b72ddf69 100644
--- a/gui/src/store/stateStore.js
+++ b/gui/src/store/stateStore.js
@@ -20,7 +20,7 @@ export const useStateStore = defineStore("stateStore", () => {
   var fft = ref();
   var channel_busy = ref(false);
   var channel_busy_slot = ref([false, false, false, false, false]);
-  var scatter = ref();
+  var scatter = ref([]);
   var s_meter_strength_percent = ref(0);
   var s_meter_strength_raw = ref(0);
 
diff --git a/modem/event_manager.py b/modem/event_manager.py
index 3110b30d..1b8d526d 100644
--- a/modem/event_manager.py
+++ b/modem/event_manager.py
@@ -20,7 +20,7 @@ class EventManager:
         self.broadcast({"ptt": bool(on)})
 
     def send_scatter_change(self, data):
-        self.broadcast({"scatter": str(data)})
+        self.broadcast({"scatter": json.dumps(data)})
 
     def send_buffer_overflow(self, data):
         self.broadcast({"buffer-overflow": str(data)})

From 2578b2eaf0303e36336ae3e0d23e37ed8dda921b Mon Sep 17 00:00:00 2001
From: Mashintime <awh@brainless.us>
Date: Thu, 30 Nov 2023 22:08:42 -0500
Subject: [PATCH 4/5] More gui event handling

---
 gui/src/js/eventHandler.js | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/gui/src/js/eventHandler.js b/gui/src/js/eventHandler.js
index f0d0abc2..733e2202 100644
--- a/gui/src/js/eventHandler.js
+++ b/gui/src/js/eventHandler.js
@@ -159,7 +159,20 @@ export function eventDispatcher(data) {
       stateStore.ptt_state = data.ptt;
       return;
   }
+
   switch (data["freedata"]) {
+    case ("modem-message"):
+      switch(data["received"]){
+        case ("BEACON"):
+          //Beacon received
+          displayToast("info", "bi-broadcast", "Beacon from " + data["dxcallsign"], 5000);
+          return;
+        case("QRV"):
+          //Qrv received
+          displayToast("success", "bi-person-raised-hand",  "QRV from " + data["dxcallsign"], 5000);
+          return;
+      }
+
     case ("modem-event"):
       switch (data["event"]) {
         case "start":
@@ -188,16 +201,12 @@ export function eventDispatcher(data) {
           );
           return;
     default:
-      console.error("Unknown event message received:");
-      console.error(data);
+      console.warn("Unknown event message received:");
+      console.warn(data);
       break;
   }
 
 
-  // catch modem related events
-  if (data["freedata"] == "modem-event") {
-    
-    }
   }
 
   /*

From 7619c5de8c13acb9b512c4630123a07afdc70ae5 Mon Sep 17 00:00:00 2001
From: codefactor-io <support@codefactor.io>
Date: Fri, 1 Dec 2023 03:09:25 +0000
Subject: [PATCH 5/5] [CodeFactor] Apply fixes

---
 gui/src/js/eventHandler.js | 44 ++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/gui/src/js/eventHandler.js b/gui/src/js/eventHandler.js
index 733e2202..cd8f1148 100644
--- a/gui/src/js/eventHandler.js
+++ b/gui/src/js/eventHandler.js
@@ -143,7 +143,7 @@ export function eventDispatcher(data) {
   if (data["dxcallsign"] == "AA0AA-0" || data["dxcallsign"] == "ZZ9YY-0") {
     return;
   }
-  
+
   console.info(data);
   if (data["scatter"] !== undefined) {
     //console.warn("Got scatter data!!!!");
@@ -161,28 +161,38 @@ export function eventDispatcher(data) {
   }
 
   switch (data["freedata"]) {
-    case ("modem-message"):
-      switch(data["received"]){
-        case ("BEACON"):
+    case "modem-message":
+      switch (data["received"]) {
+        case "BEACON":
           //Beacon received
-          displayToast("info", "bi-broadcast", "Beacon from " + data["dxcallsign"], 5000);
+          displayToast(
+            "info",
+            "bi-broadcast",
+            "Beacon from " + data["dxcallsign"],
+            5000,
+          );
           return;
-        case("QRV"):
+        case "QRV":
           //Qrv received
-          displayToast("success", "bi-person-raised-hand",  "QRV from " + data["dxcallsign"], 5000);
+          displayToast(
+            "success",
+            "bi-person-raised-hand",
+            "QRV from " + data["dxcallsign"],
+            5000,
+          );
           return;
       }
 
-    case ("modem-event"):
+    case "modem-event":
       switch (data["event"]) {
         case "start":
           displayToast("success", "bi-arrow-left-right", "Modem started", 5000);
           return;
-  
+
         case "stop":
           displayToast("success", "bi-arrow-left-right", "Modem stopped", 5000);
           return;
-  
+
         case "restart":
           displayToast(
             "secondary",
@@ -191,7 +201,7 @@ export function eventDispatcher(data) {
             5000,
           );
           return;
-  
+
         case "failed":
           displayToast(
             "danger",
@@ -200,13 +210,11 @@ export function eventDispatcher(data) {
             5000,
           );
           return;
-    default:
-      console.warn("Unknown event message received:");
-      console.warn(data);
-      break;
-  }
-
-
+        default:
+          console.warn("Unknown event message received:");
+          console.warn(data);
+          break;
+      }
   }
 
   /*