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

Now fixed https://github.com/dg9vh/MMDVMHost-Websocketboard/issues/26 also for P25 transmissions

Browse source
This commit is contained in:
Kim Huebel 2021-04-30 11:27:21 +01:00
parent 21bad01db9
commit 7d940ac5f4
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
html/js/config.js
View file

@ -5,7 +5,7 @@ var config_struc_ver = 20210421.1;
var qrz = 1; var qrz = 1;
// 1 = enable debug in javascript-console, 0 = 0ff // 1 = enable debug in javascript-console, 0 = 0ff
var debug = 0; var debug = 1;
// Set messagecounters for different badge-colors // Set messagecounters for different badge-colors
var warnlevel = 200; var warnlevel = 200;

15
html/js/functions.js
View file

@ -633,8 +633,8 @@ function getLastHeard(document, event) {
lines.forEach(function(line, index, array) { lines.forEach(function(line, index, array) {
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)) { 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("received network data") > 0 || line.indexOf("late entry") > 0 || line.indexOf("voice header") > 0 || line.indexOf("network header") > 0 || line.indexOf("received RF header") > 0) { if (line.indexOf("received network data") > 0 || line.indexOf("late entry") > 0 || line.indexOf("voice header") > 0 || line.indexOf("network header") > 0 || line.indexOf("received RF header") > 0 || line.indexOf("received RF voice") > 0 || line.indexOf("received network transmission") > 0) {
txing = true; txing = true;
if (getMode(line) == "DMR Slot 1" ) { if (getMode(line) == "DMR Slot 1" ) {
ts1TXing = getMode(line) + ";" + line.substring(line.indexOf("from") + 5, line.indexOf("to")).trim() + ";" + getTarget(line) + ";" + getSource(line); ts1TXing = getMode(line) + ";" + line.substring(line.indexOf("from") + 5, line.indexOf("to")).trim() + ";" + getTarget(line) + ";" + getSource(line);
@ -659,6 +659,7 @@ function getLastHeard(document, event) {
if(data[0] == getLocaltimeFromTimestamp(ts2timestamp)){ if(data[0] == getLocaltimeFromTimestamp(ts2timestamp)){
rowIndexes.push(idx); rowIndexes.push(idx);
} }
return false;
} }
}); });
if (getMode(line) == "DMR Slot 1" ) { if (getMode(line) == "DMR Slot 1" ) {
@ -703,12 +704,12 @@ function getLastHeard(document, event) {
ts1tmp = []; ts1tmp = [];
ts2tmp = []; ts2tmp = [];
if (ts1TXing != null) { if (ts1TXing != null) {
matchstring = "";
ts1tmp = ts1TXing.split(";"); ts1tmp = ts1TXing.split(";");
} }
if (ts2TXing != null) { if (ts2TXing != null) {
matchstring = "";
ts2tmp = ts2TXing.split(";"); ts2tmp = ts2TXing.split(";");
logIt("ts2tmp: " + ts2tmp);
logIt("ts2timestamp: " + ts2timestamp);
} }
var rowIndexes = [], var rowIndexes = [],
@ -726,6 +727,7 @@ function getLastHeard(document, event) {
} else { } else {
target = ts2tmp[2]; target = ts2tmp[2];
} }
logIt("TXing:" + txing);
if (txing) { if (txing) {
duration = "TXing"; duration = "TXing";
loss = ""; loss = "";
@ -747,11 +749,14 @@ function getLastHeard(document, event) {
addToQSO = ""; addToQSO = "";
} }
t_lh.rows( function ( idx, data, node ) { t_lh.rows( function ( idx, data, node ) {
if(data[2] == callsign){ //if(data[2] == callsign){
if(data[2].indexOf(callsign) > -1){
rowIndexes.push(idx); rowIndexes.push(idx);
} }
return false; return false;
}); });
logIt("RowIndexes: " + rowIndexes);
if (rowIndexes[0] == "0") { if (rowIndexes[0] == "0") {
t_lh.row(rowIndexes[0]).remove().draw(false); t_lh.row(rowIndexes[0]).remove().draw(false);
} }

2
html/js/version.js
View file

@ -1 +1 @@
var dashboard_version = "2021-04-28 19:11:05"; var dashboard_version = "2021-04-30 11:27:21";