Changeset 4207

Timestamp:

01/31/09 17:27:24 (4 years ago)

Author:

jow

Message:

modules/admin-full: move txpower control to wifi-device
modules/admin-core: extend wireless schema to cover txpower changes

Location:

luci/trunk/modules

Files:

• admin-core/root/lib/uci/schema/default/wireless (modified) (2 diffs)
• admin-full/luasrc/model/cbi/admin_network/wifi.lua (modified) (4 diffs)

luci/trunk/modules/admin-core/root/lib/uci/schema/default/wireless

@@ -82 +82 @@
 
 config variable
+    option name 'txpower'
+    option section 'wireless.wifi-device'
+    option title 'Transmit Power'
+    option description 'dbm'
+    option datatype uint
+
+config variable
     option name 'txantenna'
     option section 'wireless.wifi-device'
@@ -217 +224 @@
     option name 'bssid'
     option section 'wireless.wifi-iface'
-    option title BSSID
+    option title 'BSSID'
 
 config variable

luci/trunk/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua

@@ -53 +53 @@
 ch:value(155, 155 .. " (5 GHz)")
 ch:value(167, 167 .. " (5 GHz)")
+
+s:option(Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
+
 
 ------------------- MAC80211 Device ------------------
@@ -167 +170 @@
     bssid:depends({mode="adhoc"})
 
-    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
@@ -192 +194 @@
 
     s:option(Flag, "doth", "802.11h").optional = true
-    s:option(Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
     hidden = s:option(Flag, "hidden", translate("wifi_hidden"))
     hidden:depends({mode="ap"})
@@ -249 +250 @@
     mode:value("wds", translate("a_w_wds"))
     mode:value("monitor", translate("a_w_monitor"))
-
-    s:option(Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
 
     hidden = s:option(Flag, "hidden", translate("wifi_hidden"))