dominic/MMDVMHost-Websocketboard
1
0
Fork 0
Code Releases Activity

finally fixed https://github.com/dg9vh/MMDVMHost-Websocketboard/issues/26

Browse source
This commit is contained in:
Kim Huebel 2021-04-30 19:52:34 +01:00
parent 6dd7057254
commit 6113d838ad
2 changed files with 173 additions and 165 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
html/js/functions.js
View file

@ -630,7 +630,9 @@ function getLastHeard(document, event) {
$(document).ready(function() { $(document).ready(function() {
lines = event.data.split("\n"); lines = event.data.split("\n");
var duration = 0; var duration = 0;
try {
lines.forEach(function(line, index, array) { lines.forEach(function(line, index, array) {
logIt("Line: " + line);
if (!inDashboardBlacklist(line)) { if (!inDashboardBlacklist(line)) {
txing = false; txing = false;
if (line.indexOf("Talker Alias") < 0 && line.indexOf("Downlink Activate") < 0 && line.indexOf("Preamble CSBK") < 0 && line.indexOf("data header") < 0 && line.indexOf("0000:") < 0 && line.length > 0 && (line.indexOf("received") > 0 || line.indexOf("network watchdog") > 0 || line.indexOf("transmission lost") > 0 || line.indexOf("network end of transmission") > 0)) { if (line.indexOf("Talker Alias") < 0 && line.indexOf("Downlink Activate") < 0 && line.indexOf("Preamble CSBK") < 0 && line.indexOf("data header") < 0 && line.indexOf("0000:") < 0 && line.length > 0 && (line.indexOf("received") > 0 || line.indexOf("network watchdog") > 0 || line.indexOf("transmission lost") > 0 || line.indexOf("network end of transmission") > 0)) {
@ -645,6 +647,9 @@ function getLastHeard(document, event) {
} }
} }
if (line.indexOf("network watchdog") > 0 || line.indexOf("end of voice transmission") > 0 || line.indexOf("end of transmission") > 0 || line.indexOf("transmission lost") > 0) { if (line.indexOf("network watchdog") > 0 || line.indexOf("end of voice transmission") > 0 || line.indexOf("end of transmission") > 0 || line.indexOf("transmission lost") > 0) {
if ( t_lh.rows().count() == 0) {
throw BreakException;
}
txing = false; txing = false;
if (line.indexOf("network watchdog") > 0) { if (line.indexOf("network watchdog") > 0) {
logIt("Network Watchdog!"); logIt("Network Watchdog!");
@ -810,6 +815,9 @@ function getLastHeard(document, event) {
} }
} }
}); });
} catch (e) {
if (e !== BreakException) throw e;
}
}); });
} }

2
html/js/version.js
View file

@ -1 +1 @@
var dashboard_version = "2021-04-30 11:28:13"; var dashboard_version = "2021-04-30 19:52:34";