X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fmodel%2Fcbi%2Fadmin_network%2Fwifi.lua;h=043c3284e298c2d4250d3bb3b42b1bddf16ed62b;hb=79c1f03c93391e66139f156dfd2a3df45d3ea3bc;hp=b687133ced654ba202772ea3471c8b8f689c788e;hpb=1c7cc8501c0b54cc7565d5c2be10dd595c92fac1;p=project%2Fluci.git

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 b687133ced..043c3284e2 100644
--- 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
 
@@ -88,8 +104,9 @@ if hwtype == "broadcom" then
 	ml:depends({macfilter="allow"})
 	ml:depends({macfilter="deny"})
 
-	s:option(Value, "txant", translate("wifi_txantenna")).optional = true
-	s:option(Value, "rxant", translate("wifi_rxantenna")).optional = true
+	s:option(Value, "txantenna", translate("wifi_txantenna")).optional = true
+	s:option(Value, "rxantenna", translate("wifi_rxantenna")).optional = true
+	s:option(Value, "txpower", translate("a_w_txpwr"), "dBm").optional = true
 
 	s:option(Flag, "frameburst", translate("wifi_bursting")).optional = true
 
@@ -121,7 +138,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)
@@ -148,7 +165,7 @@ if hwtype == "mac80211" then
 	mode:value("monitor", translate("a_w_monitor"))
 	bssid:depends({mode="adhoc"})
 
-	s:option(Value, "txpower", translate("a_w_txpwr"), "dbm").rmempty = true
+	s:option(Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
 	s:option(Value, "frag", translate("wifi_frag")).optional = true
 	s:option(Value, "rts", translate("wifi_rts")).optional = true
 end
@@ -173,7 +190,7 @@ if hwtype == "atheros" then
 	wdssep.optional = true
 
 	s:option(Flag, "doth", "802.11h").optional = true
-	s:option(Value, "txpower", translate("a_w_txpwr"), "dbm").rmempty = true
+	s:option(Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
 	hidden = s:option(Flag, "hidden", translate("wifi_hidden"))
 	hidden:depends({mode="ap"})
 	hidden:depends({mode="adhoc"})
@@ -209,6 +226,14 @@ if hwtype == "atheros" then
 	s:option(Flag, "wmm", translate("wifi_wmm")).optional = true
 	s:option(Flag, "xr", translate("wifi_xr")).optional = true
 	s:option(Flag, "ar", translate("wifi_ar")).optional = true
+
+	local swm = s:option(Flag, "sw_merge", translate("wifi_nosbeacon"))
+	swm:depends({mode="adhoc"})
+	swm.optional = true
+
+	local nos = s:option(Flag, "nosbeacon", translate("wifi_nosbeacon"))
+	nos:depends({mode="sta"})
+	nos.optional = true
 end
 
 
@@ -310,11 +335,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"})