first change of gui

This commit is contained in:
dj2ls 2022-06-07 10:08:15 +02:00
parent 0c0e8dd8ca
commit 8e4a3f4d33
5 changed files with 419 additions and 206 deletions

View file

@ -514,6 +514,96 @@ ipcMain.on('save-file-to-folder',(event,data)=>{
});
//tnc messages START --------------------------------------
// CQ TRANSMITTING
ipcMain.on('request-show-cq-toast-transmitting',(event,data)=>{
win.webContents.send('action-show-cq-toast-transmitting', data);
});
// CQ RECEIVED
ipcMain.on('request-show-cq-toast-received',(event,data)=>{
win.webContents.send('action-show-cq-toast-received', data);
});
// QRV TRANSMITTING
ipcMain.on('request-show-qrv-toast-transmitting',(event,data)=>{
win.webContents.send('action-show-qrv-toast-transmitting', data);
});
// QRV RECEIVED
ipcMain.on('request-show-qrv-toast-received',(event,data)=>{
win.webContents.send('action-show-qrv-toast-received', data);
});
// BEACON TRANSMITTING
ipcMain.on('request-show-beacon-toast-transmitting',(event,data)=>{
win.webContents.send('action-show-beacon-toast-transmitting', data);
});
// BEACON RECEIVED
ipcMain.on('request-show-beacon-toast-received',(event,data)=>{
win.webContents.send('action-show-beacon-toast-received', data);
});
// PING TRANSMITTING
ipcMain.on('request-show-ping-toast-transmitting',(event,data)=>{
win.webContents.send('action-show-ping-toast-transmitting', data);
});
// PING RECEIVED
ipcMain.on('request-show-ping-toast-received',(event,data)=>{
win.webContents.send('action-show-ping-toast-received', data);
});
// PING RECEIVED ACK
ipcMain.on('request-show-ping-toast-received-ack',(event,data)=>{
win.webContents.send('action-show-ping-toast-received-ack', data);
});
// ARQ DATA CHANNEL OPENING
ipcMain.on('request-show-arq-toast-datachannel-opening',(event,data)=>{
win.webContents.send('action-show-arq-toast-datachannel-opening', data);
});
// ARQ DATA CHANNEL OPEN
ipcMain.on('request-show-arq-toast-datachannel-open',(event,data)=>{
win.webContents.send('action-show-arq-toast-datachannel-open', data);
});
// ARQ DATA RECEIVED OPENER
ipcMain.on('request-show-arq-toast-datachannel-received-opener',(event,data)=>{
win.webContents.send('action-show-arq-toast-datachannel-received-opener', data);
});
// ARQ TRANSMISSION FAILED
ipcMain.on('request-show-arq-toast-transmission-failed',(event,data)=>{
win.webContents.send('action-show-arq-toast-transmission-failed', data);
});
// ARQ TRANSMISSION RECEIVING
ipcMain.on('request-show-arq-toast-transmission-receiving',(event,data)=>{
win.webContents.send('action-show-arq-toast-transmission-receiving', data);
});
// ARQ TRANSMISSION RECEIVED
ipcMain.on('request-show-arq-toast-transmission-received',(event,data)=>{
win.webContents.send('action-show-arq-toast-transmission-received', data);
});
// ARQ TRANSMISSION TRANSMITTING
ipcMain.on('request-show-arq-toast-transmission-transmitting',(event,data)=>{
win.webContents.send('action-show-arq-toast-transmission-transmitting', data);
});
// ARQ TRANSMISSION TRANSMITTED
ipcMain.on('request-show-arq-toast-transmission-transmitted',(event,data)=>{
win.webContents.send('action-show-arq-toast-transmission-transmitted', data);
});
//tnc messages END --------------------------------------
//restart and install udpate
ipcMain.on('request-restart-and-install',(event,data)=>{
close_sub_processes()

View file

@ -354,7 +354,9 @@ ipcRenderer.on('action-new-msg-received', (event, arg) => {
}).catch(function(err) {
console.log(err);
});
} else if (item.type == 'beacon') {
// Handle beacon
} else if (item.beacon == 'received') {
obj.timestamp = item.timestamp;
obj.dxcallsign = item.dxcallsign;
obj.dxgrid = item.dxgrid;
@ -364,7 +366,7 @@ ipcRenderer.on('action-new-msg-received', (event, arg) => {
obj.msg = 'null';
obj.status = item.status;
obj.snr = item.snr;
obj.type = item.type;
obj.type = 'beacon';
db.put({
_id: obj.uuid,
@ -393,6 +395,8 @@ ipcRenderer.on('action-new-msg-received', (event, arg) => {
}).catch(function(err) {
console.log(err);
});
// handle ARQ transmission
} else if (item.arq == 'received') {
var encoded_data = atob(item.data);
var splitted_data = encoded_data.split(split_char);

View file

@ -1332,144 +1332,7 @@ ipcRenderer.on('action-update-tnc-state', (event, arg) => {
tbl.appendChild(row);
}
// DISPLAY INFO TOASTS
if (typeof(arg.info) == 'undefined') {
var infoLength = 0;
} else {
var infoLength = arg.info.length;
}
for (i = 0; i < infoLength; i++) {
// SENDING CQ TOAST
if (arg.info[i] == "CQ;SENDING"){
var toastCQsending = document.getElementById('toastCQsending');
var toast = bootstrap.Toast.getOrCreateInstance(toastCQsending); // Returns a Bootstrap toast instance
toast.show();
}
// RECEIVING CQ TOAST
if (arg.info[i] == "CQ;RECEIVING"){
var toastCQreceiving = document.getElementById('toastCQreceiving');
var toast = bootstrap.Toast.getOrCreateInstance(toastCQreceiving); // Returns a Bootstrap toast instance
toast.show();
}
// RECEIVING BEACON TOAST
if (arg.info[i] == "BEACON;RECEIVING"){
var toastBEACONreceiving = document.getElementById('toastBEACONreceiving');
var toast = bootstrap.Toast.getOrCreateInstance(toastBEACONreceiving); // Returns a Bootstrap toast instance
toast.show();
}
// SENDING PING TOAST
if (arg.info[i] == "PING;SENDING"){
var toastPINGsending = document.getElementById('toastPINGsending');
var toast = bootstrap.Toast.getOrCreateInstance(toastPINGsending); // Returns a Bootstrap toast instance
toast.show();
}
// RECEIVING PING TOAST
if (arg.info[i] == "PING;RECEIVING"){
var toastPINGreceiving = document.getElementById('toastPINGreceiving');
var toast = bootstrap.Toast.getOrCreateInstance(toastPINGreceiving); // Returns a Bootstrap toast instance
toast.show();
}
// RECEIVING PING ACK TOAST
if (arg.info[i] == "PING;RECEIVEDACK"){
var toastPINGreceivedACK = document.getElementById('toastPINGreceivedACK');
var toast = bootstrap.Toast.getOrCreateInstance(toastPINGreceivedACK); // Returns a Bootstrap toast instance
toast.show();
}
// DATACHANNEL OPENING TOAST
if (arg.info[i] == "DATACHANNEL;OPENING"){
var toastDATACHANNELopening = document.getElementById('toastDATACHANNELopening');
var toast = bootstrap.Toast.getOrCreateInstance(toastDATACHANNELopening); // Returns a Bootstrap toast instance
toast.show();
}
// DATACHANNEL OPEN TOAST
if (arg.info[i] == "DATACHANNEL;OPEN"){
var toastDATACHANNELopen = document.getElementById('toastDATACHANNELopen');
var toast = bootstrap.Toast.getOrCreateInstance(toastDATACHANNELopen); // Returns a Bootstrap toast instance
toast.show();
}
// DATACHANNEL RECEIVEDOPENER TOAST
if (arg.info[i] == "DATACHANNEL;RECEIVEDOPENER"){
var toastDATACHANNELreceivedopener = document.getElementById('toastDATACHANNELreceivedopener');
var toast = bootstrap.Toast.getOrCreateInstance(toastDATACHANNELreceivedopener); // Returns a Bootstrap toast instance
toast.show();
}
// TRANSMISSION STOPPED
if (arg.info[i] == "TRANSMISSION;STOPPED"){
var toastDATACHANNELreceivedopener = document.getElementById('toastTRANSMISSIONstopped');
var toast = bootstrap.Toast.getOrCreateInstance(toastDATACHANNELreceivedopener); // Returns a Bootstrap toast instance
toast.show();
}
// DATACHANNEL FAILED TOAST
if (arg.info[i] == "DATACHANNEL;FAILED"){
var toastDATACHANNELfailed = document.getElementById('toastDATACHANNELfailed');
var toast = bootstrap.Toast.getOrCreateInstance(toastDATACHANNELfailed); // Returns a Bootstrap toast instance
toast.show();
}
// ARQ RECEIVING TOAST
if (arg.info[i] == "ARQ;RECEIVING"){
document.getElementById("transmission_progress").className = "progress-bar progress-bar-striped progress-bar-animated bg-primary";
var toastARQreceiving = document.getElementById('toastARQreceiving');
var toast = bootstrap.Toast.getOrCreateInstance(toastARQreceiving); // Returns a Bootstrap toast instance
toast.show();
}
// ARQ RECEIVING SUCCESS TOAST
console.log(arg.info[i])
if (arg.info[i] == "ARQ;RECEIVING;SUCCESS"){
document.getElementById("transmission_progress").className = "progress-bar progress-bar-striped bg-success";
var toastARQreceivingsuccess = document.getElementById('toastARQreceivingsuccess');
var toast = bootstrap.Toast.getOrCreateInstance(toastARQreceivingsuccess); // Returns a Bootstrap toast instance
toast.show();
}
// ARQ RECEIVING FAILED TOAST
if (arg.info[i] == "ARQ;RECEIVING;FAILED"){
document.getElementById("transmission_progress").className = "progress-bar progress-bar-striped bg-danger";
var toastARQreceivingfailed = document.getElementById('toastARQreceivingfailed');
var toast = bootstrap.Toast.getOrCreateInstance(toastARQreceivingfailed); // Returns a Bootstrap toast instance
toast.show();
}
// ARQ TRANSMITTING TOAST
if (arg.info[i] == "ARQ;TRANSMITTING"){
document.getElementById("transmission_progress").className = "progress-bar progress-bar-striped progress-bar-animated bg-primary";
var toastARQtransmitting = document.getElementById('toastARQtransmitting');
var toast = bootstrap.Toast.getOrCreateInstance(toastARQtransmitting); // Returns a Bootstrap toast instance
toast.show();
}
// ARQ TRANSMITTING SUCCESS TOAST
if (arg.info[i] == "ARQ;TRANSMITTING;SUCCESS"){
document.getElementById("transmission_progress").className = "progress-bar progress-bar-striped bg-success";
var toastARQtransmittingsuccess = document.getElementById('toastARQtransmittingsuccess');
var toast = bootstrap.Toast.getOrCreateInstance(toastARQtransmittingsuccess); // Returns a Bootstrap toast instance
toast.show();
}
// ARQ TRANSMITTING FAILED TOAST
if (arg.info[i] == "ARQ;TRANSMITTING;FAILED"){
document.getElementById("transmission_progress").className = "progress-bar progress-bar-striped bg-danger";
var toast = bootstrap.Toast.getOrCreateInstance(toastARQtransmittingfailed); // Returns a Bootstrap toast instance
toast.show();
}
}
});
ipcRenderer.on('action-update-daemon-state', (event, arg) => {
@ -1929,3 +1792,186 @@ ipcRenderer.on('action-updater', (event, arg) => {
});
// ----------- INFO MODAL ACTIONS -------------------------------
// CQ TRANSMITTING
ipcRenderer.on('action-show-cq-toast-transmitting', (event, data) => {
var toastCQsending = document.getElementById('toastCQsending');
var toast = bootstrap.Toast.getOrCreateInstance(toastCQsending); // Returns a Bootstrap toast instance
toast.show();
});
// CQ RECEIVED
ipcRenderer.on('action-show-cq-toast-received', (event, data) => {
var toastCQreceiving = document.getElementById('toastCQreceiving');
var toast = bootstrap.Toast.getOrCreateInstance(toastCQreceiving); // Returns a Bootstrap toast instance
toast.show();
});
// QRV TRANSMITTING
ipcRenderer.on('action-show-qrv-toast-transmitting', (event, data) => {
});
// QRV RECEIVED
ipcRenderer.on('action-show-qrv-toast-received', (event, data) => {
});
// BEACON TRANSMITTING
ipcRenderer.on('action-show-beacon-toast-transmitting', (event, data) => {
});
// BEACON RECEIVED
ipcRenderer.on('action-show-beacon-toast-received', (event, data) => {
var toastBEACONreceiving = document.getElementById('toastBEACONreceiving');
var toast = bootstrap.Toast.getOrCreateInstance(toastBEACONreceiving); // Returns a Bootstrap toast instance
toast.show();
});
// PING TRANSMITTING
ipcRenderer.on('action-show-ping-toast-transmitting', (event, data) => {
var toastPINGsending = document.getElementById('toastPINGsending');
var toast = bootstrap.Toast.getOrCreateInstance(toastPINGsending); // Returns a Bootstrap toast instance
toast.show();
});
// PING RECEIVED
ipcRenderer.on('action-show-ping-toast-received', (event, data) => {
var toastPINGreceiving = document.getElementById('toastPINGreceiving');
var toast = bootstrap.Toast.getOrCreateInstance(toastPINGreceiving); // Returns a Bootstrap toast instance
toast.show();
});
// PING RECEIVED ACK
ipcRenderer.on('action-show-ping-toast-received-ack', (event, data) => {
var toastPINGreceivedACK = document.getElementById('toastPINGreceivedACK');
var toast = bootstrap.Toast.getOrCreateInstance(toastPINGreceivedACK); // Returns a Bootstrap toast instance
toast.show();
});
// DATA CHANNEL OPENING TOAST
ipcRenderer.on('action-show-arq-toast-datachannel-opening', (event, data) => {
var toastDATACHANNELopening = document.getElementById('toastDATACHANNELopening');
var toast = bootstrap.Toast.getOrCreateInstance(toastDATACHANNELopening); // Returns a Bootstrap toast instance
toast.show();
});
// DATA CHANNEL OPEN TOAST
ipcRenderer.on('action-show-arq-toast-datachannel-open', (event, data) => {
var toastDATACHANNELopen = document.getElementById('toastDATACHANNELopen');
var toast = bootstrap.Toast.getOrCreateInstance(toastDATACHANNELopen); // Returns a Bootstrap toast instance
toast.show();
});
// DATA CHANNEL RECEIVED OPENER TOAST
ipcRenderer.on('action-show-arq-toast-datachannel-received-opener', (event, data) => {
var toastDATACHANNELreceivedopener = document.getElementById('toastDATACHANNELreceivedopener');
var toast = bootstrap.Toast.getOrCreateInstance(toastDATACHANNELreceivedopener); // Returns a Bootstrap toast instance
toast.show();
});
// ARQ TRANSMISSION FAILED
// TODO: use for both - transmitting and receiving --> we need to change the IDs
ipcRenderer.on('action-show-arq-toast-transmission-failed', (event, data) => {
document.getElementById("transmission_progress").className = "progress-bar progress-bar-striped bg-danger";
var toast = bootstrap.Toast.getOrCreateInstance(toastARQtransmittingfailed); // Returns a Bootstrap toast instance
toast.show();
});
// ARQ TRANSMISSION STOPPED
// TODO: RENAME ID -- WRONG
ipcRenderer.on('action-show-arq-toast-transmission-stopped', (event, data) => {
var toastDATACHANNELreceivedopener = document.getElementById('toastTRANSMISSIONstopped');
var toast = bootstrap.Toast.getOrCreateInstance(toastDATACHANNELreceivedopener); // Returns a Bootstrap toast instance
toast.show();
});
// ARQ TRANSMISSION FAILED
// TODO: USE FOR TX AND RX
ipcRenderer.on('action-show-arq-toast-transmission-failed', (event, data) => {
document.getElementById("transmission_progress").className = "progress-bar progress-bar-striped bg-danger";
var toastARQreceivingfailed = document.getElementById('toastARQreceivingfailed');
var toast = bootstrap.Toast.getOrCreateInstance(toastARQreceivingfailed); // Returns a Bootstrap toast instance
toast.show();
});
// ARQ TRANSMISSION TRANSMITTED
ipcRenderer.on('action-show-arq-toast-transmission-transmitted', (event, data) => {
document.getElementById("transmission_progress").className = "progress-bar progress-bar-striped bg-success";
var toastARQtransmittingsuccess = document.getElementById('toastARQtransmittingsuccess');
var toast = bootstrap.Toast.getOrCreateInstance(toastARQtransmittingsuccess); // Returns a Bootstrap toast instance
toast.show();
});
// ARQ TRANSMISSION TRANSMITTING
ipcRenderer.on('action-show-arq-toast-transmission-transmitting', (event, data) => {
document.getElementById("transmission_progress").className = "progress-bar progress-bar-striped progress-bar-animated bg-primary";
var toastARQtransmitting = document.getElementById('toastARQtransmitting');
var toast = bootstrap.Toast.getOrCreateInstance(toastARQtransmitting); // Returns a Bootstrap toast instance
toast.show();
});
// ARQ TRANSMISSION RECEIVED
ipcRenderer.on('action-show-arq-toast-transmission-received', (event, data) => {
document.getElementById("transmission_progress").className = "progress-bar progress-bar-striped bg-success";
var toastARQreceivingsuccess = document.getElementById('toastARQreceivingsuccess');
var toast = bootstrap.Toast.getOrCreateInstance(toastARQreceivingsuccess); // Returns a Bootstrap toast instance
toast.show();
});
// ARQ TRANSMISSION RECEIVING
ipcRenderer.on('action-show-arq-toast-transmission-receiving', (event, data) => {
document.getElementById("transmission_progress").className = "progress-bar progress-bar-striped progress-bar-animated bg-primary";
var toastARQreceiving = document.getElementById('toastARQreceiving');
var toast = bootstrap.Toast.getOrCreateInstance(toastARQreceiving); // Returns a Bootstrap toast instance
toast.show();
});
/*
// TRANSMISSION STOPPED
if (arg.info[i] == "TRANSMISSION;STOPPED"){
var toastDATACHANNELreceivedopener = document.getElementById('toastTRANSMISSIONstopped');
var toast = bootstrap.Toast.getOrCreateInstance(toastDATACHANNELreceivedopener); // Returns a Bootstrap toast instance
toast.show();
}
*/
// DATACHANNEL FAILED TOAST
//if (arg.info[i] == "DATACHANNEL;FAILED"){
// var toastDATACHANNELfailed = document.getElementById('toastDATACHANNELfailed');
// var toast = bootstrap.Toast.getOrCreateInstance(toastDATACHANNELfailed); // Returns a Bootstrap toast instance
// toast.show();
//}
/*
// ARQ RECEIVING FAILED TOAST
if (arg.info[i] == "ARQ;RECEIVING;FAILED"){
document.getElementById("transmission_progress").className = "progress-bar progress-bar-striped bg-danger";
var toastARQreceivingfailed = document.getElementById('toastARQreceivingfailed');
var toast = bootstrap.Toast.getOrCreateInstance(toastARQreceivingfailed); // Returns a Bootstrap toast instance
toast.show();
}
*/
/*
// ARQ TRANSMITTING FAILED TOAST
if (arg.info[i] == "ARQ;TRANSMITTING;FAILED"){
document.getElementById("transmission_progress").className = "progress-bar progress-bar-striped bg-danger";
var toast = bootstrap.Toast.getOrCreateInstance(toastARQtransmittingfailed); // Returns a Bootstrap toast instance
toast.show();
}
*/

View file

@ -226,67 +226,147 @@ client.on('data', function(socketdata) {
ipcRenderer.send('request-update-tnc-state', Data);
}
// update transmission status
if (data['arq'] == 'transmission'){
socketLog.info(data)
let state = {
status: data['status'],
uuid: data['uuid'],
percent: data['percent'],
bytesperminute: data['bytesperminute'],
};
ipcRenderer.send('request-update-transmission-status', state);
}
// Check for Ping
if (data['type'] == 'ping') {
ipcRenderer.send('request-new-msg-received', {data: [data]});
}
// Check for Beacon
if (data['type'] == 'beacon') {
ipcRenderer.send('request-new-msg-received', {data: [data]});
}
/* A TEST WITH STREAMING DATA .... */
// if we received data through network stream, we get a single data item
if (data['arq'] == 'received') {
dataArray = []
messageArray = []
// ----------- catch tnc messages START -----------
if (data['freedata'] == 'tnc-message'){
socketLog.info(data)
// we need to encode here to do a deep check for checking if file or message
var encoded_data = atob(data['data'])
var splitted_data = encoded_data.split(split_char)
if(splitted_data[0] == 'f'){
dataArray.push(data)
}
if(splitted_data[0] == 'm'){
messageArray.push(data)
console.log(data)
// update transmission status
if (data['arq'] == 'transmission'){
let state = {
status: data['status'],
uuid: data['uuid'],
percent: data['percent'],
bytesperminute: data['bytesperminute'],
};
ipcRenderer.send('request-update-transmission-status', state);
}
rxBufferLengthGui = dataArray.length
let Files = {
data: dataArray,
};
ipcRenderer.send('request-update-rx-buffer', Files);
ipcRenderer.send('request-new-msg-received', Files);
rxMsgBufferLengthGui = messageArray.length
let Messages = {
data: messageArray,
};
ipcRenderer.send('request-new-msg-received', Messages);
// CQ TRANSMITTING
if (data['cq'] == 'transmitting') {
ipcRenderer.send('request-show-cq-toast-transmitting', {data: [data]});
}
// CQ RECEIVED
if (data['cq'] == 'received') {
ipcRenderer.send('request-show-cq-toast-received', {data: [data]});
}
// QRV TRANSMITTING
if (data['qrv'] == 'transmitting') {
ipcRenderer.send('request-show-qrv-toast-transmitting', {data: [data]});
}
// QRV RECEIVED
if (data['qrv'] == 'received') {
ipcRenderer.send('request-show-qrv-toast-received', {data: [data]});
}
// BEACON TRANSMITTING
if (data['beacon'] == 'transmitting') {
ipcRenderer.send('request-show-beacon-toast-transmitting', {data: [data]});
}
// BEACON RECEIVED
if (data['beacon'] == 'received') {
ipcRenderer.send('request-show-beacon-toast-received', {data: [data]});
ipcRenderer.send('request-new-msg-received', {data: [data]});
}
// PING TRANSMITTING
if (data['ping'] == 'transmitting') {
ipcRenderer.send('request-show-ping-toast-transmitting', {data: [data]});
}
// PING RECEIVED
if (data['ping'] == 'received') {
ipcRenderer.send('request-show-ping-toast-received', {data: [data]});
ipcRenderer.send('request-new-msg-received', {data: [data]});
}
// PING ACKNOWLEDGE
if (data['ping'] == 'acknowledge') {
ipcRenderer.send('request-show-ping-toast-received-ack', {data: [data]});
ipcRenderer.send('request-new-msg-received', {data: [data]});
}
// ARQ OPEN
if (data['arq'] == 'transmission') {
// ARQ OPEN
if (data['status'] == 'open') {
ipcRenderer.send('request-show-arq-toast-datachannel-open', {data: [data]});
// ARQ OPENING
} else if (data['status'] == 'opening') {
ipcRenderer.send('request-show-arq-toast-datachannel-opening', {data: [data]});
// ARQ TRANSMISSION FAILED
} else if (data['status'] == 'failed') {
ipcRenderer.send('request-show-arq-toast-transmission-failed', {data: [data]});
// ARQ TRANSMISSION RECEIVED
} else if (data['status'] == 'received') {
ipcRenderer.send('request-show-arq-toast-transmission-received', {data: [data]});
// ARQ TRANSMISSION TRANSMITTING
} else if (data['status'] == 'transmitting') {
ipcRenderer.send('request-show-arq-toast-transmission-transmitting', {data: [data]});
// ARQ TRANSMISSION TRANSMITTED
} else if (data['status'] == 'transmitted') {
ipcRenderer.send('request-show-arq-toast-transmission-transmitted', {data: [data]});
}
}
/* A TEST WITH STREAMING DATA .... */
// if we received data through network stream, we get a single data item
if (data['arq'] == 'received') {
dataArray = []
messageArray = []
socketLog.info(data)
// we need to encode here to do a deep check for checking if file or message
var encoded_data = atob(data['data'])
var splitted_data = encoded_data.split(split_char)
if(splitted_data[0] == 'f'){
dataArray.push(data)
}
if(splitted_data[0] == 'm'){
messageArray.push(data)
console.log(data)
}
rxBufferLengthGui = dataArray.length
let Files = {
data: dataArray,
};
ipcRenderer.send('request-update-rx-buffer', Files);
ipcRenderer.send('request-new-msg-received', Files);
rxMsgBufferLengthGui = messageArray.length
let Messages = {
data: messageArray,
};
ipcRenderer.send('request-new-msg-received', Messages);
}
}
// ----------- catch tnc info messages END -----------
// if we manually checking for the rx buffer we are getting an array of multiple data
if (data['command'] == 'rx_buffer') {
socketLog.info(data)

View file

@ -1814,7 +1814,7 @@ class DATA:
# static.INFO.append("PING;SENDING")
self.send_data_to_socket_queue(
freedata="tnc-message",
ping="sending",
ping="transmitting",
)
self.log.info(
"[TNC] PING REQ ["
@ -2050,8 +2050,7 @@ class DATA:
self.send_data_to_socket_queue(
freedata="tnc-message",
type="beacon",
status="received",
beacon="received",
uuid=str(uuid.uuid4()),
timestamp=int(time.time()),
mycallsign=str(self.mycallsign, "UTF-8"),
@ -2060,13 +2059,7 @@ class DATA:
snr=str(static.SNR),
)
# static.INFO.append("BEACON;RECEIVING")
self.send_data_to_socket_queue(
freedata="tnc-message",
beacon="received",
mycallsign=str(self.mycallsign, "UTF-8"),
dxcallsign=str(static.DXCALLSIGN, "UTF-8"),
dxgrid=str(static.DXGRID, "UTF-8"),
)
self.log.info(
"[TNC] BEACON RCVD ["
+ str(dxcallsign, "UTF-8")
@ -2126,7 +2119,7 @@ class DATA:
# static.INFO.append("CQ;RECEIVING")
self.send_data_to_socket_queue(
freedata="tnc-message",
cq="receiving",
cq="received",
mycallsign=str(self.mycallsign, "UTF-8"),
dxcallsign=str(static.DXCALLSIGN, "UTF-8"),
dxgrid=str(static.DXGRID, "UTF-8"),