Changes in / [20:30]

Location:

/trunk

Files:

• D_CurrentCostEnviRAppliancePulse1.xml (added)
• J_CurrentCostEnviR1.js (modified) (6 diffs)
• J_SerialConnection.js (modified) (13 diffs)
• L_CurrentCostEnviR1.lua (modified) (14 diffs)
• D_CurrentCostEnviRAppliancePulse1.json (added)

/trunk/J_CurrentCostEnviR1.js

@@ -2 +2 @@
 function getChildApplianceName(deviceId, a)
 {
-    var matches = jsonp.ud.devices.findAll(function(d) {
+    var matches = jQuery.grep(jsonp.ud.devices, function(d) {
         return d.altid == "Appliance" + a && d.id_parent == deviceId
     } );
@@ -9 +9 @@
 }
 
+function getFormula(deviceId)
+{
+    var formula = get_device_state(deviceId, "urn:futzle-com:serviceId:CurrentCostEnviR1", "Formula", 0);
+    if (formula == undefined) formula = "";
+    if (/^[0-9]/.test(formula)) formula = "+" + formula;
+    return formula;
+}
+
+function setFormula(deviceId, a, operation)
+{
+    var formula = getFormula(deviceId);
+    formula = formula.replace("-" + a, "").replace("+" + a, "");
+    if (operation == "add")
+    {
+        formula += "+" + a;
+    }
+    else if (operation == "subtract")
+    {
+        formula += "-" + a;
+    }
+    set_device_state(deviceId, "urn:futzle-com:serviceId:CurrentCostEnviR1", "Formula", formula, 0);
+}
+
+var entityMap = {
+  "&": "&",
+  "<": "&lt;",
+  ">": "&gt;",
+  '"': '&quot;',
+  "'": '&#39;',
+  "/": '&#x2F;'
+};
+
+function escapeHtml(string) {
+  return String(string).replace(/[&<>"'\/]/g, function (s) {
+    return entityMap[s];
+  });
+}
+
 /* Entry point for "Configuration" tab.
    Provide GUI for editing global and per-appliance settings. */
 function setup(deviceId)
 {
+    var applianceTypes = [ "Unknown", "Electricity (Power)", "Electricity (Pulse)" ];
+
     var htmlResult = "";
     htmlResult += "<div>";
@@ -22 +62 @@
     var childTemperature = get_device_state(deviceId, "urn:futzle-com:serviceId:CurrentCostEnviR1", "ChildTemperature", 0);
     if (childTemperature == undefined) childTemperature = 0;
-    htmlResult += "<td><input type='checkbox' id='childTemperature' " + (childTemperature == "1" ? "checked='checked' " : "") + "onclick='set_device_state(" + deviceId + ", \"urn:futzle-com:serviceId:CurrentCostEnviR1\", \"ChildTemperature\", $F(\"childTemperature\") ? 1 : 0, 0)'/></td>";
+    htmlResult += "<td><input type='checkbox' id='childTemperature' " + (childTemperature == "1" ?  "checked='checked' " : "") + "onclick='set_device_state(" + deviceId + ", \"urn:futzle-com:serviceId:CurrentCostEnviR1\", \"ChildTemperature\", jQuery(this).is(\":checked\") ? 1 : 0, 0)'/></td>";
 
     htmlResult += "</tr><tr>";
@@ -30 +70 @@
     var applianceDetect = get_device_state(deviceId, "urn:futzle-com:serviceId:CurrentCostEnviR1", "ApplianceAutoDetect", 0);
     if (applianceDetect == undefined) applianceDetect = 1;
-    htmlResult += "<td><input type='checkbox' id='applianceDetect' " + (applianceDetect == "1" ? "checked='checked' " : "") + "onclick='set_device_state(" + deviceId + ", \"urn:futzle-com:serviceId:CurrentCostEnviR1\", \"ApplianceAutoDetect\", $F(\"applianceDetect\") ? 1 : 0, 0)'/></td>";
+    htmlResult += "<td><input type='checkbox' id='applianceDetect' " + (applianceDetect == "1" ? "checked='checked' " : "") + "onclick='set_device_state(" + deviceId + ", \"urn:futzle-com:serviceId:CurrentCostEnviR1\", \"ApplianceAutoDetect\", jQuery(this).is(\":checked\") ? 1 : 0, 0)'/></td>";
 
     htmlResult += "</tr>";
@@ -38 +78 @@
     htmlResult += "<table border='0' padding='0' width='100%'>";
     htmlResult += "<tr>";
-    htmlResult += "<th>Appliance</th><th>ID</th><th>Name</th><th>Separate Phases</th><th>Main power</th>";
+    htmlResult += "<th>Appliance</th><th>Type</th><th>ID</th><th>Name</th><th>Separate Phases</th><th>Main power</th>";
     htmlResult += "</tr>";
 
-    var formula = get_device_state(deviceId, "urn:futzle-com:serviceId:CurrentCostEnviR1", "Formula", 0);
-    if (formula == undefined) formula = "";
-    if (/^[0-9]/.test(formula)) formula = "+" + formula;
+    var formula = getFormula(deviceId);
     var a;
     for (a = 0; a < 10; a++)
@@ -49 +87 @@
         var applianceId = get_device_state(deviceId, "urn:futzle-com:serviceId:CurrentCostEnviR1", "Appliance" + a, 0);
         if (applianceId == undefined || applianceId == "" || applianceId == "0") continue;
+        var applianceType = get_device_state(deviceId, "urn:futzle-com:serviceId:CurrentCostEnviR1", "Appliance" + a + "Type", 0);
+        if (applianceType == undefined) { applianceType = 1; }
+        applianceType = applianceType - 0;
         htmlResult += "<tr>";
         // Appliance number
         htmlResult += "<td>" + a + (a == 0 ? " (whole house)" : "") + "</td>";
+        // Appliance type
+        htmlResult += "<td>" + applianceTypes[applianceType] + "</td>";
         // Appliance unique identifier
-        htmlResult += "<td>" + applianceId.escapeHTML() + "</td>";
+        htmlResult += "<td>" + escapeHtml(applianceId) + "</td>";
         // Appliance name as set by the user
         var applianceName = getChildApplianceName(deviceId, a);
         htmlResult += "<td>" + applianceName + "</td>";
-        // Create additional child devices for each phase?
-        var applianceThreePhase = get_device_state(deviceId, "urn:futzle-com:serviceId:CurrentCostEnviR1", "Appliance" + a + "ThreePhase", 0);
-        if (applianceThreePhase == undefined) applianceThreePhase = 0;
-        htmlResult += "<td><input type='checkbox' " + (applianceThreePhase == "1" ? "checked='checked' " : "") + "/></td>";
-        // How does the child's energy contribute to the main device's energy (+ or -)?
-        htmlResult += "<td>"
-        htmlResult += "<select>";
-        htmlResult += "<option value='none' " + (formula.indexOf("+" + a) == -1 && formula.indexOf("-" + a) == -1 ? "selected='selected' " : "")  + ">None</option>";
-        htmlResult += "<option value='add' " + (formula.indexOf("+" + a) != -1 ? "selected='selected' " : "")  + ">Add</option>";
-        htmlResult += "<option value='subtract' " + (formula.indexOf("-" + a) != -1 ? "selected='selected' " : "")  + ">Subtract</option>";
-        htmlResult += "</select>";
-        htmlResult += "</td>";
-        htmlResult += "</tr>";
+        if (applianceType == 1)
+        {
+            // Create additional child devices for each phase?
+            var applianceThreePhase = get_device_state(deviceId, "urn:futzle-com:serviceId:CurrentCostEnviR1", "Appliance" + a + "ThreePhase", 0);
+            if (applianceThreePhase == undefined) applianceThreePhase = 0;
+            htmlResult += "<td><input type='checkbox' id='appliance" + a + "ThreePhase' " + (applianceThreePhase == "1" ? "checked='checked' " : "") + "onclick='set_device_state(" + deviceId + ", \"urn:futzle-com:serviceId:CurrentCostEnviR1\", \"Appliance" + a + "ThreePhase\", jQuery(\"#appliance" + a + "ThreePhase\").is(\":checked\") ? 1 : 0, 0)'/></td>";
+            // How does the child's energy contribute to the main device's energy (+ or -)?
+            htmlResult += "<td>"
+            htmlResult += "<select id='formula" + a + "' onchange='setFormula(" + deviceId + "," + a + ", jQuery(\"#formula" + a + "\").val())'>";
+            htmlResult += "<option value='none' " + (formula.indexOf("+" + a) == -1 && formula.indexOf("-" + a) == -1 ? "selected='selected' " : "") + ">None</option>";
+            htmlResult += "<option value='add' " + (formula.indexOf("+" + a) != -1 ? "selected='selected' " : "") + ">Add</option>";
+            htmlResult += "<option value='subtract' " + (formula.indexOf("-" + a) != -1 ? "selected='selected' " : "") + ">Subtract</option>";
+            htmlResult += "</select>";
+            htmlResult += "</td>";
+            htmlResult += "</tr>";
+        }
+        else
+        {
+            // No phase or arithmetic for pulse meters.
+            htmlResult += "<td /><td />";
+        }   
     }
 

/trunk/J_SerialConnection.js

@@ -27 +27 @@
  *      If set and of the form "1.1.1.1", this means that the TCP port is a "default"
  *      value, which may mean something useful or not, depending on the plugin.
- *      Use luup.io.open() or signal an error.
+ *      If your plugin's implementation uses <ioPort> then Luup may open a
+ *      connection for you anyway.  Use luup.io.open(), do nothing, or signal an error.
  *      Other forms are reserved (for IPv6 or named hosts).
  *    - If neither is set, return false from the startup to signal an error.
@@ -43 +44 @@
   + numberPattern65535 + ")$");
 
+var entityMap = {
+  "&": "&amp;",
+  "<": "&lt;",
+  ">": "&gt;",
+  '"': '&quot;',
+  "'": '&#39;',
+  "/": '&#x2F;'
+};
+
+function escapeHtml(string) {
+  return String(string).replace(/[&<>"'\/]/g, function (s) {
+    return entityMap[s];
+  });
+}
+
 function getConnectionType(deviceId)
 {
   var ioDevice = get_device_state(deviceId, "urn:micasaverde-com:serviceId:HaDevice1", "IODevice", 0);
-  var ipDevice = jsonp.get_device_by_id(deviceId);
+  var ipDevice = jQuery.grep(jsonp.ud.devices, function(o, i) { return o.id == deviceId; })[0];
   if (ioDevice != undefined && ioDevice != "") { return "ioDevice"; }
   if (ipDevice != undefined)
@@ -61 +77 @@
 function getSerialDevices(deviceId)
 {
-  return jsonp.ud.devices.findAll(function(d) {
+  return jQuery.grep(jsonp.ud.devices, function(d) {
     return d.device_type == "urn:micasaverde-org:device:SerialPort:1";
   } );
@@ -71 +87 @@
 function getDeviceOfSerialDevice(serialDeviceId)
 {
-  var matches = jsonp.ud.devices.findAll(function(d) {
-    return d.states.findAll(function(state) {
+  var matches = jQuery.grep(jsonp.ud.devices, function(d) {
+    return jQuery.grep(d.states, function(state) {
       return state.service == "urn:micasaverde-com:serviceId:HaDevice1" &&
         state.variable == "IODevice" &&
@@ -85 +101 @@
 function getIpAddress(deviceId)
 {
-  var ipDevice = jsonp.get_device_by_id(deviceId);
+  var ipDevice = jQuery.grep(jsonp.ud.devices, function(o, i) { return o.id == deviceId; })[0];
+  if (ipDevice == undefined) { return undefined; }
   var ip = ipDevice.ip;
-  if (ip == undefined) { return undefined; }
   if (ip == "") { return undefined; }
   if (ipv4Pattern.test(ip)) { return ip; }
@@ -98 +114 @@
 function getTcpPort(deviceId)
 {
-  var ipDevice = jsonp.get_device_by_id(deviceId);
+  var ipDevice = jQuery.grep(jsonp.ud.devices, function(o, i) { return o.id == deviceId; })[0];
+  if (ipDevice == undefined) { return undefined; }
   var ip = ipDevice.ip;
-  if (ip == undefined) { return undefined; }
   if (ip == "") { return undefined; }
   if (ipv4Pattern.test(ip)) { return undefined; }
@@ -109 +125 @@
 
 /* Mess with the DOM to disable parts of the UI. */
-function enableSelectedOption(deviceId, currentConnectionType)
-{
-  $('serialDevice').disable();
-  $('ipaddress').disable();
-  $('tcpport').disable();
+function enableSelectedOption(deviceId, currentConnectionType, ownedSerialDeviceId)
+{
+  jQuery('#serialDevice').get(0).disabled = true;
+  jQuery('#serialSpeed').get(0).disabled = true;
+  jQuery('#serialData').get(0).disabled = true;
+  jQuery('#serialParity').get(0).disabled = true;
+  jQuery('#serialStop').get(0).disabled = true;
+  jQuery('#ipaddress').get(0).disabled = true;
+  jQuery('#tcpport').get(0).disabled = true;
 
   if (currentConnectionType == "ioDevice")
   {
-    $('serialDevice').enable();
+    jQuery('#serialDevice').get(0).disabled = false;
+    if (ownedSerialDeviceId != undefined && ownedSerialDeviceId != "")
+    {
+      var serialSpeed = jsonp.get_lu_device_variable_value(ownedSerialDeviceId, "urn:micasaverde-org:serviceId:SerialPort1", "baud", 0);
+      if (serialSpeed == undefined || serialSpeed == "") serialSpeed = "9600";  // Default
+      jQuery('#serialSpeed').val(serialSpeed).get(0).disabled = false;
+      var serialData = jsonp.get_lu_device_variable_value(ownedSerialDeviceId, "urn:micasaverde-org:serviceId:SerialPort1", "databits", 0);
+      if (serialData == undefined || serialData == "") serialData = "8";  // Default
+      jQuery('#serialData').val(serialData).get(0).disabled = false;
+      var serialParity = jsonp.get_lu_device_variable_value(ownedSerialDeviceId, "urn:micasaverde-org:serviceId:SerialPort1", "parity", 0);
+      if (serialParity == undefined || serialParity == "") serialParity = "none";  // Default
+      jQuery('#serialParity').val(serialParity).get(0).disabled = false;
+      var serialStop = jsonp.get_lu_device_variable_value(ownedSerialDeviceId, "urn:micasaverde-org:serviceId:SerialPort1", "stopbits", 0);
+      if (serialStop == undefined || serialStop == "") serialStop = "1";  // Default
+      jQuery('#serialStop').val(serialStop).get(0).disabled = false;
+    }
   }
   if (currentConnectionType == "ip")
   {
-    $('ipaddress').enable();
-    $('tcpport').enable();
+    jQuery('#ipaddress').get(0).disabled = false;
+    jQuery('#tcpport').get(0).disabled = false;
   }
 }
@@ -131 +166 @@
 function setSerialDevice(deviceId, serialDeviceId)
 {
-  enableSelectedOption(deviceId,"ioDevice");
   set_device_state(deviceId, "urn:micasaverde-com:serviceId:HaDevice1", "IODevice", serialDeviceId, 0);
-  jsonp.get_device_by_id(deviceId).ip = "";
+  var ipDevice = jQuery.grep(jsonp.ud.devices, function(o, i) { return o.id == deviceId; })[0];
+  ipDevice.ip = "";
+  enableSelectedOption(deviceId, "ioDevice", serialDeviceId);
+}
+
+/* Set the IODevice serial properties (speed, parity, etc.). */
+function setSerialProperties(deviceId, serialDeviceId)
+{
+  set_device_state(serialDeviceId, "urn:micasaverde-org:serviceId:SerialPort1", "baud", jQuery('#serialSpeed').val(), 0);
+  set_device_state(serialDeviceId, "urn:micasaverde-org:serviceId:SerialPort1", "databits", jQuery('#serialData').val(), 0);
+  set_device_state(serialDeviceId, "urn:micasaverde-org:serviceId:SerialPort1", "parity", jQuery('#serialParity').val(), 0);
+  set_device_state(serialDeviceId, "urn:micasaverde-org:serviceId:SerialPort1", "stopbits", jQuery('#serialStop').val(), 0);
 }
 
@@ -141 +186 @@
 function setIPDevice(deviceId, ipAddress, tcpPort)
 {
-  enableSelectedOption(deviceId,"ip");
-  if (tcpPort == undefined || tcpPort == "")
-  {
-    jsonp.get_device_by_id(deviceId).ip = ipAddress;
+  if (jQuery('#tcpport').get(0).disabled || tcpPort == undefined || tcpPort == "")
+  {
+    var ipDevice = jQuery.grep(jsonp.ud.devices, function(o, i) { return o.id == deviceId; })[0];
+    ipDevice.ip = "";
   }
   else
   {
-    jsonp.get_device_by_id(deviceId).ip = ipAddress + ":" + tcpPort;
+    var ipDevice = jQuery.grep(jsonp.ud.devices, function(o, i) { return o.id == deviceId; })[0];
+    ipDevice.ip = ipAddress + ":" + tcpPort;
   }
   set_device_state(deviceId, "urn:micasaverde-com:serviceId:HaDevice1", "IODevice", "", 0);
+  enableSelectedOption(deviceId, "ip", undefined);
+}
+
+/* Fetch the named file over Ajax and execute function
+   f() on the resulting XML. */
+function withUpnpFileName(deviceId, filename, f)
+{
+  new Ajax.Request("../port_3480/" + filename, {
+    onSuccess : function(response) {
+        return f(response.responseXML);
+      }
+    }
+  );
+}
+
+/* Fetch the Implementation file (I_*.xml) and
+   execute the function f() on the resulting XML. */
+function withImplementationFile(deviceId, f)
+{
+  var device = jQuery.grep(jsonp.ud.devices, function(o, i) { return o.id == deviceId; })[0];
+  if (device.impl_file != "")
+  {
+    return withUpnpFileName(deviceId, device.impl_file, f);
+  }
+  else
+  {
+    return withUpnpFileName(deviceId, device.device_file, function(doc) {
+      var implementationElement = doc.querySelector("root > device > implementationList > implementationFile");
+      if (implementationElement != undefined)
+      {
+        var implementationFile = implementationElement.textContent.trim();
+        return withUpnpFileName(deviceId, implementationFile, f);
+      }
+    });
+  }
 }
 
@@ -165 +246 @@
   htmlResult += "<p><input type='radio' name='connectionType' value='serial' ";
   if (currentConnectionType == "ioDevice") htmlResult += "checked='checked' ";
-  htmlResult += "onclick='setSerialDevice(" + deviceId + ",$F(serialDevice))'/>Serial port or IPSerial device ";
-  htmlResult += "<select id='serialDevice' onchange='setSerialDevice(" + deviceId + ",$F(serialDevice))'>";
+  htmlResult += "onclick='setSerialDevice(" + deviceId + ",jQuery(\"#serialDevice\").val())'/>Serial port or IPSerial device ";
+  htmlResult += "<select id='serialDevice' onchange='setSerialDevice(" + deviceId + ",jQuery(\"#serialDevice\").val())'>";
   htmlResult += "<option value=''>None</option>";
   var serialDevices = getSerialDevices(deviceId);
-  htmlResult += serialDevices.inject("", function(htmlResult, d) {
+  var ownedSerialDeviceId;
+  jQuery.each(serialDevices, function(i, d) {
     htmlResult += "<option value='" + d.id + "'";
     var deviceOwner = getDeviceOfSerialDevice(d.id);
@@ -178 +260 @@
         // This is my serial device.
         htmlResult += " selected='selected'";
+        ownedSerialDeviceId = d.id;
       }
       else
@@ -185 +268 @@
       }
     }
-    htmlResult += ">" + d.name.escapeHTML();
+    htmlResult += ">" + escapeHtml(d.name);
     // Tell user who owns this device (if it's not us).
     if (deviceOwner != undefined && deviceOwner.id != deviceId)
     {
-      htmlResult += " [" + deviceOwner.name.escapeHTML() + "]";
+      htmlResult += " [" + escapeHtml(deviceOwner.name) + "]";
     }
     htmlResult += "</option>";
-    return htmlResult;
   });
   htmlResult += "</select>";
   htmlResult += "</p>";
+  htmlResult += "<p style='margin-left: 4em;'>";
+  htmlResult += "Speed <select id='serialSpeed' onchange='setSerialProperties(" + deviceId + ",jQuery(\"#serialDevice\").val())'><option value='300'>300</option><option value='1200'>1200</option><option value='2400'>2400</option><option value='4800'>4800</option><option value='9600'>9600</option><option value='19200'>19200</option><option value='38400'>38400</option><option value='57600'>57600</option><option value='115200'>115200</option><option value='230400'>230400</option></select>";
+  htmlResult += " Data bits <select id='serialData' onchange='setSerialProperties(" + deviceId + ",jQuery(\"#serialDevice\").val())'><option value='7'>7</option><option value='8'>8</option></select>";
+  htmlResult += " Parity <select id='serialParity' onchange='setSerialProperties(" + deviceId + ",jQuery(\"#serialDevice\").val())'><option value='none'>None</option><option value='even'>Even</option><option value='odd'>Odd</option></select>";
+  htmlResult += " Stop bits <select id='serialStop' onchange='setSerialProperties(" + deviceId + ",jQuery(\"#serialDevice\").val())'><option value='0'>0</option><option value='1'>1</option><option value='2'>2</option></select>";
+  htmlResult += "</p>";
 
   /* Serial proxy over Ethernet. */
   htmlResult += "<p><input type='radio' name='connectionType' value='ip' ";
   if (currentConnectionType == "ip") htmlResult += "checked='checked' ";
-  htmlResult += "onclick='setIPDevice(" + deviceId + ",$F(ipaddress),$F(tcpport))'/>Serial proxy on another machine ";
+  htmlResult += "onclick='setIPDevice(" + deviceId + ",jQuery(\"#ipaddress\").val(),jQuery(\"#tcpport\").val())'/>Serial proxy on another machine ";
   var ipAddress = getIpAddress(deviceId);
   if (ipAddress == undefined) { ipAddress = ""; }
-  htmlResult += "<p style='margin-left: 4em;'>IP address <input id='ipaddress' type='text' size='16' value='" + ipAddress.escapeHTML() + "' onchange='setIPDevice(" + deviceId + ",$F(ipaddress),$F(tcpport))' />";
+  htmlResult += "<p style='margin-left: 4em;'>IP address <input id='ipaddress' type='text' size='16' value='" + escapeHtml(ipAddress) + "' onchange='setIPDevice(" + deviceId + ",jQuery(\"#ipaddress\").val(),jQuery(\"#tcpport\").val())' />";
   var tcpPort = getTcpPort(deviceId);
   if (tcpPort == undefined) { tcpPort = ""; }
-  htmlResult += " TCP port <input id='tcpport' type='text' size='6' value='" + tcpPort.escapeHTML() + "' onchange='setIPDevice(" + deviceId + ",$F(ipaddress),$F(tcpport))' /></p> ";
+  htmlResult += " TCP port <input id='tcpport' type='text' size='6' value='" + escapeHtml(tcpPort) + "' onchange='setIPDevice(" + deviceId + ",jQuery(\"#ipaddress\").val(),jQuery(\"#tcpport\").val())' /></p> ";
   htmlResult += "</p>";
 
@@ -213 +301 @@
   set_panel_html(htmlResult);
 
-  enableSelectedOption(deviceId, currentConnectionType);
-}
+  enableSelectedOption(deviceId, currentConnectionType, ownedSerialDeviceId);
+
+  /* See if this device has an <ioPort> element.
+     If so, don't let user edit the TCP port. */
+  withImplementationFile(deviceId, function(doc) {
+    var ioPortElement = doc.querySelector("implementation > settings > ioPort");
+    if (ioPortElement != undefined)
+    {
+      var ioPortHardcoded = ioPortElement.textContent.trim();
+      jQuery('#tcpport').val(ioPortHardcoded).get(0).disabled = true;
+    }
+  });
+}

/trunk/L_CurrentCostEnviR1.lua

@@ -9 +9 @@
 -- Cache of child devices, maps appliance number to MiOS device ID.
 CHILD_DEVICE = { }
+CHILD_DEVICE_TYPE = { }
 CHILD_DEVICE_THREEPHASE = { ["0"] = { }, ["1"] = { }, ["2"] = { }, ["3"] = { }, ["4"] = { }, ["5"] = { }, ["6"] = { }, ["7"] = { }, ["8"] = { }, ["9"] = { } }
 -- Child device for temperature, if configured.
@@ -60 +61 @@
         if ((luup.variable_get(SERVICE_ID, "Appliance" .. tostring(child), lul_device) or "0") ~= "0") then
             CHILD_DEVICE_COUNT = CHILD_DEVICE_COUNT + 1
-            luup.chdev.append(lul_device, childDevices, "Appliance" .. tostring(child),
-                "Appliance " .. child, "urn:schemas-futzle-com:device:CurrentCostEnvirAppliance:1",
-                "D_CurrentCostEnviRAppliance1.xml", "", "", false)
+            -- What type of device is it?
+            local deviceType = luup.variable_get(SERVICE_ID, "Appliance" .. tostring(child) .. "Type", lul_device) or "1"
+            if (deviceType == "1") then
+                -- Electricity power (clamp, individual monitor).
+                luup.chdev.append(lul_device, childDevices, "Appliance" .. tostring(child),
+                    "Appliance " .. child, "urn:schemas-futzle-com:device:CurrentCostEnviRAppliance:1",
+                    "D_CurrentCostEnviRAppliance1.xml", "", "", false)
+            elseif (deviceType == "2") then
+                -- Impulse meter (OptiSmart).
+                luup.chdev.append(lul_device, childDevices, "Appliance" .. tostring(child),
+                    "Appliance " .. child .. " (pulse)", "urn:schemas-futzle-com:device:CurrentCostEnviRAppliancePulse:1",
+                    "D_CurrentCostEnviRAppliancePulse1.xml", "", "", false)
+            end
         end
         if ((luup.variable_get(SERVICE_ID, "Appliance" .. tostring(child) .. "ThreePhase", lul_device) or "0") ~= "0") then
             for phase = 1, 3 do
                 luup.chdev.append(lul_device, childDevices, "Appliance" .. tostring(child) .. "Phase" .. tostring(phase),
-                    "Appliance " .. child .. " phase " .. phase, "urn:schemas-futzle-com:device:CurrentCostEnvirAppliancePhase:1",
+                    "Appliance " .. child .. " phase " .. phase, "urn:schemas-futzle-com:device:CurrentCostEnviRAppliancePhase:1",
                     "D_CurrentCostEnviRAppliancePhase1.xml", "", "", false)
             end
@@ -106 +117 @@
     AUTO_DETECT = luup.variable_get(SERVICE_ID, "ApplianceAutoDetect", lul_device)
     if (AUTO_DETECT == nil) then
+        AUTO_DETECT = "1"
         luup.variable_set(SERVICE_ID, "ApplianceAutoDetect", "1", lul_device)
     end
+
+    -- Set the device category. 21 is "power meter".
+    luup.attr_set("category_num", 21, lul_device)
 
     -- Cache the child device ids, and populate the history variables.
@@ -114 +129 @@
             if (v.device_num_parent == lul_device and v.id == "Appliance" .. sensor) then
                 if (DEBUG) then luup.log("Child deviceId for Appliance " .. sensor .. " is " .. k) end
-                CHILD_DEVICE[tostring(sensor)] = k
-                TWOHOURLY_HISTORY[tostring(sensor)] = deserializeHistory(luup.variable_get(SERVICE_ID, "TwoHourlyHistory", k) or "")
-                DAILY_HISTORY[tostring(sensor)] = deserializeHistory(luup.variable_get(SERVICE_ID, "DailyHistory", k) or "")
-                MONTHLY_HISTORY[tostring(sensor)] = deserializeHistory(luup.variable_get(SERVICE_ID, "MonthlyHistory", k) or "")
+                -- What type of device is it?
+                local deviceType = luup.variable_get(SERVICE_ID, "Appliance" .. tostring(child) .. "Type", lul_device) or "1"
+                if (deviceType == "1") then
+                    -- Electricity power (clamp, individual monitor).
+                    -- Set the device category. 21 is "power meter".
+                    luup.attr_set("category_num", 21, k)
+                    CHILD_DEVICE[tostring(sensor)] = k
+                    CHILD_DEVICE_TYPE[tostring(sensor)] = "1"
+                    TWOHOURLY_HISTORY[tostring(sensor)] = deserializeHistory(luup.variable_get(SERVICE_ID, "TwoHourlyHistory", k) or "")
+                    DAILY_HISTORY[tostring(sensor)] = deserializeHistory(luup.variable_get(SERVICE_ID, "DailyHistory", k) or "")
+                    MONTHLY_HISTORY[tostring(sensor)] = deserializeHistory(luup.variable_get(SERVICE_ID, "MonthlyHistory", k) or "")
+                elseif (deviceType == "2") then
+                    -- Impulse meter (OptiSmart).
+                    -- Set the device category. 21 is "power meter".
+                    luup.attr_set("category_num", 21, k)
+                    CHILD_DEVICE[tostring(sensor)] = k
+                    CHILD_DEVICE_TYPE[tostring(sensor)] = "2"
+                end
             end
             for phase = 1, 3 do
                 if (v.device_num_parent == lul_device and v.id == "Appliance" .. sensor .. "Phase" .. phase) then
                     if (DEBUG) then luup.log("Child deviceId for Appliance " .. sensor .. " Phase " .. phase .. " is " .. k) end
+                    -- Set the device category. 21 is "power meter".
+                    luup.attr_set("category_num", 21, k)
                     CHILD_DEVICE_THREEPHASE[tostring(sensor)][tostring(phase)] = k
                 end
@@ -127 +158 @@
         end
         if (v.device_num_parent == lul_device and v.id == "Temperature") then
+            -- Set the device category. 17 is "temperature".
+            luup.attr_set("category_num", 17, k)
             CHILD_TEMPERATURE_DEVICE = k
         end
@@ -174 +207 @@
 end 
 
+-- Set a variable only if it is different.
+function set_if_different(serviceId, variable, value, deviceId)
+    if (luup.variable_get(serviceId, variable, deviceId) ~= tostring(value)) then
+        luup.variable_set(serviceId, variable, value, deviceId)
+    end
+end
+
 -- 
 -- Process elements in the <msg> part of a packet.
@@ -181 +221 @@
 function processMsgSrc(context, lul_device, source)
     context.version = source
-    luup.variable_set(SERVICE_ID, "Version", source, lul_device)
+    set_if_different(SERVICE_ID, "Version", source, lul_device)
     return context
 end
@@ -188 +228 @@
 function processMsgUid(context, lul_device, uid)
     context.uid = uid
-    luup.variable_set(SERVICE_ID, "UID", uid, lul_device)
+    set_if_different(SERVICE_ID, "UID", uid, lul_device)
     return context
 end
@@ -195 +235 @@
 function processMsgDsb(context, lul_device, dsb)
     context.dsb = dsb
-    luup.variable_set(SERVICE_ID, "DaysSinceBirth", tonumber(dsb), lul_device)
+    set_if_different(SERVICE_ID, "DaysSinceBirth", tonumber(dsb), lul_device)
     return context
 end
@@ -202 +242 @@
 function processMsgTime(context, lul_device, time)
     context.time = time
-    luup.variable_set(SERVICE_ID, "Time", time, lul_device)
+    set_if_different(SERVICE_ID, "Time", time, lul_device)
     return context
 end
@@ -329 +369 @@
         local childDevice = CHILD_DEVICE[context.sensor]
         if (childDevice ~= nil) then
-            luup.variable_set(ENERGY_SERVICE_ID, "Watts", context.watts, childDevice)
-            luup.variable_set(SERVICE_ID, "DaysSinceBirth", context.dsb, childDevice)
-            luup.variable_set(SERVICE_ID, "Time", context.time, childDevice)
-            luup.variable_set(TEMPERATURE_SERVICE_ID, "CurrentTemperature", context.tmpr, childDevice)
-            if (context.version) then luup.variable_set(SERVICE_ID, "Version", context.version, childDevice) end
-            if (context.uid) then luup.variable_set(SERVICE_ID, "UID", context.uid, childDevice) end
+            set_if_different(ENERGY_SERVICE_ID, "Watts", context.watts, childDevice)
+            set_if_different(SERVICE_ID, "DaysSinceBirth", context.dsb, childDevice)
+            set_if_different(SERVICE_ID, "Time", context.time, childDevice)
+            set_if_different(TEMPERATURE_SERVICE_ID, "CurrentTemperature", context.tmpr, childDevice)
+            if (context.version) then set_if_different(SERVICE_ID, "Version", context.version, childDevice) end
+            if (context.uid) then set_if_different(SERVICE_ID, "UID", context.uid, childDevice) end
         end
 
@@ -341 +381 @@
             local childDevicePhase = CHILD_DEVICE_THREEPHASE[context.sensor][tostring(phase)]
             if (childDevicePhase ~= nil) then
-                luup.variable_set(ENERGY_SERVICE_ID, "Watts", context.phase[tostring(phase)], childDevicePhase)
-                luup.variable_set(SERVICE_ID, "DaysSinceBirth", context.dsb, childDevicePhase)
-                luup.variable_set(SERVICE_ID, "Time", context.time, childDevicePhase)
-                luup.variable_set(TEMPERATURE_SERVICE_ID, "CurrentTemperature", context.tmpr, childDevicePhase)
-                if (context.version) then luup.variable_set(SERVICE_ID, "Version", context.version, childDevicePhase) end
-                if (context.uid) then luup.variable_set(SERVICE_ID, "UID", context.uid, childDevicePhase) end
-            end
-        end
-
-        -- Note this appliance number, if permitted.
-        if (AUTO_DETECT or "0" ~= "0") then
-            local previousId = luup.variable_get(SERVICE_ID, "Appliance" .. context.sensor, lul_device)
-            if (previousId == nil or context.id ~= previousId) then
-                luup.variable_set(SERVICE_ID, "Appliance" .. context.sensor, context.id, lul_device)
-                CHILD_DEVICE_COUNT = CHILD_DEVICE_COUNT + 1
-                -- Did we start with zero appliances?  Tell user we found another.
-                if (CHILD_DEVICE_DISCOVERY_HANDLE ~= nil) then
-                    luup.task("Discovered " .. CHILD_DEVICE_COUNT .. (CHILD_DEVICE_COUNT == 1 and " appliance" or " appliances") .. ". Reload when all appliances are discovered", 1, string.format("%s[%d]", luup.devices[lul_device].description, lul_device), CHILD_DEVICE_DISCOVERY_HANDLE)
-                end
+                set_if_different(ENERGY_SERVICE_ID, "Watts", context.phase[tostring(phase)], childDevicePhase)
+                set_if_different(SERVICE_ID, "DaysSinceBirth", context.dsb, childDevicePhase)
+                set_if_different(SERVICE_ID, "Time", context.time, childDevicePhase)
+                set_if_different(TEMPERATURE_SERVICE_ID, "CurrentTemperature", context.tmpr, childDevicePhase)
+                if (context.version) then set_if_different(SERVICE_ID, "Version", context.version, childDevicePhase) end
+                if (context.uid) then set_if_different(SERVICE_ID, "UID", context.uid, childDevicePhase) end
             end
         end
@@ -365 +392 @@
         -- Compute parent device's reading, using its custom formula.
         APPLIANCE_POWER[context.sensor] = context.watts
-        luup.variable_set(ENERGY_SERVICE_ID, "Watts", calculateFormula(APPLIANCE_POWER), lul_device)
+        set_if_different(ENERGY_SERVICE_ID, "Watts", calculateFormula(APPLIANCE_POWER), lul_device)
+    elseif (context.packetType == "realtime" and context.type == "2") then
+        -- Impulse (OptiSmart) meter data.
+
+        -- Log the child device's impulse (if there is a child device).
+        local childDevice = CHILD_DEVICE[context.sensor]
+        if (childDevice ~= nil) then
+            set_if_different(ENERGY_SERVICE_ID, "Pulse", context.imp, childDevice)
+            local zero = luup.variable_get(SERVICE_ID, "PulseZero", childDevice) or "0"
+            set_if_different(SERVICE_ID, "ImpulsePerUnit", context.ipu, childDevice)
+            set_if_different(ENERGY_SERVICE_ID, "KWH", (tonumber(context.imp) - tonumber(zero))/tonumber(context.ipu), childDevice)
+            set_if_different(SERVICE_ID, "DaysSinceBirth", context.dsb, childDevice)
+            set_if_different(SERVICE_ID, "Time", context.time, childDevice)
+            set_if_different(TEMPERATURE_SERVICE_ID, "CurrentTemperature", context.tmpr, childDevice)
+            if (context.version) then set_if_different(SERVICE_ID, "Version", context.version, childDevice) end
+            if (context.uid) then set_if_different(SERVICE_ID, "UID", context.uid, childDevice) end
+        end
+    end
+
+    -- Note this appliance number, if permitted.
+    if (AUTO_DETECT ~= "0") then
+        local previousId = luup.variable_get(SERVICE_ID, "Appliance" .. context.sensor, lul_device)
+        if (previousId == nil or context.id ~= previousId) then
+            set_if_different(SERVICE_ID, "Appliance" .. context.sensor, context.id, lul_device)
+            set_if_different(SERVICE_ID, "Appliance" .. context.sensor .. "Type", context.type, lul_device)
+            CHILD_DEVICE_COUNT = CHILD_DEVICE_COUNT + 1
+            -- Did we start with zero appliances?  Tell user we found another.
+            if (CHILD_DEVICE_DISCOVERY_HANDLE ~= nil) then
+                luup.task("Discovered " .. CHILD_DEVICE_COUNT .. (CHILD_DEVICE_COUNT == 1 and " appliance" or " appliances") .. ". Reload when all appliances are discovered", 1, string.format("%s[%d]", luup.devices[lul_device].description, lul_device), CHILD_DEVICE_DISCOVERY_HANDLE)
+            end
+        end
     end
 
     if (context.tmpr) then
-        luup.variable_set(TEMPERATURE_SERVICE_ID, "CurrentTemperature", context.tmpr, lul_device)
+        set_if_different(TEMPERATURE_SERVICE_ID, "CurrentTemperature", context.tmpr, lul_device)
         -- Set temperature on the child temperature device (if there is one).
         if (CHILD_TEMPERATURE_DEVICE) then
-            luup.variable_set(TEMPERATURE_SERVICE_ID, "CurrentTemperature", context.tmpr, CHILD_TEMPERATURE_DEVICE)
+            set_if_different(TEMPERATURE_SERVICE_ID, "CurrentTemperature", context.tmpr, CHILD_TEMPERATURE_DEVICE)
         end
     end
@@ -399 +456 @@
     for sensor = 0, 9 do
         local childDevice = CHILD_DEVICE[tostring(sensor)]
-        if (childDevice ~= nil) then
+        local childDeviceType = CHILD_DEVICE_TYPE[tostring(sensor)]
+        if (childDevice ~= nil and childDeviceType == "1") then
             luup.variable_set(SERVICE_ID, "TwoHourlyHistory", serializeHistory(TWOHOURLY_HISTORY[tostring(sensor)]), childDevice)
             luup.variable_set(SERVICE_ID, "DailyHistory", serializeHistory(DAILY_HISTORY[tostring(sensor)]), childDevice)