Skip to content

luci-app-ffwizard-falter: update to use option band instead of iwinfo #516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pmelange wants to merge 1 commit into
base: main
Choose a base branch
from
Open

luci-app-ffwizard-falter: update to use option band instead of iwinfo #516

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 7 additions & 44 deletions luci/luci-app-ffwizard-falter/luasrc/model/cbi/freifunk/assistent/wireless.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,20 +163,19 @@ function main.write(self, section, value)
tools.firewall_zone_add_interface("freifunk", calcnif(device))

--WIRELESS CONFIG device
local hwmode = calchwmode(device)
local deviceSection = (hwmode:find("a")) and "wifi_device_5" or "wifi_device"
local band = uci:get("wireless", device, "band")
local deviceSection = (band == "5g") and "wifi_device_5" or "wifi_device"
local defaultChannel = (band == "5g") and "36" or "13"
local devconfig = tools.getMergedConfig(mergeList, "defaults", deviceSection)
local devchannel = getchannel(device)
devconfig.channel = tostring(devchannel)
devconfig.hwmode = hwmode
devconfig.doth = calcdoth(devchannel)
devconfig.channel = uci:get(community, deviceSection, "channel") or defaultChannel
devconfig.doth = calcdoth(tonumber(devconfig.channel))
devconfig.htmode = "HT20"
devconfig.chanlist = calcchanlist(devchannel)
devconfig.chanlist = calcchanlist(tonumber(devconfig.channel))
uci:tset("wireless", device, devconfig)

--WIRELESS CONFIG mesh
local meshmode = wifi_tbl[device]["meshmode"]:formvalue(section)
local pre = calcpre(devchannel)
local pre = calcpre(tonumber(devconfig.channel))
local ifaceSection
if meshmode ~= "adhoc" then
ifaceSection = "wifi_iface_"..meshmode
Expand Down Expand Up @@ -358,42 +357,6 @@ function calcdoth(channel)
return (channel >= 52 and channel <= 140) and "1" or "0"
end

function get_iwinfo(device)
local iwinfo = require "iwinfo"
local backend = iwinfo.type(device)
return iwinfo[backend]
end

function calchwmode(device)
local hwmode = "11"
local iwinfo = get_iwinfo(device)

for k,v in pairs(iwinfo.hwmodelist(device)) do
if v then
hwmode = hwmode .. k
end
end

return hwmode
end

function getchannel(device)
local iwinfo = get_iwinfo(device)
local freqlist = iwinfo.freqlist(device)

local r_channel
if (freqlist[1].mhz > 2411 and freqlist[1].mhz < 2484) then
--this is 2.4 Ghz
r_channel = tonumber(uci:get(community, "wifi_device", "channel")) or 13
end
if (freqlist[1].mhz > 5179 and freqlist[1].mhz < 5701) then
--this is 5 Ghz
r_channel = tonumber(uci:get(community, "wifi_device_5", "channel")) or 36
end
tools.logger("channel for device "..device.." is "..tostring(r_channel))
return r_channel
end

function calcnif(device)
local nif
for i, v in ipairs(device_l) do
Expand Down
Loading