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

duration, loss and ber corrected for modes

Browse source
This commit is contained in:
dg9vh 2016-05-03 22:21:29 +02:00
parent aeb04b6c96
commit ec61c44fe2
1 changed files with 50 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
include/functions.php
View file

@ -19,10 +19,20 @@ function getLog() {
function getHeardList($logLines) { function getHeardList($logLines) {
array_multisort($logLines,SORT_DESC); array_multisort($logLines,SORT_DESC);
$heardList = array(); $heardList = array();
$duration = ""; $ts1duration = "";
$loss = ""; $ts1loss = "";
$ber = ""; $ts1ber = "";
$ts2duration = "";
$ts2loss = "";
$ts2ber = "";
$dstarduration = "";
$dstarloss = "";
$dstarber = "";
foreach ($logLines as $logLine) { foreach ($logLines as $logLine) {
$duration = "";
$loss = "";
$ber = "";
$endmode = "";
//removing invalid lines //removing invalid lines
if(strpos($logLine,"BS_Dwn_Act")) { if(strpos($logLine,"BS_Dwn_Act")) {
continue; continue;
@ -32,6 +42,7 @@ function getHeardList($logLines) {
if(strpos($logLine,"end of")) { if(strpos($logLine,"end of")) {
$lineTokens = explode(", ",$logLine); $lineTokens = explode(", ",$logLine);
$duration = strtok($lineTokens[2], " "); $duration = strtok($lineTokens[2], " ");
$loss = $lineTokens[3]; $loss = $lineTokens[3];
if (startsWith($loss,"BER")) { if (startsWith($loss,"BER")) {
@ -41,6 +52,23 @@ function getHeardList($logLines) {
$loss = strtok($loss, " "); $loss = strtok($loss, " ");
$ber = substr($lineTokens[4], 5); $ber = substr($lineTokens[4], 5);
} }
switch (substr($logLine, 27, strpos($logLine,",") - 27)) {
case "D-Star":
$dstarduration = $duration;
$dstarloss = $loss;
$dstarber = $ber;
break;
case "DMR Slot 1":
$ts1duration = $duration;
$ts1loss = $loss;
$ts1ber = $ber;
break;
case "DMR Slot 2":
$ts2duration = $duration;
$ts2loss = $loss;
$ts2ber = $ber;
break;
}
} }
$timestamp = substr($logLine, 3, 19); $timestamp = substr($logLine, 3, 19);
$mode = substr($logLine, 27, strpos($logLine,",") - 27); $mode = substr($logLine, 27, strpos($logLine,",") - 27);
@ -59,6 +87,25 @@ function getHeardList($logLines) {
if (strpos($logLine,"network") > 0 ) { if (strpos($logLine,"network") > 0 ) {
$source = "Network"; $source = "Network";
} }
switch ($mode) {
case "D-Star":
$duration = $dstarduration;
$loss = $dstarloss;
$ber = $dstarber;
break;
case "DMR Slot 1":
$duration = $ts1duration;
$loss = $ts1loss;
$ber = $ts1ber;
break;
case "DMR Slot 2":
$duration = $ts2duration;
$loss = $ts2loss;
$ber = $ts2ber;
break;
}
if ( strlen($callsign) < 7 ) { if ( strlen($callsign) < 7 ) {
array_push($heardList, array($timestamp, $mode, $callsign, $id, $target, $source, $duration, $loss, $ber)); array_push($heardList, array($timestamp, $mode, $callsign, $id, $target, $source, $duration, $loss, $ber));