Changes in / [1:3]

Location:

/trunk

Files:

• D_CurrentCostEnviRAppliance1.xml (added)
• S_CurrentCostEnviR1.xml (added)
• D_CurrentCostEnviR1.json (modified) (4 diffs)
• D_CurrentCostEnviR1.xml (modified) (1 diff)
• D_CurrentCostEnviRAppliance1.json (added)
• I_CurrentCostEnviR1.xml (modified) (5 diffs)

/trunk/D_CurrentCostEnviR1.json

@@ -84 +84 @@
                 {
                     "ControlGroup": "2",
-                    "ControlPair": "1",
-                    "ControlHeader": "0",
+                    "ControlPair": "2",
+                    "ControlHeader": "2",
                     "ControlType": "label",
                     "Label": {
@@ -100 +100 @@
                 {
                     "ControlGroup": "2",
-                    "ControlPair": "1",
-                    "ControlHeader": "0",
+                    "ControlPair": "2",
+                    "ControlHeader": "2",
                     "ControlType": "variable",
                     "Display": {
@@ -107 +107 @@
                         "Variable": "CurrentTemperature",
                         "Top": 90,
+                        "Left": 145,
+                        "Width": 75,
+                        "Height": 20
+                    }
+                },
+                {
+                    "ControlGroup": "2",
+                    "ControlPair": "2",
+                    "ControlHeader": "2",
+                    "ControlType": "label",
+                    "Label": {
+                        "lang_tag": "dayssincebirth",
+                        "text": "Days since birth:"
+                    },
+                    "Display": {
+                        "Top": 120,
+                        "Left": 50,
+                        "Width": 75,
+                        "Height": 20
+                    }
+                },
+                {
+                    "ControlGroup": "2",
+                    "ControlPair": "2",
+                    "ControlHeader": "2",
+                    "ControlType": "variable",
+                    "Display": {
+                        "Service": "urn:futzle-com:serviceId:CurrentCostEnviR1",
+                        "Variable": "DaysSinceBirth",
+                        "Top": 120,
+                        "Left": 145,
+                        "Width": 75,
+                        "Height": 20
+                    }
+                },
+                {
+                    "ControlGroup": "2",
+                    "ControlPair": "2",
+                    "ControlHeader": "2",
+                    "ControlType": "label",
+                    "Label": {
+                        "lang_tag": "time",
+                        "text": "Console time:"
+                    },
+                    "Display": {
+                        "Top": 150,
+                        "Left": 50,
+                        "Width": 75,
+                        "Height": 20
+                    }
+                },
+                {
+                    "ControlGroup": "2",
+                    "ControlPair": "2",
+                    "ControlHeader": "2",
+                    "ControlType": "variable",
+                    "Display": {
+                        "Service": "urn:futzle-com:serviceId:CurrentCostEnviR1",
+                        "Variable": "Time",
+                        "Top": 150,
+                        "Left": 145,
+                        "Width": 75,
+                        "Height": 20
+                    }
+                },
+                {
+                    "ControlGroup": "2",
+                    "ControlPair": "2",
+                    "ControlHeader": "2",
+                    "ControlType": "label",
+                    "Label": {
+                        "lang_tag": "version",
+                        "text": "Version:"
+                    },
+                    "Display": {
+                        "Top": 180,
+                        "Left": 50,
+                        "Width": 75,
+                        "Height": 20
+                    }
+                },
+                {
+                    "ControlGroup": "2",
+                    "ControlPair": "2",
+                    "ControlHeader": "2",
+                    "ControlType": "variable",
+                    "Display": {
+                        "Service": "urn:futzle-com:serviceId:CurrentCostEnviR1",
+                        "Variable": "Version",
+                        "Top": 180,
                         "Left": 145,
                         "Width": 75,
@@ -201 +291 @@
                 }
             }
-        },
+        }
     },
-    "DeviceType": "urn:schemas-futzle-com:device:CurrentCostEnvir:1"
+    "DeviceType": "urn:schemas-futzle-com:device:CurrentCostEnviR:1"
 }

/trunk/D_CurrentCostEnviR1.xml

@@ -6 +6 @@
     </specVersion>
     <device>
-        <deviceType>urn:schemas-futzle-com:device:CurrentCostEnvir:1</deviceType>
+        <deviceType>urn:schemas-futzle-com:device:CurrentCostEnviR:1</deviceType>
         <staticJson>D_CurrentCostEnviR1.json</staticJson>
         <serviceList>
