diff --git a/include/functions.php b/include/functions.php index 85f8f54..43295f7 100644 --- a/include/functions.php +++ b/include/functions.php @@ -258,20 +258,20 @@ function getHeardList($logLines, $onlyLast) { if (substr($ber, 6) != "-0/-0/-0 dBm") { $rssiString = substr($ber, 6); $rssiAvg = preg_replace('/-\d+\/-\d+\/(-\d+) dBm/', "\\1", $rssiString); - if ($rssiAvg > "-53") $rssi = "
S9+40dB ($rssiAvg dBm)$rssiString
"; - else if ($rssiAvg > "-63") $rssi = "
S9+30dB ($rssiAvg dBm)$rssiString
"; - else if ($rssiAvg > "-73") $rssi = "
S9+20dB ($rssiAvg dBm)$rssiString
"; - else if ($rssiAvg > "-83") $rssi = "
S9+10dB ($rssiAvg dBm)$rssiString
"; - else if ($rssiAvg > "-93") $rssi = "
S9 ($rssiAvg dBm)$rssiString
"; - else if ($rssiAvg > "-99") $rssi = "
S8 ($rssiAvg dBm)$rssiString
"; - else if ($rssiAvg > "-105") $rssi = "
S7 ($rssiAvg dBm)$rssiString
"; - else if ($rssiAvg > "-111") $rssi = "
S6 ($rssiAvg dBm)$rssiString
"; - else if ($rssiAvg > "-117") $rssi = "
S5 ($rssiAvg dBm)$rssiString
"; - else if ($rssiAvg > "-123") $rssi = "
S4 ($rssiAvg dBm)$rssiString
"; - else if ($rssiAvg > "-129") $rssi = "
S3 ($rssiAvg dBm)$rssiString
"; - else if ($rssiAvg > "-135") $rssi = "
S2 ($rssiAvg dBm)$rssiString
"; - else if ($rssiAvg > "-141") $rssi = "
S1 ($rssiAvg dBm)$rssiString
"; - else $rssi = "
S0 ($rssiAvg dBm)$rssiString
"; + if ($rssiAvg > "-53") $rssi = "
S9+40dB ($rssiAvg dBm)(min/max/avg)
$rssiString
"; + else if ($rssiAvg > "-63") $rssi = "
S9+30dB ($rssiAvg dBm)(min/max/avg)
$rssiString
"; + else if ($rssiAvg > "-73") $rssi = "
S9+20dB ($rssiAvg dBm)(min/max/avg)
$rssiString
"; + else if ($rssiAvg > "-83") $rssi = "
S9+10dB ($rssiAvg dBm)(min/max/avg)
$rssiString
"; + else if ($rssiAvg > "-93") $rssi = "
S9 ($rssiAvg dBm)(min/max/avg)
$rssiString
"; + else if ($rssiAvg > "-99") $rssi = "
S8 ($rssiAvg dBm)(min/max/avg)
$rssiString
"; + else if ($rssiAvg > "-105") $rssi = "
S7 ($rssiAvg dBm)(min/max/avg)
$rssiString
"; + else if ($rssiAvg > "-111") $rssi = "
S6 ($rssiAvg dBm)(min/max/avg)
$rssiString
"; + else if ($rssiAvg > "-117") $rssi = "
S5 ($rssiAvg dBm)(min/max/avg)
$rssiString
"; + else if ($rssiAvg > "-123") $rssi = "
S4 ($rssiAvg dBm)(min/max/avg)
$rssiString
"; + else if ($rssiAvg > "-129") $rssi = "
S3 ($rssiAvg dBm)(min/max/avg)
$rssiString
"; + else if ($rssiAvg > "-135") $rssi = "
S2 ($rssiAvg dBm)(min/max/avg)
$rssiString
"; + else if ($rssiAvg > "-141") $rssi = "
S1 ($rssiAvg dBm)(min/max/avg)
$rssiString
"; + else $rssi = "
S0 ($rssiAvg dBm)(min/max/avg)
$rssiString
"; } $ber = substr($loss, 5); $loss = ""; @@ -283,20 +283,20 @@ function getHeardList($logLines, $onlyLast) { if (array_key_exists(5,$lineTokens) && substr($lineTokens[5], 6) != "-0/-0/-0 dBm") { $rssiString = substr($lineTokens[5], 6); $rssiAvg = preg_replace('/-\d+\/-\d+\/(-\d+) dBm/', "\\1", $rssiString); - if ($rssiAvg > "-53") $rssi = "
S9+40dB ($rssiAvg dBm)$rssiString
"; - else if ($rssiAvg > "-63") $rssi = "
S9+30dB ($rssiAvg dBm)$rssiString
"; - else if ($rssiAvg > "-73") $rssi = "
S9+20dB ($rssiAvg dBm)$rssiString
"; - else if ($rssiAvg > "-83") $rssi = "
S9+10dB ($rssiAvg dBm)$rssiString
"; - else if ($rssiAvg > "-93") $rssi = "
S9 ($rssiAvg dBm)$rssiString
"; - else if ($rssiAvg > "-99") $rssi = "
S8 ($rssiAvg dBm)$rssiString
"; - else if ($rssiAvg > "-105") $rssi = "
S7 ($rssiAvg dBm)$rssiString
"; - else if ($rssiAvg > "-111") $rssi = "
S6 ($rssiAvg dBm)$rssiString
"; - else if ($rssiAvg > "-117") $rssi = "
S5 ($rssiAvg dBm)$rssiString
"; - else if ($rssiAvg > "-123") $rssi = "
S4 ($rssiAvg dBm)$rssiString
"; - else if ($rssiAvg > "-129") $rssi = "
S3 ($rssiAvg dBm)$rssiString
"; - else if ($rssiAvg > "-135") $rssi = "
S2 ($rssiAvg dBm)$rssiString
"; - else if ($rssiAvg > "-141") $rssi = "
S1 ($rssiAvg dBm)$rssiString
"; - else $rssi = "
S0 ($rssiAvg dBm)$rssiString
"; + if ($rssiAvg > "-53") $rssi = "
S9+40dB ($rssiAvg dBm)(min/max/avg)
$rssiString
"; + else if ($rssiAvg > "-63") $rssi = "
S9+30dB ($rssiAvg dBm)(min/max/avg)
$rssiString
"; + else if ($rssiAvg > "-73") $rssi = "
S9+20dB ($rssiAvg dBm)(min/max/avg)
$rssiString
"; + else if ($rssiAvg > "-83") $rssi = "
S9+10dB ($rssiAvg dBm)(min/max/avg)
$rssiString
"; + else if ($rssiAvg > "-93") $rssi = "
S9 ($rssiAvg dBm)(min/max/avg)
$rssiString
"; + else if ($rssiAvg > "-99") $rssi = "
S8 ($rssiAvg dBm)(min/max/avg)
$rssiString
"; + else if ($rssiAvg > "-105") $rssi = "
S7 ($rssiAvg dBm)(min/max/avg)
$rssiString
"; + else if ($rssiAvg > "-111") $rssi = "
S6 ($rssiAvg dBm)(min/max/avg)
$rssiString
"; + else if ($rssiAvg > "-117") $rssi = "
S5 ($rssiAvg dBm)(min/max/avg)
$rssiString
"; + else if ($rssiAvg > "-123") $rssi = "
S4 ($rssiAvg dBm)(min/max/avg)
$rssiString
"; + else if ($rssiAvg > "-129") $rssi = "
S3 ($rssiAvg dBm)(min/max/avg)
$rssiString
"; + else if ($rssiAvg > "-135") $rssi = "
S2 ($rssiAvg dBm)(min/max/avg)
$rssiString
"; + else if ($rssiAvg > "-141") $rssi = "
S1 ($rssiAvg dBm)(min/max/avg)
$rssiString
"; + else $rssi = "
S0 ($rssiAvg dBm)(min/max/avg)
$rssiString
"; } }