Mirrors
/
aredn
mirror of https://github.com/aredn/aredn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'FixupSNR' into release-3.15.1.0 

fixes AREDN->ticket:129
This commit is contained in:
Conrad Lara - KG6JEI 2015-06-30 00:08:21 -07:00
parent 4816a47751 39729157c6
commit 28d5b160c1
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
files/www/cgi-bin/perlfunc.pm
View File

@ -600,11 +600,18 @@ sub get_wifi_signal
chomp $wifiintf; chomp $wifiintf;
my ($SignalLevel) = "N/A"; my ($SignalLevel) = "N/A";
my ($NoiseFloor) = "N/A"; my ($NoiseFloor) = "N/A";
foreach(`iwinfo $wifiintf info`) foreach(`iw dev $wifiintf station dump`)
{ {
next unless /.*Signal: ([\d\-]+) dBm.*Noise: ([\d\-]+) dBm/; next unless /.+signal:\s+([-]?[\d]+)/;
$SignalLevel=$1; if ( $SignalLevel <= "$1" || $SignalLevel == "N/A" )
$NoiseFloor=$2; {
$SignalLevel=$1;
}
}
foreach(`iw dev $wifiintf survey dump|grep -A 1 \"\\[in use\\]\"`)
{
next unless /([\d\-]+) dBm/;
$NoiseFloor=$1;
} }
if ( $SignalLevel == "N/A" || $NoiseFloor == "N/A" ) if ( $SignalLevel == "N/A" || $NoiseFloor == "N/A" )