Changeset 41

Timestamp:

2012-07-25 00:02:14 (13 years ago)

Author:

evanes

Message:

OWL Energymeter by DjMomo? corrections by Evert

Files:

• I_RFXCOM.xml (modified) (14 diffs)
• S_EnergyMeter1.xml (modified) (1 diff)

I_RFXCOM.xml

@@ -34 +34 @@
     sensorTypeBarometer = 2048,
     sensorTypeRain = 4096,
--- Start of addition -- 
     sensorTypePowerMeter = 8192,
     sensorTypeEnergyMeter = 16384,
--- End of addition --
     
     sensorManufacturerX10 = "X10",
@@ -81 +79 @@
     RFXCOM_HAR_Count = 0
     RFXCOM_HAR_Devices = {}
--- Start of addition -- 
     RFXCountEM  = 0
     RFXDevicesEM = {}
--- End of addition --
     
     THIS_DEVICE = lul_device
@@ -193 +189 @@
         end
 
--- Start of addition --
         -- Check on electric meter devices 
         if (tostring(v.device_type) == "urn:schemas-micasaverde-com:device:EnergyMeter:1") then
@@ -200 +195 @@
           luup.log("Registered device " .. RFXDevicesEM[RFXCountEM] .. " as Energy Meter sensor ".. RFXCountEM)
         end
--- End of addition --
       end
     end
@@ -214 +208 @@
     luup.log("       rain sensors: " .. RFXCountRS2)
     luup.log("      anemo sensors: " .. RFXCountAS2)
--- Start of addition --
     luup.log("     energy sensors: " .. RFXCountEM)
--- End of addition
       
     luup.log("Open socket for read " .. ipAddress .. " port " .. ipPortRead )
@@ -591 +583 @@
     local lsCommand = string.sub( psCommand, 2)
     local lsSensorManufacturer = RFXConstants.sensorManufacturerOWL
--- Start of deletion --    
---  local lnSensorType = RFXConstants.sensorTypeController
--- End of deletion
--- Start of addition --    
     local lnSensorType = RFXConstants.sensorTypeEnergyMeter
--- End of addition
+
     local lsID = ""
     local lsCmd = ""
@@ -1377 +1365 @@
       end
 
--- Start of addition --
       ------------------------------------------------------------------------------------
       -- Next with Energy Meter devices
@@ -1385 +1372 @@
         "urn:schemas-micasaverde-com:device:EnergyMeter:1", "D_EnergyMeter1.xml","","",false)
       end
--- End of addition --
 
       ------------------------------------------------------------------------------------      
@@ -1490 +1476 @@
       end
 
--- Start of addition --
       ------------------------------------------------------------------------------------
       -- Add Energy Meter sensor
@@ -1500 +1485 @@
         RFXDevicesEM[RFXCountEM] = "EM/" .. lsID
       end
--- End of addition --
-     
       
       luup.log("Tree buildup with number child devices:")
@@ -1514 +1497 @@
       luup.log("       rain sensors: " .. RFXCountRS2)
       luup.log("      Anemo sensors: " .. RFXCountAS2)
--- Start of addition --
       luup.log("     energy sensors: " .. RFXCountEM)
--- End of addition --
       
       -- Synch the new tree with the old three
@@ -1705 +1686 @@
             end
         end
--- Start of addition --
         fullId = "EM/" .. lsID
         if bitw.band(lnSensorType,RFXConstants.sensorTypeEnergyMeter) ~= 0
@@ -1717 +1697 @@
               end
               if lsKey == "currentpower" then
-                luup.log("SET CURRENT POWER from " .. lsID .. " with value " .. lsValue)
+                luup.log("SET CURRENTPOWER from " .. lsID .. " with value " .. lsValue)
                 luup.variable_set("urn:upnp-org:serviceId:EnergyMeter1", "CurrentPower", lsValue, device)
               end
               if lsKey == "totalenergy" then
-                luup.log("SET TOTAL ENERGY from " .. lsID .. " with value " .. lsValue)
+                luup.log("SET TOTALENERGY from " .. lsID .. " with value " .. lsValue)
                 luup.variable_set("urn:upnp-org:serviceId:EnergyMeter1", "TotalEnergy", lsValue, device)
               end
@@ -1730 +1710 @@
             end
         end
--- End of addition --
-      end
-      
+      end
     end 
-
   end
  

S_EnergyMeter1.xml

@@ -19 +19 @@
     </stateVariable>
     <stateVariable>
+      <name>TotalEnergy</name>
+      <sendEventsAttribute>yes</sendEventsAttribute>
+      <dataType>i4</dataType>
+      <defaultValue>0</defaultValue>
+      <shortCode>totalenergy</shortCode>
+    </stateVariable>
+    <stateVariable>
        <sendEventsAttribute>no</sendEventsAttribute>
        <name>Battery</name>
        <dataType>string</dataType>
        <shortCode>battery</shortCode>
-    </stateVariable>
-    <stateVariable>
-       <sendEventsAttribute>no</sendEventsAttribute>
-       <name>Battery2</name>
-       <dataType>string</dataType>
-       <shortCode>battery2</shortCode>
     </stateVariable>
     <stateVariable>