nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 963bcfd3ee into e153ba6bd7

Browse Source
This commit is contained in:
David Bauer 2021-12-13 14:51:09 +01:00 committed by GitHub
commit f32596cf33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/gluon-config-mode-outdoor/luasrc/lib/gluon/config-mode/wizard/0250-outdoor.lua
View File

@ -12,6 +12,11 @@ return function(form, uci)
return return
end end
if not wireless.site_supports_outdoor_mode() then
-- Don't show in case the site does not support outdoor-mode
return
end
local pkg_i18n = i18n 'gluon-config-mode-outdoor' local pkg_i18n = i18n 'gluon-config-mode-outdoor'
local section = form:section(Section, nil, pkg_i18n.translate( local section = form:section(Section, nil, pkg_i18n.translate(

6
package/gluon-core/check_site.lua
View File

@ -46,8 +46,10 @@ for _, config in ipairs({'wifi24', 'wifi5'}) do
120, 122, 124, 126, 128, 132, 134, 136, 138, 140, 142, 144, 120, 122, 124, 126, 128, 132, 134, 136, 138, 140, 142, 144,
149, 151, 153, 155, 157, 159, 161, 165, 169, 173 } 149, 151, 153, 155, 157, 159, 161, 165, 169, 173 }
need_one_of({config, 'channel'}, channels) need_one_of({config, 'channel'}, channels)
need_chanlist({config, 'outdoor_chanlist'}, channels, false)
need_one_of({config, 'outdoors'}, {true, false, 'preset'}, false) local outdoors = need_one_of({config, 'outdoors'}, {true, false, 'preset'}, false)
local outdoor_chanlist_required = (outdoors ~= false)
need_chanlist({config, 'outdoor_chanlist'}, channels, outdoor_chanlist_required)
end end
obsolete({config, 'supported_rates'}, '802.11b rates are disabled by default.') obsolete({config, 'supported_rates'}, '802.11b rates are disabled by default.')

6
package/gluon-core/luasrc/lib/gluon/upgrade/180-outdoors
View File

@ -13,11 +13,15 @@ end
local sysconfig = require 'gluon.sysconfig' local sysconfig = require 'gluon.sysconfig'
local platform = require 'gluon.platform' local platform = require 'gluon.platform'
local wireless = require 'gluon.wireless'
local config = site.wifi5.outdoors('preset') local config = site.wifi5.outdoors('preset')
local outdoor local outdoor
if sysconfig.gluon_version then if not wireless.site_supports_outdoor_mode() then
-- site does not support outdoor mode
outdoor = false
elseif sysconfig.gluon_version then
-- don't enable the outdoor mode after an upgrade -- don't enable the outdoor mode after an upgrade
outdoor = false outdoor = false
elseif config == 'preset' then elseif config == 'preset' then

4
package/gluon-core/luasrc/usr/lib/lua/gluon/wireless.lua
View File

@ -126,4 +126,8 @@ function M.preserve_channels(uci)
return uci:get_first('gluon-core', 'wireless', 'preserve_channels') return uci:get_first('gluon-core', 'wireless', 'preserve_channels')
end end
function M.site_supports_outdoor_mode()
return site.wifi5.outdoor_chanlist() ~= nil
end
return M return M

2
package/gluon-web-wifi-config/luasrc/lib/gluon/config-mode/model/admin/wifi-config.lua
View File

@ -142,7 +142,7 @@ uci:foreach('wireless', 'wifi-device', function(config)
end) end)
if has_5ghz_radio() and not wireless.preserve_channels(uci) then if has_5ghz_radio() and not wireless.preserve_channels(uci) and wireless.site_supports_outdoor_mode() then
local r = f:section(Section, translate("Outdoor Installation"), translate( local r = f:section(Section, translate("Outdoor Installation"), translate(
"Configuring the node for outdoor use tunes the 5 GHz radio to a frequency " "Configuring the node for outdoor use tunes the 5 GHz radio to a frequency "
.. "and transmission power that conforms with the local regulatory requirements. " .. "and transmission power that conforms with the local regulatory requirements. "