';
+ } else {
+ var user_image =
+ '
- 
-
+ ${user_image}
+
${dxcallsign}
@@ -1211,7 +1293,76 @@ update_chat = function (obj) {
-
+ ${user_image}
+
+
+ `;
+ }
+ if (obj.type == "broadcast_transmit") {
+ var new_message = `
+
+
+
+
+
+
+
+ ${message_html}
++ ${timestamp} + +
+ + + + ${obj.broadcast_sender} + dxcallsign + +
+
+
+
+
-
+ >
+
+
+
+
+
+ `;
+ }
+
if (obj.type == "transmit") {
+ console.log(obj);
//console.log('msg-' + obj._id + '-status')
if (obj.status == "failed") {
@@ -1285,28 +1436,26 @@ update_chat = function (obj) {
console.log("element already exists......");
console.log(obj);
- console.log(
+ if (
+ !obj.status == "broadcast_transmit" ||
+ !obj.status == "broadcast_received"
+ ) {
+ document.getElementById("msg-" + obj._id + "-status").innerHTML =
+ get_icon_for_state(obj.status);
+
document
.getElementById("msg-" + obj._id + "-progress")
- .getAttribute("aria-valuenow")
- );
-
- document.getElementById("msg-" + obj._id + "-status").innerHTML =
- get_icon_for_state(obj.status);
-
- document
- .getElementById("msg-" + obj._id + "-progress")
- .setAttribute("aria-valuenow", obj.percent);
- document
- .getElementById("msg-" + obj._id + "-progress")
- .setAttribute("style", "width:" + obj.percent + "%;");
- document.getElementById(
- "msg-" + obj._id + "-progress-information"
- ).innerHTML = obj.percent + "% - " + obj.bytesperminute + " Bpm";
-
- document.getElementById("msg-" + obj._id + "-attempts").innerHTML =
- obj.attempt + "/" + max_retry_attempts;
+ .setAttribute("aria-valuenow", obj.percent);
+ document
+ .getElementById("msg-" + obj._id + "-progress")
+ .setAttribute("style", "width:" + obj.percent + "%;");
+ document.getElementById(
+ "msg-" + obj._id + "-progress-information"
+ ).innerHTML = obj.percent + "% - " + obj.bytesperminute + " Bpm";
+ document.getElementById("msg-" + obj._id + "-attempts").innerHTML =
+ obj.attempt + "/" + max_retry_attempts;
+ }
if (obj.status == "transmitted") {
//document.getElementById('msg-' + obj._id + '-progress').classList.remove("progress-bar-striped");
document
@@ -1323,7 +1472,10 @@ update_chat = function (obj) {
document.getElementById(
"msg-" + obj._id + "-progress-information"
).innerHTML = "TRANSMITTED - " + obj.bytesperminute + " Bpm";
- } else {
+ } else if (
+ !obj.status == "broadcast_transmit" ||
+ !obj.status == "broadcast_received"
+ ) {
document
.getElementById("msg-" + obj._id + "-progress")
.classList.add("progress-bar-striped");
@@ -1607,6 +1759,7 @@ add_obj_to_database = function (obj) {
db.put({
_id: obj.uuid,
timestamp: parseInt(obj.timestamp),
+ broadcast_sender: obj.broadcast_sender,
uuid: obj.uuid,
dxcallsign: obj.dxcallsign,
dxgrid: obj.dxgrid,
@@ -1631,9 +1784,20 @@ add_obj_to_database = function (obj) {
.catch(function (err) {
console.log("already exists");
console.log(err);
+ console.log(obj);
+ db.upsert(obj.uuid, function (doc) {
+ doc = obj;
+ return doc;
+ })
+ .then(function (response) {
+ console.log("upsert");
+ console.log(response);
+ })
+ .catch(function (err) {
+ console.log(err);
+ });
});
};
-
/* users database functions */
addUserToDatabaseIfNotExists = function (obj) {
/*
@@ -1934,9 +2098,10 @@ async function updateAllChat(clear) {
],
})
.then(async function (result) {
+ console.log(result);
// handle result async
//document.getElementById("blurOverlay").classList.add("bg-primary");
-
+ console.log(result);
if (typeof result !== "undefined") {
for (const item of result.docs) {
//await otherwise history will not be in chronological order
@@ -1981,6 +2146,14 @@ function getSetUserSharedFolder(selected_callsign) {
console.log("return triggered");
return;
}
+
+ // disable button if broadcast
+ if (selected_callsign.startsWith("BC-")) {
+ document.getElementById("sharedFolderDXButton").disabled = true;
+ } else {
+ document.getElementById("sharedFolderDXButton").disabled = false;
+ }
+
returnObjFromCallsign(users, selected_callsign)
.then(function (data) {
console.log(data);
@@ -2110,6 +2283,16 @@ function getSetUserInformation(selected_callsign) {
console.log("return triggered");
return;
}
+
+ // disable button if broadcast
+ if (selected_callsign.startsWith("BC-")) {
+ document.getElementById("userModalDXButton").disabled = true;
+ document.getElementById("ping").disabled = true;
+ } else {
+ document.getElementById("userModalDXButton").disabled = false;
+ document.getElementById("ping").disabled = false;
+ }
+
document.getElementById("dx_user_info_callsign").innerHTML =
selected_callsign;
@@ -2127,6 +2310,10 @@ function getSetUserInformation(selected_callsign) {
// split data string by "base64" for separating image type from base64 string
atob(data.user_info_image.split(";base64,")[1]);
+ if (selected_callsign.startsWith("BC-")) {
+ data.user_info_image = defaultGroupIcon;
+ }
+
document.getElementById("dx_user_info_image").src =
data.user_info_image;
document.getElementById("user-image-" + selected_callsign).src =
@@ -2134,9 +2321,22 @@ function getSetUserInformation(selected_callsign) {
} catch (e) {
console.log(e);
console.log("corrupted image data");
+
+ if (selected_callsign.startsWith("BC-")) {
+ var userIcon = defaultGroupIcon;
+ document
+ .getElementById("chatModuleMessage")
+ .setAttribute("maxlength", 16);
+ } else {
+ var userIcon = defaultUserIcon;
+ document
+ .getElementById("chatModuleMessage")
+ .setAttribute("maxlength", 524288);
+ }
+
document.getElementById("user-image-" + selected_callsign).src =
- defaultUserIcon;
- document.getElementById("dx_user_info_image").src = defaultUserIcon;
+ userIcon;
+ document.getElementById("dx_user_info_image").src = userIcon;
}
} else {
// throw error and use placeholder data
@@ -2192,9 +2392,20 @@ function getSetUserInformation(selected_callsign) {
console.log("writing user info to modal failed");
console.log(err);
+ if (selected_callsign.startsWith("BC-")) {
+ document
+ .getElementById("chatModuleMessage")
+ .setAttribute("maxlength", 16);
+ var userIcon = defaultGroupIcon;
+ } else {
+ var userIcon = defaultUserIcon;
+ document
+ .getElementById("chatModuleMessage")
+ .setAttribute("maxlength", 524288);
+ }
+
// Callsign list elements
- document.getElementById("user-image-" + selected_callsign).src =
- defaultUserIcon;
+ document.getElementById("user-image-" + selected_callsign).src = userIcon;
document.getElementById("user-image-" + selected_callsign).className =
"p-1 rounded-circle w-100";
document.getElementById("user-image-" + selected_callsign).style =
diff --git a/gui/preload-main.js b/gui/preload-main.js
index e3c86021..31eaabcb 100644
--- a/gui/preload-main.js
+++ b/gui/preload-main.js
@@ -1606,29 +1606,62 @@ window.addEventListener("DOMContentLoaded", () => {
if (hslLastSort == 0 && hslLastSortDir == "asc") hslLastSortDir = "desc";
else hslLastSortDir = "asc";
sorthslTable(0);
+ resetSortIcon();
});
document.getElementById("thFreq").addEventListener("click", () => {
if (hslLastSort == 1 && hslLastSortDir == "asc") hslLastSortDir = "desc";
else hslLastSortDir = "asc";
sorthslTable(1);
+ resetSortIcon();
});
document.getElementById("thDxcall").addEventListener("click", () => {
if (hslLastSort == 3 && hslLastSortDir == "asc") hslLastSortDir = "desc";
else hslLastSortDir = "asc";
sorthslTable(3);
+ resetSortIcon();
});
document.getElementById("thDxgrid").addEventListener("click", () => {
if (hslLastSort == 4 && hslLastSortDir == "asc") hslLastSortDir = "desc";
else hslLastSortDir = "asc";
sorthslTable(4);
+ resetSortIcon();
});
document.getElementById("thDist").addEventListener("click", () => {
if (hslLastSort == 5 && hslLastSortDir == "asc") hslLastSortDir = "desc";
else hslLastSortDir = "asc";
sorthslTable(5);
+ resetSortIcon();
+ });
+ document.getElementById("thType").addEventListener("click", () => {
+ if (hslLastSort == 6 && hslLastSortDir == "asc") hslLastSortDir = "desc";
+ else hslLastSortDir = "asc";
+ sorthslTable(6);
+ resetSortIcon();
+ });
+ document.getElementById("thSnr").addEventListener("click", () => {
+ if (hslLastSort == 7 && hslLastSortDir == "asc") hslLastSortDir = "desc";
+ else hslLastSortDir = "asc";
+ sorthslTable(7);
+ resetSortIcon();
});
});
+function resetSortIcon() {
+ document.getElementById("hslSort").remove();
+ let headers = document.querySelectorAll(
+ "#tblHeardStationList > thead > tr > th"
+ );
+ if (hslLastSortDir == "desc")
+ text =
+ '' +
+ headers[hslLastSort].innerText;
+ else
+ text =
+ '' +
+ headers[hslLastSort].innerText;
+ headers[hslLastSort].innerHTML = text;
+}
+
function connectedStation(data) {
if (typeof data.dxcallsign == "undefined") {
return;
@@ -2791,6 +2824,9 @@ ipcRenderer.on("run-tnc-command", (event, arg) => {
arg.command
);
}
+ if (arg.command == "broadcast") {
+ sock.sendBroadcastChannel(arg.broadcastChannel, arg.data, arg.uuid);
+ }
if (arg.command == "stop_transmission") {
sock.stopTransmission();
}
@@ -3549,7 +3585,7 @@ function changeGuiDesign(design) {
}
var hslLastSort = 0;
-var hslLastSortDir = "asc";
+var hslLastSortDir = "desc";
//https://www.w3schools.com/howto/howto_js_sort_table.asp
function sorthslTable(n) {
diff --git a/gui/sock.js b/gui/sock.js
index a2262971..ec3893c9 100644
--- a/gui/sock.js
+++ b/gui/sock.js
@@ -242,6 +242,22 @@ client.on("data", function (socketdata) {
data: [data],
});
break;
+
+ case "broadcast":
+ // RX'd FEC BROADCAST
+ var encoded_data = FD.atob_FD(data["data"]);
+ var splitted_data = encoded_data.split(split_char);
+ var messageArray = [];
+ if (splitted_data[0] == "m") {
+ messageArray.push(data);
+ console.log(data);
+ }
+
+ let Messages = {
+ data: messageArray,
+ };
+ ipcRenderer.send("request-new-msg-received", Messages);
+ break;
}
switch (data["cq"]) {
@@ -835,6 +851,30 @@ exports.sendFecIsWriting = function (mycallsign) {
writeTncCommand(command);
};
+// SEND FEC TO BROADCASTCHANNEL
+exports.sendBroadcastChannel = function (channel, data_out, uuid) {
+ let checksum = "";
+ let command = "";
+ let data = FD.btoa_FD(
+ "m" +
+ split_char +
+ channel +
+ //split_char +
+ //checksum +
+ split_char +
+ uuid +
+ split_char +
+ data_out
+ );
+ console.log(data.length);
+ let payload = data;
+ command =
+ '{"type" : "fec", "command" : "transmit", "mode": "datac4", "wakeup": "True", "payload" : "' +
+ payload +
+ '"}';
+ writeTncCommand(command);
+};
+
// RECORD AUDIO
exports.record_audio = function () {
command = '{"type" : "set", "command" : "record_audio"}';
diff --git a/gui/src/chat-module.html b/gui/src/chat-module.html
index 1f78ee6d..dddc0c7d 100644
--- a/gui/src/chat-module.html
+++ b/gui/src/chat-module.html
@@ -97,39 +97,7 @@
id="list-tab"
role="tablist"
style="height: calc(100vh - 70px)"
- >
-
-
+
+
+
+ ${message_html}
++ ${timestamp} - + ${get_icon_for_state( + obj.status + )} +
+ + + ${attempt}/${max_retry_attempts} + retries + + +
-
-
-
-
-
-
- BROADCAST @ALL
- ---
- ---
- -
@@ -307,25 +275,7 @@
id="message-container"
style="height: calc(100% - 150px)"
>
-
+
diff --git a/gui/src/index.html b/gui/src/index.html
index 8e42e8d3..18b9adfb 100644
--- a/gui/src/index.html
+++ b/gui/src/index.html
@@ -1152,14 +1152,16 @@