Changeset 220

Timestamp:

2014-11-13 00:25:18 (10 years ago)

Author:

amg0

Message:

 

File:

• trunk/ipx800/L_IPX800.lua (modified) (6 diffs)

trunk/ipx800/L_IPX800.lua ¶

@@ -209 +209 @@
 
 function updateDevice(lul_device, xmldata)
+    lul_device = tonumber(lul_device)
     log(string.format("updateDevice(%d)",lul_device))
 
@@ -225 +226 @@
         luup.variable_set(service, "Present", "1", lul_device)
         luup.variable_set(service, "IconCode", "100", lul_device)
-    end
+        return lomtab
+    end
+    return nil
+end
+
+function updateChildrenDevice(lul_device, lomtab)
+    lul_device = tonumber(lul_device)
+    log(string.format("updateChildrenDevice(%d)",lul_device))
+    
+    -- for all children device, iterate
+    local param = {}
+    for k,v in pairs(luup.devices) do
+        if( getParent(k)==lul_device) then
+            -- find the altid
+            local name = v.id
+            debug(string.format("device altid=%s",name))
+            -- find the xml node with the same name
+            -- read the value 
+            local led = xpath.selectNodes(lomtab,"/response/"..name.."/text()")
+            debug(string.format("xml %s value=%s",name, led[1]))
+            -- set the power value
+            setPowerTarget(k,led[1])
+        end
+    end
+
 end
 
@@ -306 +331 @@
         
     local xmldata = getGlobalStatus(lul_device,ipxIpAddress,user,password)
-    updateDevice(lul_device, xmldata)
-    
+    local lomtab = updateDevice(lul_device, xmldata)
+    if (lomtab~=nil) then
+        updateChildrenDevice(lul_device, lomtab)
+    end
     -- repeat every x seconds
     if (updateFrequencySec>0) and (norepeat~=true) then 
@@ -320 +347 @@
 function createChildDevices(lul_device)
     lul_device = tonumber(lul_device)
-
+    log("createChildDevices, called on behalf of device:"..lul_device)
+    local outputRelays = getSetVariable(service,"OutputRelays", lul_device, "") or ""
+    
     -- for now , just test with one device
     local child_devices = luup.chdev.start(lul_device);
-    luup.chdev.append(
-        lul_device, child_devices, 
-        "led0", "IPX Out 0", 
-        "urn:schemas-upnp-org:device:BinaryLight:1","D_BinaryLight1.xml", 
-        "", "", 
-        true        -- embedded
-        )
+    
+    for k,v in pairs(outputRelays:split(",")) do
+        local i = tonumber(v)
+        if (i>=1) and (i<=32) then
+            debug(string.format("Creating device for output relay:%d",i))
+            luup.chdev.append(
+                lul_device, child_devices, 
+                "led"..(i-1), "IPX800 Out "..i, 
+                "urn:schemas-upnp-org:device:BinaryLight:1","D_BinaryLight1.xml", 
+                "", "", 
+                true        -- embedded
+                )
+        end
+    end
+    
     luup.chdev.sync(lul_device, child_devices)
 end
@@ -346 +383 @@
     local password= getSetVariable(service,"Password", lul_device, "")
     local updateFrequencySec= getSetVariable(service,"UpdateFrequency", lul_device, 60)
+    local outputRelays= getSetVariable(service,"OutputRelays", lul_device, "")
 
     if (debugmode=="1") then
@@ -370 +408 @@
     end
     
+    createChildDevices(lul_device)
+    
     -- start refreshes , with repeat
     refreshDevice(lul_device,false)
     
-    createChildDevices(lul_device)
 end