From b960dea9c28b7d7637440cf97b2a19f6433ff42e Mon Sep 17 00:00:00 2001 From: Mashintime Date: Thu, 30 Nov 2023 21:12:04 -0500 Subject: [PATCH] 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)})