modules/admin-full: only show antenna selection if diversity is off, use radio button...

[project/luci.git] / modules / admin-full / luasrc / model / cbi / admin_network / wifi.lua

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
index 5a5824c..f602759 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -19,6 +19,18 @@ arg[1] = arg[1] or ""
 
 m = Map("wireless", translate("networks"), translate("a_w_networks1"))
 
+
+local iw = nil
+local tx_powers = nil
+
+m.uci:foreach("wireless", "wifi-iface",
+       function(s)
+               if s.device == arg[1] and s.ifname and not iw then
+                       iw = luci.sys.wifi.getiwinfo(s.ifname)
+                       tx_powers = iw.txpwrlist or { }
+               end
+       end)
+
 s = m:section(NamedSection, arg[1], "wifi-device", translate("device") .. " " .. arg[1])
 s.addremove = false
 
@@ -57,14 +69,28 @@ end
 ------------------- MAC80211 Device ------------------
 
 if hwtype == "mac80211" then
-       s:taboption("general", Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
+       tp = s:taboption("general",
+               (#tx_powers > 0) and ListValue or Value,
+               "txpower", translate("a_w_txpwr"), "dBm")
+
+       tp.rmempty = true
+       for _, p in ipairs(iw.txpwrlist) do
+               tp:value(p.dbm, "%i dBm (%i mW)" %{ p.dbm, p.mw })
+       end
 end
 
 
 ------------------- Madwifi Device ------------------
 
 if hwtype == "atheros" then
-       s:taboption("general", Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
+       tp = s:taboption("general",
+               (#tx_powers > 0) and ListValue or Value,
+               "txpower", translate("a_w_txpwr"), "dBm")
+
+       tp.rmempty = true
+       for _, p in ipairs(iw.txpwrlist) do
+               tp:value(p.dbm, "%i dBm (%i mW)" %{ p.dbm, p.mw })
+       end
 
        mode = s:taboption("advanced", ListValue, "hwmode", translate("mode"))
        mode:value("", translate("wifi_auto"))
@@ -79,8 +105,20 @@ if hwtype == "atheros" then
        s:taboption("advanced", Flag, "diversity", translate("wifi_diversity")).rmempty = false
 
        if not nsantenna then
-               s:taboption("advanced", Value, "txantenna", translate("wifi_txantenna"))
-               s:taboption("advanced", Value, "rxantenna", translate("wifi_rxantenna"))
+               ant1 = s:taboption("advanced", ListValue, "txantenna", translate("wifi_txantenna"))
+               ant1.widget = "radio"
+               ant1:depends("diversity", "")
+               ant1:value("0", translate("wifi_auto"))
+               ant1:value("1", translate("wifi_ant1", "Antenna 1"))
+               ant1:value("2", translate("wifi_ant2", "Antenna 2"))
+
+               ant2 = s:taboption("advanced", ListValue, "rxantenna", translate("wifi_rxantenna"))
+               ant2.widget = "radio"
+               ant2:depends("diversity", "")
+               ant2:value("0", translate("wifi_auto"))
+               ant2:value("1", translate("wifi_ant1", "Antenna 1"))
+               ant2:value("2", translate("wifi_ant2", "Antenna 2"))
+
        else -- NanoFoo
                local ant = s:taboption("advanced", ListValue, "antenna", translate("wifi_txantenna"))
                ant:value("auto")
@@ -88,6 +126,7 @@ if hwtype == "atheros" then
                ant:value("horizontal")
                ant:value("external")
        end
+
        s:taboption("advanced", Value, "distance", translate("wifi_distance"),
                translate("wifi_distance_desc"))
        s:taboption("advanced", Value, "regdomain", translate("wifi_regdomain"))
@@ -102,18 +141,36 @@ end
 ------------------- Broadcom Device ------------------
 
 if hwtype == "broadcom" then
-       s:taboption("advanced", Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
+       tp = s:taboption("general",
+               (#tx_powers > 0) and ListValue or Value,
+               "txpower", translate("a_w_txpwr"), "dBm")
+
+       tp.rmempty = true
+       for _, p in ipairs(iw.txpwrlist) do
+               tp:value(p.dbm, "%i dBm (%i mW)" %{ p.dbm, p.mw })
+       end     
 
        mp = s:taboption("macfilter", ListValue, "macfilter", translate("wifi_macpolicy"))
-       mp:value("")
+       mp:value("", translate("disable"))
        mp:value("allow", translate("wifi_whitelist"))
        mp:value("deny", translate("wifi_blacklist"))
        ml = s:taboption("macfilter", DynamicList, "maclist", translate("wifi_maclist"))
        ml:depends({macfilter="allow"})
        ml:depends({macfilter="deny"})
 
-       s:taboption("advanced", Value, "txantenna", translate("wifi_txantenna"))
-       s:taboption("advanced", Value, "rxantenna", translate("wifi_rxantenna"))
+       ant1 = s:taboption("advanced", ListValue, "txantenna", translate("wifi_txantenna"))
+       ant1.widget = "radio"
+       ant1:depends("diversity", "")
+       ant1:value("3", translate("wifi_auto"))
+       ant1:value("0", translate("wifi_ant1", "Antenna 1"))
+       ant1:value("1", translate("wifi_ant2", "Antenna 2"))
+
+       ant2 = s:taboption("advanced", ListValue, "rxantenna", translate("wifi_rxantenna"))
+       ant2.widget = "radio"
+       ant2:depends("diversity", "")
+       ant2:value("3", translate("wifi_auto"))
+       ant2:value("0", translate("wifi_ant1", "Antenna 1"))
+       ant2:value("1", translate("wifi_ant2", "Antenna 2"))
 
        s:taboption("advanced", Flag, "frameburst", translate("wifi_bursting"))
 
@@ -152,6 +209,14 @@ s:tab("advanced", translate("a_w_advanced", "Advanced Settings"))
 
 s:taboption("general", Value, "ssid", translate("wifi_essid"))
 
+mode = s:taboption("general", ListValue, "mode", translate("mode"))
+mode.override_values = true
+mode:value("ap", translate("a_w_ap"))
+mode:value("sta", translate("a_w_client"))
+mode:value("adhoc", translate("a_w_adhoc"))
+
+bssid = s:taboption("general", Value, "bssid", translate("wifi_bssid"))
+
 network = s:taboption("general", Value, "network", translate("network"), translate("a_w_network1"))
 network.rmempty = true
 network:value("")
@@ -174,15 +239,6 @@ function network.write(self, section, value)
 end
 
 
-mode = s:taboption("general", ListValue, "mode", translate("mode"))
-mode.override_values = true
-mode:value("ap", translate("a_w_ap"))
-mode:value("sta", translate("a_w_client"))
-mode:value("adhoc", translate("a_w_adhoc"))
-
-bssid = s:taboption("general", Value, "bssid", translate("wifi_bssid"))
-
-
 -------------------- MAC80211 Interface ----------------------
 
 if hwtype == "mac80211" then
@@ -252,7 +308,7 @@ if hwtype == "atheros" then
        s:taboption("advanced", Flag, "bgscan", translate("wifi_bgscan"))
 
        mp = s:taboption("macfilter", ListValue, "macpolicy", translate("wifi_macpolicy"))
-       mp:value("")
+       mp:value("", translate("disable"))
        mp:value("deny", translate("wifi_whitelist"))
        mp:value("allow", translate("wifi_blacklist"))
        ml = s:taboption("macfilter", DynamicList, "maclist", translate("wifi_maclist"))
@@ -322,7 +378,7 @@ if hwtype == "prism2" then
        bssid:depends({mode="sta"})
 
        mp = s:taboption("macfilter", ListValue, "macpolicy", translate("wifi_macpolicy"))
-       mp:value("")
+       mp:value("", translate("disable"))
        mp:value("deny", translate("wifi_whitelist"))
        mp:value("allow", translate("wifi_blacklist"))
        ml = s:taboption("macfilter", DynamicList, "maclist", translate("wifi_maclist"))