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

Putting YSF also to resolving of Talkgroups...

Browse source 
Working on DG-IDs, add lines like:
YSF,0,40,DL Multimode 263
So only makes sense, if you are using DGIdGateway or (modified) versions of
YSFGateway (for using YCS).
This commit is contained in:
Kim Huebel 2021-02-17 20:58:46 +00:00
parent 37580baaae
commit e6f2368322
3 changed files with 38 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
html/data/TG_List.csv
View file

@ -1,4 +1,10 @@
TS,TG,LABEL MODE,TS,TG,LABEL
1,263,DL Multimode BM DMR,1,263,DL Multimode BM
2,8021,Pegasus DMR-DL DMR,2,8021,Pegasus DMR-DL
2,2625,RLP/SL BM DMR,2,2625,RLP/SL BM
YSF,0,40,DL Multimode 263
YSF,0,41,DL-RAMSES
YSF,0,42,DL-RAMSES-II
YSF,0,43,DL-RAMSES-III
YSF,0,44,DL-PEGASUS

1 MODE TS TG LABEL
2 DMR 1 263 DL Multimode BM
3 DMR 2 8021 Pegasus DMR-DL
4 DMR 2 2625 RLP/SL BM
5 YSF 0 40 DL Multimode 263
6 YSF 0 41 DL-RAMSES
7 YSF 0 42 DL-RAMSES-II
8 YSF 0 43 DL-RAMSES-III
9 YSF 0 44 DL-PEGASUS
10

40
html/js/functions.js
View file

@ -131,12 +131,26 @@ function getRawTarget(logline) {
} }
} }
function resolveTarget(timeslot, target) { function resolveTarget(mode, timeslot, target) {
if (mode.startsWith("DMR")) {
mode = "DMR";
}
retval = null; retval = null;
tmpval = talkgroups.filter(function (tg) { return tg[0] == timeslot}); tmpval = talkgroups.filter(function (tg) { return tg[0] == mode});
retval = tmpval.filter(function (tg) { return tg[1] == target.substring(3, target.length)}); switch (mode) {
case "DMR":
tmpval = talkgroups.filter(function (tg) { return tg[1] == timeslot});
retval = tmpval.filter(function (tg) { return tg[2] == target.substring(3, target.length).trim()});
break;
case "YSF":
retval = tmpval.filter(function (tg) { return tg[2] == target.substring(6, target.length).trim()});
break;
default:
break;
}
if (retval.length > 0) { if (retval.length > 0) {
return retval[0][2]; return retval[0][3];
} else { } else {
return target; return target;
} }
@ -180,20 +194,20 @@ function getTarget(logline) {
} }
} }
} else { } else {
if (getMode(logline).startsWith("DMR")) { //if (getMode(logline).startsWith("DMR")) {
link = '<a href="' + bmlink + linkTarget + '" target="_new">' + resolveTarget(getTimeslot(getMode(logline)), target) + '</a>'; link = '<a href="' + bmlink + linkTarget + '" target="_new">' + resolveTarget(getMode(logline), getTimeslot(getMode(logline)), target) + '</a>';
return link; return link;
} else { /*} else {
link = '<a href="' + bmlink + linkTarget + '" target="_new">' + target + '</a>'; link = '<a href="' + bmlink + linkTarget + '" target="_new">' + target + '</a>';
return link; return link;
} }*/
} }
} else { } else {
if (getMode(logline).startsWith("DMR")) { //if (getMode(logline).startsWith("DMR")) {
return resolveTarget(getTimeslot(getMode(logline)), target); return resolveTarget(getMode(logline), getTimeslot(getMode(logline)), target);
} else { /*} else {
return target; return target;
} }*/
} }
} }
@ -861,7 +875,7 @@ function processData(data) {
var allRows = data.split(/\r?\n|\r/); var allRows = data.split(/\r?\n|\r/);
for (var singleRow = 1; singleRow < allRows.length; singleRow++) { for (var singleRow = 1; singleRow < allRows.length; singleRow++) {
var rowCells = allRows[singleRow].split(','); var rowCells = allRows[singleRow].split(',');
talkgroups.push([rowCells[0], rowCells[1], rowCells[2]]); talkgroups.push([rowCells[0], rowCells[1], rowCells[2], rowCells[3]]);
} }
logIt("Parsed TGs: " + talkgroups); logIt("Parsed TGs: " + talkgroups);
} }

2
html/js/version.js
View file

@ -1 +1 @@
var dashboard_version = "2021-02-16 20:44:20"; var dashboard_version = "2021-02-17 20:58:46";