Changeset 13

Timestamp:

2011-11-25 23:36:09 (14 years ago)

Author:

bfromdruten

Message:

Bugfix: only set temperature or humidity when correct device type

File:

• I_RFXCOM.xml (modified) (4 diffs)

I_RFXCOM.xml

@@ -144 +144 @@
                     RFXCountTS2 = RFXCountTS2 + 1
                     RFXDevicesTS2[RFXCountTS2] = v.id
+                    luup.log("Registered device " .. RFXDevicesTS2[RFXCountTS2] .. " as temperature sensor ".. RFXCountTS2)
                 end
                 
@@ -150 +151 @@
                     RFXCountHS2 = RFXCountHS2 + 1
                     RFXDevicesHS2[RFXCountHS2] = v.id
+                    luup.log("Registered device " .. RFXDevicesHS2[RFXCountHS2] .. " as humidity sensor ".. RFXCountHS2)
                 end
             end
@@ -1136 +1138 @@
                 
                 -- Execution for temperature sensor
-                -- Set temperature to command temperature
-                if bitw.band(lnSensorType,RFXConstants.sensorTypeTemperature) ~= 0 then
+                -- Set temperature to command
+                if bitw.band(lnSensorType,RFXConstants.sensorTypeTemperature) ~= 0 and tostring(v.device_type) == "urn:schemas-micasaverde-com:device:TemperatureSensor:1" then
                     for lsKey,lsValue in string.gmatch(lsCmd, "(%w+)=([%w%.%-_]+)") do
                         luup.log("Key=" ..  lsKey .. ";Value=" .. lsValue .. ";")
                         if lsKey == "temperature" then
+                            luup.log("SET CURRENTTEMPERATURE from " .. lsID .. " with value " .. lsValue)
                             luup.variable_set("urn:upnp-org:serviceId:TemperatureSensor1", "CurrentTemperature",
                                 lsValue, device)
@@ -1148 +1151 @@
 
                 -- Execution for humidity sensor
-                -- Set temperature to command temperature
-                if bitw.band(lnSensorType,RFXConstants.sensorTypeHumidity) ~= 0 then
+                -- Set humidity to command 
+                if bitw.band(lnSensorType,RFXConstants.sensorTypeHumidity) ~= 0 and tostring(v.device_type) == "urn:schemas-micasaverde-com:device:HumiditySensor:1" then
                     for lsKey,lsValue in string.gmatch(lsCmd, "(%w+)=([%w%.%-_]+)") do
                         luup.log("Key=" ..  lsKey .. ";Value=" .. lsValue .. ";")
                         if lsKey == "humidity" then
+                            luup.log("SET CURRENTLEVEL from " .. lsID .. " with value " .. lsValue)
                             luup.variable_set("urn:micasaverde-com:serviceId:HumiditySensor1", "CurrentLevel",
                                 lsValue, device)