homebridge-smartsystem 7.1.17 → 7.1.19

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-smartsystem",
   "displayname": "Duotecno Bridge",
-  "version": "7.1.17",
+  "version": "7.1.19",
   "description": "SmartServer (Proxy TCP sockets to the cloud, Smappee MQTT, Duotecno IP Nodes, Homekit interface)",
   "main": "index.js",
   "author": "Johan Coppieters",

package/server/powerbase.js

@@ -108,12 +108,15 @@ class PowerBase extends base_1.Base {
         // no previous value -> always update
         if (isNaN(previous))
             return true;
-        // less than 1000W -> update on: difference > 5% previous
-        if (current < 1000)
-            return Math.abs(previous - current) > (previous * 0.05);
-        // more than 1000W -> update on: difference > 2% previous
-        if (current >= 1000)
-            return Math.abs(previous - current) > (previous * 0.02);
+        const absCurrent = Math.abs(current);
+        const absPrevious = Math.abs(previous);
+        const diff = Math.abs(previous - current);
+        // less than 1000W -> update on: difference > 5% of previous absolute value
+        if (absCurrent < 1000)
+            return diff > (absPrevious * 0.05);
+        // more than 1000W -> update on: difference > 2% of previous absolute value
+        if (absCurrent >= 1000)
+            return diff > (absPrevious * 0.02);
         return false;
     }
     applyBindings() {
@@ -138,7 +141,7 @@ class PowerBase extends base_1.Base {
                     });
                 }
                 else {
-                    (0, logger_1.debug)("power", `[Binding ${idx}] NOT significant for channel ${b.channel} -> register ${b.register}: ${currentValue}W -> ${power}W (diff: ${Math.abs(currentValue - power)}W, threshold: ${currentValue < 1000 ? '5%=' + Math.abs(currentValue * 0.05) : '2%=' + Math.abs(currentValue * 0.02)}W)`);
+                    (0, logger_1.debug)("power", `[Binding ${idx}] NOT significant for channel ${b.channel} -> register ${b.register}: ${currentValue}W -> ${power}W (diff: ${Math.abs(currentValue - power)}W, threshold: ${Math.abs(currentValue) < 1000 ? '5%=' + Math.abs(currentValue * 0.05) : '2%=' + Math.abs(currentValue * 0.02)}W)`);
                 }
             });
         }