Merge branch 'wscan' into develop

This commit is contained in:
AE6XE 2015-04-02 22:15:19 -07:00
commit c4b64d1609
1 changed files with 2 additions and 2 deletions

View File

@ -307,7 +307,7 @@ while(1)
{ {
pushAP($signal, $chan, $key, $ssid, $mac, $mode); pushAP($signal, $chan, $key, $ssid, $mac, $mode);
$mac = $1; $mac = $1;
if($ssid =~ /Broadband/) { $bbchan = $chan } if($ssid =~ /-(5|10|20)-v[3456]$/) { $bbchan = $chan }
} }
if($line =~ /\bESSID: "(.*)"/) { $ssid = $1 } if($line =~ /\bESSID: "(.*)"/) { $ssid = $1 }
@ -320,7 +320,7 @@ while(1)
close(FILE); close(FILE);
if($ssid =~ /Broadband/) { $bbchan = $chan } if($ssid =~ /-(5|10|20)-v[3456]$/) { $bbchan = $chan }
pushAP($signal, $chan, $key, $ssid, $mac, $mode); pushAP($signal, $chan, $key, $ssid, $mac, $mode);
sleep 1 if not scalar @list and $loops != 1; sleep 1 if not scalar @list and $loops != 1;