Add support for NanoFoo antenna settings

[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 b687133..fa3ad75 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -17,7 +17,12 @@ arg[1] = arg[1] or ""
 m = Map("wireless", translate("networks"), translate("a_w_networks1"))
 
 s = m:section(NamedSection, arg[1], "wifi-device", translate("device") .. " " .. arg[1])
---s.addremove = true
+s.addremove = false
+
+back = s:option(DummyValue, "_overview", translate("overview"))
+back.value = ""
+back.titleref = luci.dispatcher.build_url("admin", "network", "wireless")
+
 
 en = s:option(Flag, "disabled", translate("enable"))
 en.enabled = "0"
@@ -29,6 +34,8 @@ end
 
 s:option(DummyValue, "type", translate("type"))
 local hwtype = m:get(arg[1], "type")
+-- NanoFoo
+local nsantenna = m:get(arg[1], "antenna")
 
 ch = s:option(Value, "channel", translate("a_w_channel"))
 for i=1, 14 do
@@ -66,8 +73,17 @@ if hwtype == "atheros" then
        mode:value("fh", translate("wifi_fh"))
 
        s:option(Flag, "diversity", translate("wifi_diversity"))
-       s:option(Value, "txantenna", translate("wifi_txantenna")).optional = true
-       s:option(Value, "rxantenna", translate("wifi_rxantenna")).optional = true
+
+       if not nsantenna then
+               s:option(Value, "txantenna", translate("wifi_txantenna")).optional = true
+               s:option(Value, "rxantenna", translate("wifi_rxantenna")).optional = true
+       else -- NanoFoo
+               local ant = s:option(ListValue, "antenna", translate("wifi_txantenna"))
+               ant:value("auto")
+               ant:value("vertical")
+               ant:value("horizontal")
+               ant:value("external")
+       end
        s:option(Value, "distance", translate("wifi_distance"),
                translate("wifi_distance_desc")).optional = true
 
@@ -121,7 +137,7 @@ function network.write(self, section, value)
        if not m.uci:get("network", value) then
                -- avoid "value not defined in enum" because network is not known yet
                s.override_scheme = true
-               
+
                m:chain("network")
                m.uci:set("network", value, "interface")
                Value.write(self, section, value)
@@ -310,11 +326,11 @@ if hwtype == "atheros" or hwtype == "mac80211" then
        eaptype:depends({mode="sta", encryption="wpa"})
        eaptype:depends({mode="sta", encryption="wpa2i"})
 
-       cacert = s:option(Value, "ca_cert", translate("a_w_cacert"))
+       cacert = s:option(FileUpload, "ca_cert", translate("a_w_cacert"))
        cacert:depends({mode="sta", encryption="wpa"})
        cacert:depends({mode="sta", encryption="wpa2i"})
 
-       privkey = s:option(Value, "priv_key", translate("a_w_tlsprivkey"))
+       privkey = s:option(FileUpload, "priv_key", translate("a_w_tlsprivkey"))
        privkey:depends({mode="sta", eap_type="TLS", encryption="wpa2i"})
        privkey:depends({mode="sta", eap_type="TLS", encryption="wpa"})