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

Added duration to Currently TXing

Browse source
This commit is contained in:
Kim - DG9VH 2020-11-12 15:14:53 +01:00
parent d4589a97ba
commit d2cb6034ff
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
html/index.html
View file

@ -71,6 +71,7 @@
<th>Callsign</th> <th>Callsign</th>
<th>Target</th> <th>Target</th>
<th>Source</th> <th>Source</th>
<th>Dur (s)</th>
</tr> </tr>
</thead> </thead>
</table> </table>

15
html/js/functions.js
View file

@ -1,6 +1,10 @@
var messagecount = 0; var messagecount = 0;
var ts1TXing = null; var ts1TXing = null;
var ts2TXing = null; var ts2TXing = null;
var ts1timestamp = null;
var ts2timestamp = null;
setInterval(getCurrentTXing, 1000);
// 00000000001111111111222222222233333333334444444444555555555566666666667777777777888888888899999999990000000000111111111122222222223333333333 // 00000000001111111111222222222233333333334444444444555555555566666666667777777777888888888899999999990000000000111111111122222222223333333333
// 01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 // 01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
// M: 2020-11-01 21:33:27.454 YSF, received network data from DG2MAS to DG-ID 0 at DG2MAS // M: 2020-11-01 21:33:27.454 YSF, received network data from DG2MAS to DG-ID 0 at DG2MAS
@ -190,15 +194,15 @@ function copyToQSO(callsign) {
} }
function getCurrentTXing() { function getCurrentTXing() {
logIt("getCurrentTXingTS1: " + ts1TXing);
logIt("getCurrentTXingTS2: " + ts2TXing);
ts1 = null; ts1 = null;
ts2 = null; ts2 = null;
if (ts1TXing != null) { if (ts1TXing != null) {
ts1 = ts1TXing.split(";"); ts1 = ts1TXing.split(";");
ts1[4] = Math.round((Date.now() - Date.parse(ts1timestamp.replace(" ","T")+".000Z"))/1000);
} }
if (ts2TXing != null) { if (ts2TXing != null) {
ts2 = ts2TXing.split(";"); ts2 = ts2TXing.split(";");
ts2[4] = Math.round((Date.now() - Date.parse(ts2timestamp.replace(" ","T")+".000Z"))/1000);
} }
t_ct.clear().draw(); t_ct.clear().draw();
if (ts1 != null) { if (ts1 != null) {
@ -237,8 +241,10 @@ function getLastHeard(document, event) {
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);
ts1timestamp = getTimestamp(line);
} else { } else {
ts2TXing = getMode(line) + ";" + line.substring(line.indexOf("from") + 5, line.indexOf("to")).trim() + ";" + getTarget(line) + ";" + getSource(line); ts2TXing = getMode(line) + ";" + line.substring(line.indexOf("from") + 5, line.indexOf("to")).trim() + ";" + getTarget(line) + ";" + getSource(line);
ts2timestamp = getTimestamp(line);
} }
} }
if (line.indexOf("network watchdog") > 0 || line.indexOf("end of voice transmission") > 0 || line.indexOf("end of transmission") > 0) { if (line.indexOf("network watchdog") > 0 || line.indexOf("end of voice transmission") > 0 || line.indexOf("end of transmission") > 0) {
@ -248,8 +254,8 @@ function getLastHeard(document, event) {
ts2TXing = null; ts2TXing = null;
} }
} }
logIt("TS1: " + ts1TXing); logIt("TS1: " + ts1TXing + "|" + ts1timestamp);
logIt("TS2: " + ts2TXing); logIt("TS2: " + ts2TXing + "|" + ts2timestamp);
getCurrentTXing(); getCurrentTXing();
var rowIndexes = [], var rowIndexes = [],
@ -280,7 +286,6 @@ function getLastHeard(document, event) {
if(data[2] == callsign){ if(data[2] == callsign){
rowIndexes.push(idx); rowIndexes.push(idx);
} }
logIt("rowIndexes: " + rowIndexes);
return false; return false;
}); });
if (rowIndexes[0]) { if (rowIndexes[0]) {