Changeset c9395f4

Timestamp:

2014-07-24 20:35:53 (11 years ago)

Author:

purdueguy <purdueguy@…>

Branches:

master

Children:

2d69e31

Parents:

56b5988

git-author:

purdueguy <purdueguy@…> (2014-07-24 20:35:53)

git-committer:

purdueguy <purdueguy@…> (2014-07-24 20:35:53)

Message:

Added Insteon motion sensor support

File:

• Main/L_ISYController1.lua (modified) (15 diffs)

Main/L_ISYController1.lua ¶

@@ -168 +168 @@
         ['8'] = true
     },
+    motionSensor = {
+        ['33'] = true
+    },
 }
 
@@ -917 +920 @@
         end
 
+    -- Motion Sensor
+    elseif (zwaveDeviceCategory4.motionSensor[subCat]) then
+        debugLog("MotionSensor: node " .. node .. " action: " .. action)
+        local deviceId = getChild(nodeParent)
+        local result = nil
+         
+        -- We only care about status changes
+        if (command == "ST") then  
+            -- secure (not tripped)
+            if (action == "0") then
+                result = setIfChanged(SENSOR_SERVICEID, 'Tripped', 0, deviceId)
+          
+            -- tripped
+            else
+                result = setIfChanged(SENSOR_SERVICEID, 'Tripped', 1, deviceId)
+          
+            end
+            
+            if (result) then
+                setIfChanged(HADEVICE_SID, 'LastUpdate', time, deviceId)
+            end
+        end
+          
     -- Thermostat
     elseif (zwaveDeviceCategory4.thermostat[subCat]) then
-        debugLog("Z-Wave Thermostat: node " .. node .. " action: " .. action)
+        debugLog("Z-Wave Thermostat: node " .. node .. " action: " .. action .. " command: " .. command)
         local deviceId = getChild(nodeParent)
         
@@ -927 +953 @@
           -- current temperature --
           result = setIfChanged(TEMPSENSOR_SID, 'CurrentTemperature', action, deviceId)
+
+        elseif (command == "DON") then
+          -- Normal mode --
+          result = setIfChanged(HVAC_MODE_SID, "EnergyModeStatus", "Normal", deviceId)
+
+        elseif (command == "DOF") then
+          -- ESM --
+          result = setIfChanged(HVAC_MODE_SID, "EnergyModeStatus", "EnergySavingsMode", deviceId)
 
         elseif (command == "CLISPH") then
@@ -1102 +1136 @@
                     -- RemoteLinc
                     if (insteonDeviceCategory0.remoteLinc[subCat]) then
-                        debugLog("Updating RemoteLinc name for: node " .. node)
+                        debugLog("Updating RemoteLinc name for: node " .. node .. " to: " .. name .. " for deviceid: " .. insteonToChildMap[insteonId])
                         
                         -- Scene Controller
@@ -1113 +1147 @@
                     -- KeypadLinc Dimmer
                     if (insteonDeviceCategory1.dimmerKPL[subCat]) then
-                        debugLog("Updating KeypadLinc Dimmer name for: node " .. node)
+                        debugLog("Updating KeypadLinc Dimmer name for: node " .. node .. " to: " .. name .. " for deviceid: " .. insteonToChildMap[parent])
                         
                         -- Dimmable light
@@ -1123 +1157 @@
                     -- FanLinc
                     elseif (insteonDeviceCategory1.fanLinc[subCat]) then
-                        debugLog("Updating FanLinc name for: node " .. node)
+                        debugLog("Updating FanLinc name for: node " .. node .. " to: " .. name .. " for deviceid: " .. insteonToChildMap[parent])
                         
                         -- Dimmable light
@@ -1133 +1167 @@
                     -- Dimmer
                     elseif (insteonDeviceCategory1.dimmer[subCat]) then
-                        debugLog("Updating Dimmer name for: node " .. node)
+                        debugLog("Updating Dimmer name for: node " .. node .. " to: " .. name .. " for deviceid: " .. insteonToChildMap[parent])
                         
                         luup.attr_set("name", string.format("%s", name), insteonToChildMap[parent])
@@ -1144 +1178 @@
                     -- KeypadLinc Relay
                     if (insteonDeviceCategory2.relayKPL[subCat]) then
-                        debugLog("Updating KeypadLinc Relay name for: node " .. node)
+                        debugLog("Updating KeypadLinc Relay name for: node " .. node .. " to: " .. name .. " for deviceid: " .. insteonToChildMap[parent])
                         
                         -- Binary light
@@ -1154 +1188 @@
                     -- Relay / Switch
                     elseif (insteonDeviceCategory2.relay[subCat]) then
-                        debugLog("Updating Relay name for: node " .. node)
+                        debugLog("Updating Relay name for: node " .. node .. " to: " .. name .. " for deviceid: " .. insteonToChildMap[parent])
                         
                         luup.attr_set("name", string.format("%s", name), insteonToChildMap[parent])
