Changeset 47

Timestamp:

2014-04-16 18:18:01 (11 years ago)

Author:

andrei

Message:

• add lastTripped variable for all occupancy sensors;
• add enoceanUIswitch variable in order to update plugin generated switches;

Location:

trunk

Files:

• I_EnOceanGateway1.xml (modified) (1 diff)
• L_EnOceanGateway1.lua (modified) (9 diffs)

trunk/I_EnOceanGateway1.xml ¶

@@ -17 +17 @@
             TeachIn = enoceanPlugin.TeachIn
             CheckTime = enoceanPlugin.CheckTime
+            updateSwitch = enoceanPlugin.updateSwitch
             return enoceanPlugin.Init( lul_device )
         end

trunk/L_EnOceanGateway1.lua ¶

@@ -275 +275 @@
 }
 local resetTime = -1 --900 -- 15 minutes -- for testing : 20 
+local g_switces = {}
 ------------------------------------------------------------------------------------------------------------------------
 -- Generic utilities
@@ -310 +311 @@
 end
 
+function updateSwitch(device,service,var,old,new)
+    local id
+    for key,val in pairs(g_switces) do
+        if g_switces[key].switchID == tonumber(device) then
+            id = g_switces[key].enoceanUIswitch 
+        end
+    end
+    --luup.call_action(SID.SW_POWER,"SetTarget",{newTargetValue = tostring(new)},id)
+    luup.variable_set( SID.SW_POWER, "Target", new, id )
+    luup.variable_set( SID.SW_POWER, "Status", new, id )
+    debug( "(EnOceanPlugin::updateSwitch) : Switch " .. tostring(id) .. " has been set to " .. tostring(new))
+end
 
 local function PadLeft (s, length, c)
@@ -328 +341 @@
 
 -- Check if a table contains the given item.
--- Returns true and the key/index of the item if found,
+-- Returns true and the key / index of the item if found,
 -- or false if not found.
 local function TableContains (t, item)
@@ -415 +428 @@
 
 function CheckTime(child)
-    local last = luup.variable_get(SID.ENOCEAN, "LastTriped", g_parentDevice) or "0"
+    child = tonumber(child, 10)
+    local last = luup.variable_get(SID.SECURITY, "LastTriped", child) or "0"
     local nowt = os.time()
     last = tonumber(last, 10)
-    child = tonumber(child, 10)
-    --log(  "(EnOceanPlugin::1BS) Child id : ".. child .. " and TIME = " .. nowt)
+    --debug(  "(EnOceanPlugin::1BS) Child id : ".. child .. " and TIME = " .. nowt)
     if (nowt - last) > resetTime then
-        luup.variable_set( SID.SECURITY, "Tripped", "0", child )
+        local lastState = luup.variable_get( SID.SECURITY, "Tripped", child ) or "0"
+        if lastState == "0" then
+            -- do nothing
+        else
+            luup.variable_set( SID.SECURITY, "Tripped", "0", child )    
+        end
         --luup.variable_set(SID.ENOCEAN, "LastTriped", nowt, g_parentDevice) fixing un tripped issue
     end 
@@ -845 +863 @@
                 luup.variable_set( SID.SECURITY, "Tripped", tonumber(tripped), g_childDevices[altid] )
                 local timeNow = os.time()
-                luup.variable_set( SID.ENOCEAN, "LastTriped", timeNow, g_parentDevice )
+                luup.variable_set( SID.SECURITY, "LastTriped", timeNow, g_childDevices[altid] )
             end
         --------------------------------------------------------------------------------------------
@@ -1655 +1673 @@
 end
 
-
+local function setWatch()
+    local enoceanUIswitch
+    local count = 1
+    for key,val in pairs(luup.devices) do
+        if val.category_num == 3 then
+            if val.device_num_parent ~= g_parentDevice then
+                enoceanUIswitch = luup.variable_get( SID.SW_POWER, "enoceanUIswitch", key ) or ""
+                if enoceanUIswitch == "" then  
+                        luup.variable_set( SID.SW_POWER, "enoceanUIswitch", "0", key )
+                        debug( "(EnOceanPlugin::setWatch) Setting enoceanUIswitch to 0 for device " .. key )        
+                else
+                    if enoceanUIswitch == "0" then
+                        debug( "(EnOceanPlugin::setWatch)  'enoceanUIswitch' is 0 for device " .. key .. ", nothing to do!" )
+                    else
+                        g_switces[count] = {}
+                        g_switces[count].switchID = key
+                        g_switces[count].enoceanUIswitch = tonumber(enoceanUIswitch)
+                        count = count + 1
+                        luup.variable_watch("updateSwitch",SID.SW_POWER,"Status",key)
+                        debug("(EnOceanPlugin::setWatch) : luup_watch has been set for device = " .. key)
+                    end
+                end
+            end
+        end
+    end
+end
 ------------------------------------------------------------------------------------------------------------------------
 -- Init
@@ -1679 +1722 @@
     if F_DEBUG_MODE then
         debug = log
+    end
+    
+    if debugMode then 
+        log( "(EnOceanPlugin::Init) : DebugMode is enabled" )
+    else
+        log( "(EnOceanPlugin::Init) : DebugMode is disabled" )
     end
     
@@ -1705 +1754 @@
         if v.device_num_parent == g_parentDevice and v.category_num == 4 and v.subcategory_num == 3 then
             local timeNow = os.time()
-            luup.variable_set( SID.ENOCEAN, "LastTriped", timeNow, k )
+            luup.variable_set( SID.SECURITY, "LastTriped", timeNow, k )
             CheckTime(k)
         end
@@ -1719 +1768 @@
         end
     end
-
-    debug( "(EnOceanPlugin::Init) Success: startup successful" )
+    setWatch()
+    log( "(EnOceanPlugin::Init) Success: startup successful" )
     return true, "startup successful", "EnOcean plugin"
 end