added sending or receiving SMS in LH and local TX-Lists
This commit is contained in:
parent
1f03e0bf56
commit
44446bc642
3 changed files with 40 additions and 25 deletions
|
@ -129,7 +129,7 @@ function getHeardList($logLines) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(strpos($logLine,"end of") || strpos($logLine,"watchdog has expired")) {
|
if(strpos($logLine,"end of") || strpos($logLine,"watchdog has expired") || strpos($logLine,"ended RF data") || strpos($logLine,"ended network")) {
|
||||||
$lineTokens = explode(", ",$logLine);
|
$lineTokens = explode(", ",$logLine);
|
||||||
|
|
||||||
$duration = strtok($lineTokens[2], " ");
|
$duration = strtok($lineTokens[2], " ");
|
||||||
|
@ -144,27 +144,38 @@ function getHeardList($logLines) {
|
||||||
$ber = substr($lineTokens[4], 5);
|
$ber = substr($lineTokens[4], 5);
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (substr($logLine, 27, strpos($logLine,",") - 27)) {
|
if (strpos($logLine,"ended RF data") || strpos($logLine,"ended network")) {
|
||||||
case "D-Star":
|
switch (substr($logLine, 27, strpos($logLine,",") - 27)) {
|
||||||
$dstarduration = $duration;
|
case "DMR Slot 1":
|
||||||
$dstarloss = $loss;
|
$ts1duration = "SMS";
|
||||||
$dstarber = $ber;
|
break;
|
||||||
break;
|
case "DMR Slot 2":
|
||||||
case "DMR Slot 1":
|
$ts2duration = "SMS";
|
||||||
$ts1duration = $duration;
|
break;
|
||||||
$ts1loss = $loss;
|
}
|
||||||
$ts1ber = $ber;
|
} else {
|
||||||
break;
|
switch (substr($logLine, 27, strpos($logLine,",") - 27)) {
|
||||||
case "DMR Slot 2":
|
case "D-Star":
|
||||||
$ts2duration = $duration;
|
$dstarduration = $duration;
|
||||||
$ts2loss = $loss;
|
$dstarloss = $loss;
|
||||||
$ts2ber = $ber;
|
$dstarber = $ber;
|
||||||
break;
|
break;
|
||||||
case "YSF":
|
case "DMR Slot 1":
|
||||||
$ysfduration = $duration;
|
$ts1duration = $duration;
|
||||||
$ysfloss = $loss;
|
$ts1loss = $loss;
|
||||||
$ysfber = $ber;
|
$ts1ber = $ber;
|
||||||
break;
|
break;
|
||||||
|
case "DMR Slot 2":
|
||||||
|
$ts2duration = $duration;
|
||||||
|
$ts2loss = $loss;
|
||||||
|
$ts2ber = $ber;
|
||||||
|
break;
|
||||||
|
case "YSF":
|
||||||
|
$ysfduration = $duration;
|
||||||
|
$ysfloss = $loss;
|
||||||
|
$ysfber = $ber;
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -27,8 +27,10 @@ for ($i = 0; ($i < LHLINES) AND ($i < count($lastHeard)); $i++) {
|
||||||
echo"<td>$listElem[4]</td>";
|
echo"<td>$listElem[4]</td>";
|
||||||
echo"<td>$listElem[5]</td>";
|
echo"<td>$listElem[5]</td>";
|
||||||
if ($listElem[6] == null) {
|
if ($listElem[6] == null) {
|
||||||
echo'<td colspan="3">transmitting</td>';
|
echo'<td colspan="3">transmitting</td>';
|
||||||
} else {
|
} else if ($listElem[6] == "SMS") {
|
||||||
|
echo'<td colspan="3">sending or receiving SMS</td>';
|
||||||
|
} else {
|
||||||
echo"<td>$listElem[6]</td>";
|
echo"<td>$listElem[6]</td>";
|
||||||
echo"<td>$listElem[7]</td>";
|
echo"<td>$listElem[7]</td>";
|
||||||
echo"<td>$listElem[8]</td>";
|
echo"<td>$listElem[8]</td>";
|
||||||
|
|
|
@ -34,6 +34,8 @@ for ($i = 0; $i < count($localTXList); $i++) {
|
||||||
echo"<td>$listElem[5]</td>";
|
echo"<td>$listElem[5]</td>";
|
||||||
if ($listElem[6] == null) {
|
if ($listElem[6] == null) {
|
||||||
echo'<td colspan="3">transmitting</td>';
|
echo'<td colspan="3">transmitting</td>';
|
||||||
|
} else if ($listElem[6] == "SMS") {
|
||||||
|
echo'<td colspan="3">sending or receiving SMS</td>';
|
||||||
} else {
|
} else {
|
||||||
echo"<td>$listElem[6]</td>";
|
echo"<td>$listElem[6]</td>";
|
||||||
echo"<td>$listElem[7]</td>";
|
echo"<td>$listElem[7]</td>";
|
||||||
|
|
Loading…
Reference in a new issue