@@ -1164 +1198 @@
                     -- IOLinc
                     if (insteonDeviceCategory7.iolinc[subCat]) then
-                        debugLog("Updating IOLinc name for: node " .. node)
+                        debugLog("Updating IOLinc name for: node " .. node .. " to: " .. name .. " for deviceid: " .. insteonToChildMap[parent])
                         
                         -- Security Sensor
-                        luup.attr_set("name", string.format("%s", name), insteonToChildMap[parent])
+                        --luup.attr_set("name", string.format("%s", name), insteonToChildMap[parent])
                               
                         -- Relay
-                        luup.attr_set("name", string.format("%s", name), insteonToChildMap[insteonId] .. " 2")
+                        --luup.attr_set("name", string.format("%s", name), insteonToChildMap[insteonId] .. " 2")
                     end             
                    
@@ -1178 +1212 @@
                     -- Motion Sensor
                     if (insteonDeviceCategory16.motionSensor[subCat]) then
-                        debugLog("Updating Motion Sensor name for: node " .. node)
+                        debugLog("Updating Motion Sensor name for: node " .. node .. " to: " .. name .. " for deviceid: " .. insteonToChildMap[parent])
                         
                         luup.attr_set("name", string.format("%s", name), insteonToChildMap[parent])
@@ -1191 +1225 @@
                     -- Relay
                     if (zwaveDeviceCategory4.relay[subCat]) then
-                        debugLog("Updating Z-Wave Relay name for: node " .. node)
+                        debugLog("Updating Z-Wave Relay name for: node " .. node .. " to: " .. name .. " for deviceid: " .. insteonToChildMap[parent])
                         
                         -- Binary light
@@ -1198 +1232 @@
                     -- Dimmer
                     elseif (zwaveDeviceCategory4.dimmer[subCat]) then
-                        debugLog("Updating Z-Wave dimmer name for: node " .. node)
+                        debugLog("Updating Z-Wave dimmer name for: node " .. node .. " to: " .. name .. " for deviceid: " .. insteonToChildMap[parent])
                         
                         luup.attr_set("name", string.format("%s", name), insteonToChildMap[parent])
@@ -1204 +1238 @@
                     -- Lock
                     elseif (zwaveDeviceCategory4.lock[subCat]) then
-                        debugLog("Updating Z-Wave lock name for: node " .. node)
+                        debugLog("Updating Z-Wave lock name for: node " .. node .. " to: " .. name .. " for deviceid: " .. insteonToChildMap[parent])
                         
                         luup.attr_set("name", string.format("%s", name), insteonToChildMap[parent])
+
+                    -- Thermostat
+                    elseif (zwaveDeviceCategory4.thermostat[subCat]) then
+                        debugLog("Updating Z-Wave thermostat name for: node " .. node .. " to: " .. name .. " for deviceid: " .. insteonToChildMap[parent])
+                        
+                        luup.attr_set("name", string.format("%s", name), insteonToChildMap[parent])
+
+                    -- Motion Sensor
+                    elseif (zwaveDeviceCategory4.motionSensor[subCat]) then
+                        debugLog("Updating Z-Wave motionSensor name for: node " .. node .. " to: " .. name .. " for deviceid: " .. insteonToChildMap[parent])
+                        
+                        luup.attr_set("name", string.format("%s", name), insteonToChildMap[parent])
+
                     end
                 end
@@ -1625 +1672 @@
                             "urn:schemas-upnp-org:device:HVAC_ZoneThermostat:1", "D_HVAC_ZoneThermostat1.xml",
                             "", "urn:upnp-org:serviceId:TemperatureSensor1,CurrentTemperature="..newStatus, false)
+
+                    -- Motion Sensor
+                    elseif (zwaveDeviceCategory4.motionSensor[subCat]) then
+
+                          local newStatus
+                        
+                        debugLog("Creating Z-Wave motion sensor for: node " .. node)
+                        
+                        -- tripped
+                        if (status ~= nil and status ~= " " and tonumber(status) == 1) then
+                            newStatus = 1
+                        
+                        -- secure (not tripped)
+                        else
+                            newStatus = 0
+                        end
+                        
+                        luup.chdev.append(device, children,
+                            string.format("%s", parent), string.format("%s", name),
+                            "urn:schemas-micasaverde-com:device:MotionSensor:1", "D_MotionSensor1.xml",
+                            "", "urn:micasaverde-com:serviceId:SecuritySensor1,Tripped=" .. newStatus ..  
+                            "\n" .. "urn:micasaverde-com:serviceId:SecuritySensor1,Armed=0" ..
+                            "\nurn:garrettwp-com:serviceId:ISYController1,Family=4", false)
                     end
                 end