klaute/MMDVMHost-Dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #197 from IZ7BOJ/patch-2

Browse source 
Update RSSI and BER for YSF
This commit is contained in:
Kim - DG9VH 2020-03-19 11:58:11 +01:00 committed by GitHub
commit 2110ce4e7a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
include/functions.php
View file

@ -366,12 +366,20 @@ function getHeardList($logLines, $onlyLast) {
$ber = substr($loss, 5); $ber = substr($loss, 5);
$loss = ""; $loss = "";
} else { } else {
$loss = strtok($loss, " "); if (startsWith($loss,"RSSI:")) { //for short RF packets and "X" button requests, BER sometimes in not showed. RSSI is in BER position
if (array_key_exists(4,$lineTokens)) { $loss="";
$ber = substr($lineTokens[4], 5); $ber = "";
} $rssiString = substr($lineTokens[3], 6);
if (array_key_exists(5,$lineTokens) && substr($lineTokens[5], 6) != "-0/-0/-0 dBm") { } else {
$rssiString = substr($lineTokens[5], 6); $loss = strtok($loss, " ");
if (array_key_exists(4,$lineTokens)) {
$ber = substr($lineTokens[4], 5);
}
$rssiString = substr($lineTokens[5], 6);
if (array_key_exists(5,$lineTokens) && substr($lineTokens[5], 6) != "-0/-0/-0 dBm") {
$rssiString = substr($lineTokens[5], 6);
}
}
if (constant("RSSI") == "min") $rssiVal = preg_replace('/(-\d+)\/-\d+\/-\d+ dBm/', "\\1", $rssiString); if (constant("RSSI") == "min") $rssiVal = preg_replace('/(-\d+)\/-\d+\/-\d+ dBm/', "\\1", $rssiString);
else if (constant("RSSI") == "max") $rssiVal = preg_replace('/-\d+\/(-\d+)\/-\d+ dBm/', "\\1", $rssiString); else if (constant("RSSI") == "max") $rssiVal = preg_replace('/-\d+\/(-\d+)\/-\d+ dBm/', "\\1", $rssiString);
else if (constant("RSSI") == "avg") $rssiVal = preg_replace('/-\d+\/-\d+\/(-\d+) dBm/', "\\1", $rssiString); else if (constant("RSSI") == "avg") $rssiVal = preg_replace('/-\d+\/-\d+\/(-\d+) dBm/', "\\1", $rssiString);
@ -394,7 +402,6 @@ function getHeardList($logLines, $onlyLast) {
} else { } else {
$rssi = $rssiVal; $rssi = $rssiVal;
} }
}
} }
if (strpos($logLine,"ended RF data") || strpos($logLine,"ended network")) { if (strpos($logLine,"ended RF data") || strpos($logLine,"ended network")) {