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

Assign 2.4ghz devices to 2400 band. 

Fixup bug in channel mapping (leading 0 in channel number doesn't work)

ref BBHN->ticket:29
This commit is contained in:
Conrad Lara - KG6JEI 2014-04-19 23:51:55 -07:00
parent c6924d3be4
commit 0541234e1e
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
files/www/cgi-bin/channelmaps.pm
View File

@ -128,7 +128,10 @@ sub rf_channels_list
foreach (`iwlist wlan0 channel` ) foreach (`iwlist wlan0 channel` )
{ {
next unless /([0-9]+) : ([0-9]+.[0-9]+)/; next unless /([0-9]+) : ([0-9]+.[0-9]+)/;
$channels->{$1} = "$2 GHZ" ; my $channelnum = $1;
my $channelfreq = $2;
$channelnum =~s/^0+//g;
$channels->{$channelnum} = "$channelfreq GHZ" ;
} }
return $channels; return $channels;
} }

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

@ -898,6 +898,7 @@ sub hardware_info
'antennas' => { 1 => 'Antenna' }, 'antennas' => { 1 => 'Antenna' },
'defaultant' => 1, 'defaultant' => 1,
'usechains' => 0, 'usechains' => 0,
'rfband' => '2400',
}, },
'0xc3a2' => { '0xc3a2' => {
'name' => 'PicoStation2 HP', 'name' => 'PicoStation2 HP',
@ -908,6 +909,7 @@ sub hardware_info
'antennas' => { 1 => 'Antenna' }, 'antennas' => { 1 => 'Antenna' },
'defaultant' => 1, 'defaultant' => 1,
'usechains' => 0, 'usechains' => 0,
'rfband' => '2400',
}, },
'0xe012' => { '0xe012' => {
'name' => 'NanoStation M2', 'name' => 'NanoStation M2',
@ -918,6 +920,7 @@ sub hardware_info
'antennas' => { 1 => "Horizontal", 2 => "Vertical", 3 => "Diversity" }, 'antennas' => { 1 => "Horizontal", 2 => "Vertical", 3 => "Diversity" },
'defaultant' => 3, 'defaultant' => 3,
'usechains' => 1, 'usechains' => 1,
'rfband' => '2400',
}, },
'0xe0a2' => { '0xe0a2' => {
'name' => 'NanoStation Loco M2', 'name' => 'NanoStation Loco M2',
@ -928,6 +931,7 @@ sub hardware_info
'antennas' => { 1 => "Horizontal", 2 => "Vertical", 3 => "Diversity" }, 'antennas' => { 1 => "Horizontal", 2 => "Vertical", 3 => "Diversity" },
'defaultant' => 3, 'defaultant' => 3,
'usechains' => 1, 'usechains' => 1,
'rfband' => '2400',
}, },
'0xe1b2' => { '0xe1b2' => {
'name' => 'Rocket M2', 'name' => 'Rocket M2',
@ -938,6 +942,7 @@ sub hardware_info
'antennas' => { 1 => "Chain0", 2 => "Chain1", 3 => "Diversity"}, 'antennas' => { 1 => "Chain0", 2 => "Chain1", 3 => "Diversity"},
'defaultant' => 3, 'defaultant' => 3,
'usechains' => 1, 'usechains' => 1,
'rfband' => '2400',
}, },
'0xe1b5' => { '0xe1b5' => {
'name' => 'Rocket M5', 'name' => 'Rocket M5',
@ -959,6 +964,7 @@ sub hardware_info
'antennas' => { 1 => 'N Connector' }, 'antennas' => { 1 => 'N Connector' },
'defaultant' => 1, 'defaultant' => 1,
'usechains' => 0, 'usechains' => 0,
'rfband' => '2400',
}, },
'0xe205' => { '0xe205' => {
'name' => 'Bullet M5', 'name' => 'Bullet M5',
@ -991,6 +997,7 @@ sub hardware_info
'antennas' => { 1 => "Horizontal", 2 => "Vertical", 3 => "Diversity"}, 'antennas' => { 1 => "Horizontal", 2 => "Vertical", 3 => "Diversity"},
'defaultant' => 3, 'defaultant' => 3,
'usechains' => 1, 'usechains' => 1,
'rfband' => '2400',
}, },
'0xe242' => { '0xe242' => {
'name' => 'airGrid M2 HP', 'name' => 'airGrid M2 HP',
@ -1001,6 +1008,7 @@ sub hardware_info
'antennas' => { 1 => 'airGrid' }, 'antennas' => { 1 => 'airGrid' },
'defaultant' => 1, 'defaultant' => 1,
'usechains' => 0, 'usechains' => 0,
'rfband' => '2400',
}, },
'0xe243' => { '0xe243' => {
'name' => 'NannoBridge M3', 'name' => 'NannoBridge M3',
@ -1011,6 +1019,7 @@ sub hardware_info
'antennas' => { 1 => "Chain0", 2 => "Chain1", 3 => "Diversity"}, 'antennas' => { 1 => "Chain0", 2 => "Chain1", 3 => "Diversity"},
'defaultant' => 3, 'defaultant' => 3,
'usechains' => 1, 'usechains' => 1,
'rfband' => '2400',
}, },
'0xe252' => { '0xe252' => {
'name' => 'airGrid M2 HP', 'name' => 'airGrid M2 HP',
@ -1021,6 +1030,7 @@ sub hardware_info
'antennas' => { 1 => 'airGrid' }, 'antennas' => { 1 => 'airGrid' },
'defaultant' => 1, 'defaultant' => 1,
'usechains' => 0, 'usechains' => 0,
'rfband' => '2400',
}, },
'0xe255' => { '0xe255' => {
'name' => 'airGrid M5 HP', 'name' => 'airGrid M5 HP',
@ -1053,6 +1063,7 @@ sub hardware_info
'antennas' => { 1 => "Horizontal", 2 => "Vertical", 3 => "Diversity"}, 'antennas' => { 1 => "Horizontal", 2 => "Vertical", 3 => "Diversity"},
'defaultant' => 3, 'defaultant' => 3,
'usechains' => 1, 'usechains' => 1,
'rfband' => '2400',
}, },
'0xe2d2' => { '0xe2d2' => {
'name' => 'Bullet M2 Titanium HP', 'name' => 'Bullet M2 Titanium HP',
@ -1063,6 +1074,7 @@ sub hardware_info
'antennas' => { 1 => 'N Connector' }, 'antennas' => { 1 => 'N Connector' },
'defaultant' => 1, 'defaultant' => 1,
'usechains' => 0, 'usechains' => 0,
'rfband' => '2400',
}, },
'0xe2d5' => { '0xe2d5' => {
'name' => 'Bullet M5 Titanium', 'name' => 'Bullet M5 Titanium',
@ -1084,6 +1096,7 @@ sub hardware_info
'antennas' => { 1 => 'Antenna' }, 'antennas' => { 1 => 'Antenna' },
'defaultant' => 1, 'defaultant' => 1,
'usechains' => 0, 'usechains' => 0,
'rfband' => '2400',
}, },
'0xe4e5' => { '0xe4e5' => {
'name' => 'NannoBeam M5 International', 'name' => 'NannoBeam M5 International',