diff --git a/include/functions.php b/include/functions.php index c97e05c..79374be 100644 --- a/include/functions.php +++ b/include/functions.php @@ -258,16 +258,19 @@ 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 > "-63") $rssi = " S9+10dB"; - else if ($rssiAvg > "-73") $rssi = " S9"; - else if ($rssiAvg > "-79") $rssi = " S8"; - else if ($rssiAvg > "-85") $rssi = " S7"; - else if ($rssiAvg > "-91") $rssi = " S6"; - else if ($rssiAvg > "-97") $rssi = " S5"; - else if ($rssiAvg > "-103") $rssi = " S4"; - else if ($rssiAvg > "-109") $rssi = " S3"; - else if ($rssiAvg > "-115") $rssi = " S2"; - else if ($rssiAvg > "-121") $rssi = " S1"; + if ($rssiAvg > "-53") $rssi = " S9+40dB"; + else if ($rssiAvg > "-63") $rssi = " S9+30dB"; + else if ($rssiAvg > "-73") $rssi = " S9+20dB"; + else if ($rssiAvg > "-83") $rssi = " S9+10dB"; + else if ($rssiAvg > "-93") $rssi = " S9"; + else if ($rssiAvg > "-99") $rssi = " S8"; + else if ($rssiAvg > "-105") $rssi = " S7"; + else if ($rssiAvg > "-111") $rssi = " S6"; + else if ($rssiAvg > "-117") $rssi = " S5"; + else if ($rssiAvg > "-123") $rssi = " S4"; + else if ($rssiAvg > "-129") $rssi = " S3"; + else if ($rssiAvg > "-135") $rssi = " S2"; + else if ($rssiAvg > "-141") $rssi = " S1"; else $rssi = " S0"; } $ber = substr($loss, 5); @@ -280,16 +283,19 @@ 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 > "-63") $rssi = " S9+10dB"; - else if ($rssiAvg > "-73") $rssi = " S9"; - else if ($rssiAvg > "-79") $rssi = " S8"; - else if ($rssiAvg > "-85") $rssi = " S7"; - else if ($rssiAvg > "-91") $rssi = " S6"; - else if ($rssiAvg > "-97") $rssi = " S5"; - else if ($rssiAvg > "-103") $rssi = " S4"; - else if ($rssiAvg > "-109") $rssi = " S3"; - else if ($rssiAvg > "-115") $rssi = " S2"; - else if ($rssiAvg > "-121") $rssi = " S1"; + if ($rssiAvg > "-53") $rssi = " S9+40dB"; + else if ($rssiAvg > "-63") $rssi = " S9+30dB"; + else if ($rssiAvg > "-73") $rssi = " S9+20dB"; + else if ($rssiAvg > "-83") $rssi = " S9+10dB"; + else if ($rssiAvg > "-93") $rssi = " S9"; + else if ($rssiAvg > "-99") $rssi = " S8"; + else if ($rssiAvg > "-105") $rssi = " S7"; + else if ($rssiAvg > "-111") $rssi = " S6"; + else if ($rssiAvg > "-117") $rssi = " S5"; + else if ($rssiAvg > "-123") $rssi = " S4"; + else if ($rssiAvg > "-129") $rssi = " S3"; + else if ($rssiAvg > "-135") $rssi = " S2"; + else if ($rssiAvg > "-141") $rssi = " S1"; else $rssi = " S0"; } }