From 5fe2757078fb8ef69f01e332906ee4a7a8c661c9 Mon Sep 17 00:00:00 2001
From: Kim Huebel <dg9vh@darc.de>
Date: Mon, 22 Feb 2021 21:34:44 +0000
Subject: [PATCH] Resolving problem with Wires-X activation on DG-ID 127

---
 html/data/TG_List.csv |  3 +++
 html/js/functions.js  | 40 +++++++++++++++++++++++-----------------
 html/js/version.js    |  2 +-
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/html/data/TG_List.csv b/html/data/TG_List.csv
index 7e20b96..a0c41c0 100644
--- a/html/data/TG_List.csv
+++ b/html/data/TG_List.csv
@@ -2,9 +2,12 @@ MODE,TS,TG,LABEL
 DMR,1,263,DL Multimode BM
 DMR,2,8021,Pegasus DMR-DL
 DMR,2,2625,RLP/SL BM
+YSF,0,1,Local Parrot
 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
+YSF,0,44,DL-SAAR
+YSF,0,99,Network Parrot
 
diff --git a/html/js/functions.js b/html/js/functions.js
index 60d9e59..f04595c 100644
--- a/html/js/functions.js
+++ b/html/js/functions.js
@@ -202,7 +202,6 @@ function getTarget(logline) {
 		}
 	} else {
 		return '<div class=\"tooltip2\">' + resolveTarget(getMode(logline), getTimeslot(getMode(logline)), target) + '<span class=\"tooltip2text\">Origin:<br>' + target + '</span></div>';
-		//resolveTarget(getMode(logline), getTimeslot(getMode(logline)), target);
 	}
 }	
 
@@ -223,12 +222,21 @@ function getDuration(logline) {
 		return "";
 	}
 }
+// 00000000001111111111222222222233333333334444444444455555555566666666667777777777888888888899999999990000000000111111111122222222223333333333
+// 0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
+// M: 2021-02-22 20:57:50.794 YSF, received RF end of transmission from DG9VH      to DG-ID 127, 0.4 seconds, RSSI: -47/-47/-47 dBm
+// M: 2021-02-22 21:16:09.120 YSF, received network end of transmission from DG2MAS     to DG-ID 41, 35.9 seconds, 0% packet loss, BER: 0.0%
+// M: 2021-02-22 20:57:11.415 YSF, received RF end of transmission from DG9VH      to DG-ID 0, 1.0 seconds, BER: 0.6%, RSSI: -47/-47/-47 dBm
 
 function getLoss(logline) {
-	if(logline.lastIndexOf("seconds") > 0) {
-		val = logline.substring(logline.lastIndexOf("seconds") + 9, logline.indexOf("%") + 1);
-		if (val.indexOf("BER") == -1) {
-			return val;
+	if (getSource(logline) == "Net") {
+		if(logline.lastIndexOf("seconds") > 0) {
+			val = logline.substring(logline.lastIndexOf("seconds") + 9, logline.indexOf("%") + 1);
+			if (val.indexOf("BER") == -1) {
+				return val;
+			} else {
+				return "";
+			}
 		} else {
 			return "";
 		}
@@ -257,13 +265,17 @@ function getRSSI(logline) {
 }
 
 function getBER(logline) {
-	if(logline.lastIndexOf("BER") > 0) {
-		if(logline.lastIndexOf("RSSI:") > 0) {
-			retval = logline.substring(logline.lastIndexOf("BER") + 4, logline.lastIndexOf("RSSI:"));
-			retval += " " + getRSSI(logline);
-			return retval;
+	if (getSource(logline) == "RF") {
+		if(logline.lastIndexOf("BER") > 0) {
+			if(logline.lastIndexOf("RSSI:") > 0) {
+				retval = logline.substring(logline.lastIndexOf("BER") + 4, logline.lastIndexOf("RSSI:"));
+				retval += " " + getRSSI(logline);
+				return retval;
+			} else {
+				return logline.substring(logline.lastIndexOf("BER") + 4);
+			}
 		} else {
-			return logline.substring(logline.lastIndexOf("BER") + 4);
+			return "---%, " + getRSSI(logline);
 		}
 	} else {
 		return "";
@@ -306,7 +318,6 @@ function getMessage(logline) {
 	}
 	
 	if (1062 == parseInt(getRIC(logline)) || 1063 == parseInt(getRIC(logline))) {
-		//message = '<a href="#" class="tooltip-test" title="' + JSON.stringify(parseMETAR(message)).replace(/\"/g, '').replace(/,/g, ',\n') + '">' + message + '</a>';
 		message = '<div class=\"tooltip2\">' + message + '<span class=\"tooltiptext\">Decoded Message:<br>' + JSON.stringify(parseMETAR(message)).replace(/\"/g, '').replace(/,/g, ',\n') + '</span></div>';
 	}
 	return message;
@@ -515,11 +526,6 @@ function getLastHeard(document, event) {
 		lines.forEach(function(line, index, array) {
 			logIt("LogLine: " + line);
 			if (!inDashboardBlacklist(line)) {
-				/*if (line.indexOf("description:") > 0 ) {
-					modem = line.substring(line.indexOf("description:") + 12);
-					document.getElementById("modem").innerHTML = modem;
-				}*/
-				
 				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)) {
 					if (line.indexOf("received network data") > 0 || line.indexOf("late entry") > 0 || line.indexOf("voice header") > 0 || line.indexOf("received RF header") > 0) {
diff --git a/html/js/version.js b/html/js/version.js
index da4a822..d40b50e 100644
--- a/html/js/version.js
+++ b/html/js/version.js
@@ -1 +1 @@
-var dashboard_version = "2021-02-21 15:28:59";
+var dashboard_version = "2021-02-22 21:34:44";