Changeset 7003

Timestamp:

04/25/11 20:54:32 (2 years ago)

Author:

jow

Message:

modules/admin-full: implement "dev" option for USB device led triggers (#224)

Files:

• luci/trunk/modules/admin-full/luasrc/model/cbi/admin_system/leds.lua (modified) (4 diffs)

luci/trunk/modules/admin-full/luasrc/model/cbi/admin_system/leds.lua

@@ -47 +47 @@
 end
 
-s:option(Flag, "default", translate("Default state")).rmempty = false
+s:option(Flag, "default", translate("Default state")).rmempty = true
 
 
@@ -55 +55 @@
 for t in triggers:gmatch("[%w-]+") do
     trigger:value(t, translate(t:gsub("-", "")))
-end
+end 
 
 
@@ -65 +65 @@
 
 
-dev = s:option(ListValue, "dev", translate("Device"))
+dev = s:option(ListValue, "_net_dev", translate("Device"))
 dev.rmempty = true
 dev:value("")
 dev:depends("trigger", "netdev")
+
+function dev.cfgvalue(self, section)
+    return m.uci:get("system", section, "dev")
+end
+
+function dev.write(self, section, value)
+    m.uci:set("system", section, "dev", value)
+end
+
+function dev.remove(self, section)
+    local t = trigger:formvalue(section)
+    if t ~= "netdev" and t ~= "usbdev" then
+        m.uci:delete("system", section, "dev")
+    end
+end
+
 for k, v in pairs(luci.sys.net.devices()) do
     if v ~= "lo" then
@@ -83 +99 @@
 mode:value("rx", translate("Receive"))
 
+
+usbdev = s:option(ListValue, "_usb_dev", translate("USB Device"))
+usbdev:depends("trigger", "usbdev")
+usbdev.rmempty = true
+usbdev:value("")
+
+function usbdev.cfgvalue(self, section)
+    return m.uci:get("system", section, "dev")
+end
+
+function usbdev.write(self, section, value)
+    m.uci:set("system", section, "dev", value)
+end
+
+function usbdev.remove(self, section)
+    local t = trigger:formvalue(section)
+    if t ~= "netdev" and t ~= "usbdev" then
+        m.uci:delete("system", section, "dev")
+    end
+end
+
+for p in nixio.fs.glob("/sys/bus/usb/devices/[0-9]*/manufacturer") do
+    local id = p:match("%d+-%d+")
+    local mf = nixio.fs.readfile("/sys/bus/usb/devices/" .. id .. "/manufacturer")
+    local pr = nixio.fs.readfile("/sys/bus/usb/devices/" .. id .. "/product")
+    usbdev:value(id, "%s (%s - %s)" %{ id, mf, pr })
+end
+
 return m