Changeset 22

Timestamp:

2012-05-14 22:46:41 (13 years ago)

Author:

evanes

Message:

anemosensor has speed and speedav

Files:

• D_EZAnemoSensor.json (modified) (2 diffs)
• I_RFXCOM.xml (modified) (2 diffs)
• S_EZAnemoSensor.xml (modified) (1 diff)

D_EZAnemoSensor.json

@@ -97 +97 @@
                     "ControlType": "label",
                     "Label": {
-                        "lang_tag": "gust",
+                        "lang_tag": "speed",
                         "text": "Speed"
                     },
@@ -127 +127 @@
                     "ControlType": "label",
                     "Label": {
-                        "lang_tag": "gust_unit",
+                        "lang_tag": "speed_unit",
                         "text": "m/s"
                     },

I_RFXCOM.xml

@@ -780 +780 @@
       
       lsID = "ORE" .. string.format("%02X", string.byte(lsCommand, 4) )
-      lsCmd = string.format("direction=%3d;speed=%5.2f;speedav=%5.2f",liDataDir, lnDataSpeed, lnDataSpeedav)
+      lsCmd = string.format("direction=%.0f;speed=%.2f;speedav=%.2f",liDataDir, lnDataSpeed, lnDataSpeedav)
       lsRFXMSG = string.format("[OREGON: WIND3 Device: %s Direction: %3d Speed: %5.2f Speed av: %5.2f]", lsID, liDataDir, lnDataSpeed, lnDataSpeedav)
 
@@ -1502 +1502 @@
                         and v.id == fullId then
                     for lsKey,lsValue in string.gmatch(lsCmd, "(%w+)=([%w%.%-_]+)") do
-                        -- luup.log("Key=" ..  lsKey .. ";Value=" .. lsValue .. ";")
-                        if lsKey == "direction" then
-                            luup.log("SET DIRECTION from " .. lsID .. " with value " .. lsValue)
-                            luup.variable_set("urn:upnp-org:serviceId:EZAnemoSensor1", "Direction", lsValue, device)
-                        end
-                        if lsKey == "speed" then
-                            luup.log("SET SPEED from " .. lsID .. " with value " .. lsValue)
-                            luup.variable_set("urn:upnp-org:serviceId:EZAnemoSensor1", "Speed", lsValue, device)
-                        end
-                        if lsKey == "speedav" then
-                            luup.log("SET SPEEDAV from " .. lsID .. " with value " .. lsValue)
-                            luup.variable_set("urn:upnp-org:serviceId:EZAnemoSensor1", "SpeedAv", lsValue, device)
-                        end
-                        if lsKey == "battery" then
-                            luup.log("SET BATTERY from " .. lsID .. " with value " .. lsValue)
-                            luup.variable_set("urn:micasaverde-com:serviceId:HaDevice1", "BatteryLevel", lsValue, device)
-                        end
-                    end
+                        luup.log("Key=" ..  lsKey .. ";Value=" .. lsValue .. ";")
+                        if lsKey == "direction" then
+                            luup.log("SET DIRECTION from " .. lsID .. " with value " .. lsValue)
+                            luup.variable_set("urn:upnp-org:serviceId:EZAnemoSensor1", "Direction", lsValue, device)
+                        end
+                        if lsKey == "speed" then
+                            luup.log("SET SPEED from " .. lsID .. " with value " .. lsValue)
+                            luup.variable_set("urn:upnp-org:serviceId:EZAnemoSensor1", "Speed", lsValue, device)
+                        end
+                        if lsKey == "speedav" then
+                            luup.log("SET SPEEDAV from " .. lsID .. " with value " .. lsValue)
+                            luup.variable_set("urn:upnp-org:serviceId:EZAnemoSensor1", "SpeedAv", lsValue, device)
+                        end
+                        if lsKey == "battery" then
+                            luup.log("SET BATTERY from " .. lsID .. " with value " .. lsValue)
+                            luup.variable_set("urn:upnp-org:serviceId:EZAnemoSensor1", "Battery", lsValue, device)
+                        end
+                    end
                 end
             end

S_EZAnemoSensor.xml

@@ -25 +25 @@
        <name>SpeedAv</name>
        <dataType>string</dataType>
-       <shortCode>speedAv</shortCode>
+       <shortCode>speedav</shortCode>
     </stateVariable>