diff --git a/gui/preload-main.js b/gui/preload-main.js
index 4171799d..5c5f3c70 100644
--- a/gui/preload-main.js
+++ b/gui/preload-main.js
@@ -2676,7 +2676,11 @@ ipcRenderer.on('action-show-cq-toast-transmitting', (event, data) => {
// CQ RECEIVED
ipcRenderer.on('action-show-cq-toast-received', (event, data) => {
- displayToast(type='success', icon='bi-broadcast', content='received cq', duration=5000);
+ let dxcallsign = data["data"][0]["dxcallsign"]
+ let dxgrid = data["data"][0]["dxgrid"]
+ let content = `cq from ${dxcallsign} (${dxgrid})`
+
+ displayToast(type='success', icon='bi-broadcast', content=content, duration=5000);
});
// QRV TRANSMITTING
@@ -2686,7 +2690,13 @@ ipcRenderer.on('action-show-qrv-toast-transmitting', (event, data) => {
// QRV RECEIVED
ipcRenderer.on('action-show-qrv-toast-received', (event, data) => {
- displayToast(type='success', icon='bi-broadcast', content='received qrv', duration=5000);
+
+ console.log(data["data"][0])
+ let dxcallsign = data["data"][0]["dxcallsign"]
+ let dxgrid = data["data"][0]["dxgrid"]
+ let content = `received qrv from ${dxcallsign} (${dxgrid})`
+
+ displayToast(type='success', icon='bi-broadcast', content=content, duration=5000);
});
// BEACON TRANSMITTING
@@ -2696,7 +2706,11 @@ ipcRenderer.on('action-show-beacon-toast-transmitting', (event, data) => {
// BEACON RECEIVED
ipcRenderer.on('action-show-beacon-toast-received', (event, data) => {
- displayToast(type='info', icon='bi-broadcast', content='received beacon', duration=5000);
+ console.log(data["data"][0])
+ let dxcallsign = data["data"][0]["dxcallsign"]
+ let dxgrid = data["data"][0]["dxgrid"]
+ let content = `beacon from ${dxcallsign} (${dxgrid})`
+ displayToast(type='info', icon='bi-broadcast', content=content, duration=5000);
});
// PING TRANSMITTING
@@ -2706,17 +2720,27 @@ ipcRenderer.on('action-show-ping-toast-transmitting', (event, data) => {
// PING RECEIVED
ipcRenderer.on('action-show-ping-toast-received', (event, data) => {
- displayToast(type='success', icon='bi-broadcast', content='received ping', duration=5000);
+ console.log(data["data"][0])
+ let dxcallsign = data["data"][0]["dxcallsign"]
+ let content = `ping from ${dxcallsign}`
+ displayToast(type='success', icon='bi-broadcast', content=content, duration=5000);
});
// PING RECEIVED ACK
ipcRenderer.on('action-show-ping-toast-received-ack', (event, data) => {
- displayToast(type='success', icon='bi-broadcast', content='received ping ack', duration=5000);
+ console.log(data["data"][0])
+ let dxcallsign = data["data"][0]["dxcallsign"]
+ let dxgrid = data["data"][0]["dxgrid"]
+ let content = `ping ACK from ${dxcallsign} (${dxgrid})`
+ displayToast(type='success', icon='bi-check', content=content, duration=5000);
});
// DATA CHANNEL OPENING TOAST
ipcRenderer.on('action-show-arq-toast-datachannel-opening', (event, data) => {
- displayToast(type='secondary', icon='bi-broadcast', content='opening datachannel', duration=5000);
+ console.log(data["data"][0])
+ let dxcallsign = data["data"][0]["dxcallsign"]
+ let content = `opening datachannel with ${dxcallsign}`
+ displayToast(type='secondary', icon='bi-broadcast', content=content, duration=5000);
});
// DATA CHANNEL WAITING TOAST
@@ -2732,7 +2756,10 @@ ipcRenderer.on('action-show-arq-toast-datachannel-open', (event, data) => {
// DATA CHANNEL RECEIVED OPENER TOAST
ipcRenderer.on('action-show-arq-toast-datachannel-received-opener', (event, data) => {
- displayToast(type='success', icon='bi-broadcast', content='received datachannel opener', duration=5000);
+ console.log(data["data"][0])
+ let dxcallsign = data["data"][0]["dxcallsign"]
+ let content = `datachannel requested by ${dxcallsign}`
+ displayToast(type='success', icon='bi-broadcast', content=content, duration=5000);
});
// ARQ TRANSMISSION FAILED
@@ -2755,11 +2782,13 @@ ipcRenderer.on('action-show-arq-toast-transmission-stopped', (event, data) => {
// ARQ TRANSMISSION FAILED
// TODO: USE FOR TX AND RX
ipcRenderer.on('action-show-arq-toast-transmission-failed', (event, data) => {
- displayToast(type='success', icon='bi-broadcast', content='arq transmission failed', duration=5000);
+ displayToast(type='danger', icon='bi-broadcast', content='arq transmission failed', duration=5000);
});
// ARQ TRANSMISSION TRANSMITTED
ipcRenderer.on('action-show-arq-toast-transmission-transmitted', (event, data) => {
+ console.log(data["data"][0])
+ let content = `received cq from ${dxcallsign} (${dxgrid})`
displayToast(type='success', icon='bi-broadcast', content='data transmitted', duration=5000);
});
diff --git a/gui/sock.js b/gui/sock.js
index 19c9f415..794d7d5a 100644
--- a/gui/sock.js
+++ b/gui/sock.js
@@ -243,7 +243,6 @@ client.on('data', function(socketdata) {
// ----------- catch tnc messages START -----------
if (data['freedata'] == 'tnc-message'){
- socketLog.info(data)
// update transmission status
/*
@@ -340,10 +339,14 @@ client.on('data', function(socketdata) {
if (data['status'] == 'opened') {
ipcRenderer.send('request-show-arq-toast-datachannel-opened', {data: [data]});
- // ARQ OPENING
- } else if (data['status'] == 'opening') {
+ // ARQ OPENING ISS
+ } else if (data['status'] == 'opening' && data['irs'] == 'False') {
ipcRenderer.send('request-show-arq-toast-datachannel-opening', {data: [data]});
+ // ARQ OPENING IRS
+ } else if (data['status'] == 'opening' && data['irs'] == 'True') {
+ ipcRenderer.send('request-show-arq-toast-datachannel-received-opener', {data: [data]});
+
// ARQ WAITING
} else if (data['status'] == 'waiting') {
ipcRenderer.send('request-show-arq-toast-datachannel-waiting', {data: [data]});