+            <service>
+                <serviceType>urn:schemas-futzle-com:service:CurrentCostEnviR:1</serviceType>
+                <serviceId>urn:futzle-com:serviceId:CurrentCostEnviR1</serviceId>
+                <SCPDURL>S_CurrentCostEnviR1.xml</SCPDURL>
+            </service>
             <service>
                 <serviceType>urn:schemas-micasaverde-com:service:EnergyMetering:1</serviceType>

/trunk/I_CurrentCostEnviR1.xml

@@ -3 +3 @@
     <settings>
         <protocol>crlf</protocol>
-      <handleChildren>1</handleChildren>
+        <handleChildren>1</handleChildren>
     </settings>
     <functions>
 
 -- Power used/consumed by each appliance (0 is the "whole house" appliance).
-APPLIANCE_POWER = {
-    ["0"] = 0,
-    ["1"] = 0,
-    ["2"] = 0,
-    ["3"] = 0,
-    ["4"] = 0,
-    ["5"] = 0,
-    ["6"] = 0,
-    ["7"] = 0,
-    ["8"] = 0,
-    ["9"] = 0
-}
+APPLIANCE_POWER = { }
 SERVICE_ID = "urn:futzle-com:serviceId:CurrentCostEnviR1"
 ENERGY_SERVICE_ID = "urn:micasaverde-com:serviceId:EnergyMetering1"
@@ -28 +17 @@
 function initialize(lul_device)
     luup.log("Initializing CurrentCost EnviR")
+    -- Help prevent race condition
+    luup.io.intercept()
 
-  -- Compute total power use using this formula.
+    -- Create child devices for the attached appliances.
+    local childDevices = luup.chdev.start(lul_device)
+    for child = 0, 9 do
+        if (luup.variable_get(SERVICE_ID, "Appliance" .. tostring(child), lul_device) or "0" ~= "0") then
+            luup.chdev.append(lul_device, childDevices, "Appliance" .. tostring(child),
+                "Appliance " .. child, "urn:schemas-futzle-com:device:CurrentCostEnvirAppliance:1",
+                "D_CurrentCostEnviRAppliance1.xml", "", "", false)
+        end
+    end
+    luup.chdev.sync(lul_device, childDevices)
+
+    -- Compute total power use for the parent device using this formula.
     -- Formula string contains sequences of +n or -n,
     -- adding or subtracting the appliance to compute a total.
@@ -44 +46 @@
     end
     luup.log("Power formula: " .. FORMULA)
+
+    -- Automatically detect appliances and create child devices
+    -- the next time that the Luup engine is reloaded.
+    AUTO_DETECT = luup.variable_get(SERVICE_ID, "ApplianceAutoDetect", lul_device)
+    if (AUTO_DETECT == nil) then
+        luup.variable_set(SERVICE_ID, "ApplianceAutoDetect", "1", lul_device)
+    end
 end
 
@@ -51 +60 @@
     for sign, appliance in formula:gfind("([+-])%s-(%d)") do
         if (sign == "+") then
-            total = total + APPLIANCE_POWER[appliance]
+            total = total + (APPLIANCE_POWER[appliance] or 0)
         elseif (sign == "-") then
-            total = total - APPLIANCE_POWER[appliance]
+            total = total - (APPLIANCE_POWER[appliance] or 0)
         end
     end
@@ -72 +81 @@
         watts = tostring(tonumber(watts))
         if (DEBUG) then luup.log("Sensor " .. sensor .. ": " .. watts .. " W") end
+
+        -- Log the child device's power (if there is a child device).
+        for k, v in pairs(luup.devices) do
+            if (v.device_num_parent == lul_device and v.id == "Appliance" .. sensor) then
+                luup.variable_set(ENERGY_SERVICE_ID, "Watts", watts, k)
+            end
+        end
+
+        -- Note this appliance number, if permitted.
+        if (AUTO_DETECT or "0" ~= "0") then
+            luup.variable_set(SERVICE_ID, "Appliance" .. sensor, id, lul_device)
+        end
+
+        -- Compute parent device's reading.
         APPLIANCE_POWER[sensor] = watts
         luup.variable_set(ENERGY_SERVICE_ID, "Watts", calculateFormula(), lul_device)
+
+        -- Store the EnviR's firmware version.
+        luup.variable_set(SERVICE_ID, "Version", source, lul_device)
+
+        -- Store the EnviR's concept of the date.
+        luup.variable_set(SERVICE_ID, "DaysSinceBirth", tonumber(dsb), lul_device)
+        luup.variable_set(SERVICE_ID, "Time", time, lul_device)
+
+        -- Log temperature.  We get it for free.
         luup.variable_set(TEMPERATURE_SERVICE_ID, "CurrentTemperature", tmpr, lul_device)
     end