homebridge-smartsystem 6.2.6 → 6.3.2

package/README.md

@@ -275,6 +275,10 @@ Homebridge UI version
  - 4: fixed empty name bug in unit-def / new accessory()
  - 5: fixed bad displayNames in published units
  - 6: power: 5% instead of 10% for power rules
+
+ ### v6.3.x - 23-09-2022 - Shelly PM release
+ - 1: first test 1 PM
+ - 2: logging now more according to debug true/false in the config file
  
 
 ## Hardware 

package/config.json

@@ -2,6 +2,7 @@
   "manufacturer": "Duotecno-Coppieterscc",
   "platform": "DuotecnoPlatform",
   "smappee": {
+    "debug": false,
     "rules": [
       {
         "type": "sun",
@@ -140,7 +141,6 @@
     ],
     "address": "192.168.0.186",
     "uid": "57e3e0d8-bb05-4b04-8662-1a9871998f3f",
-    "debug": false,
     "bindings": [
       {
         "logicalNodeAddress": 252,
@@ -189,6 +189,7 @@
     ]
   },
   "p1": {
+    "debug": false,
     "rules": [
       {
         "type": "power",
@@ -247,9 +248,15 @@
         "power": null
       }
     ],
-    "address": "192.168.0.214"
+    "address": "192.168.0.207"
+  },
+  "shelly": {
+    "debug": false,
+    "address": "192.168.0.95",
+    "addresses": "192.168.0.95,192.168.0.95",
+    "rules": [],
+    "bindings": []
   },
-  "shelly": false,
   "smartapp": {
     "apiPort": 8581,
     "apiHost": "192.168.0.99",
@@ -373,184 +380,16 @@
       }
     ],
     "cunits": [
-      {
-        "logicalNodeAddress": 252,
-        "logicalAddress": 102,
-        "masterAddress": "192.168.0.97",
-        "masterPort": 5001,
-        "name": "unit 252:102",
-        "displayName": "unit 252:102",
-        "extendedType": 0,
-        "active": "N",
-        "used": "N",
-        "group": 0
-      },
-      {
-        "logicalNodeAddress": 252,
-        "logicalAddress": 103,
-        "masterAddress": "192.168.0.97",
-        "masterPort": 5001,
-        "name": "unit 252:103",
-        "displayName": "unit 252:103",
-        "extendedType": 0,
-        "active": "N",
-        "used": "N",
-        "group": 0
-      },
-      {
-        "logicalNodeAddress": 252,
-        "logicalAddress": 100,
-        "masterAddress": "192.168.0.97",
-        "masterPort": 5001,
-        "name": "unit 252:100",
-        "displayName": "unit 252:100",
-        "extendedType": 0,
-        "active": "N",
-        "used": "N",
-        "group": 0
-      },
-      {
-        "logicalNodeAddress": 252,
-        "logicalAddress": 101,
-        "masterAddress": "192.168.0.97",
-        "masterPort": 5001,
-        "name": "unit 252:101",
-        "displayName": "unit 252:101",
-        "extendedType": 0,
-        "active": "N",
-        "used": "N",
-        "group": 0
-      },
-      {
-        "logicalNodeAddress": 252,
-        "logicalAddress": 105,
-        "masterAddress": "192.168.0.97",
-        "masterPort": 5001,
-        "name": "unit 252:105",
-        "displayName": "unit 252:105",
-        "extendedType": 0,
-        "active": "N",
-        "used": "N",
-        "group": 0
-      },
-      {
-        "logicalNodeAddress": 252,
-        "logicalAddress": 104,
-        "masterAddress": "192.168.0.97",
-        "masterPort": 5001,
-        "name": "unit 252:104",
-        "displayName": "unit 252:104",
-        "extendedType": 0,
-        "active": "N",
-        "used": "N",
-        "group": 0
-      },
-      {
-        "logicalNodeAddress": 252,
-        "logicalAddress": 106,
-        "masterAddress": "192.168.0.97",
-        "masterPort": 5001,
-        "name": "unit 252:106",
-        "displayName": "unit 252:106",
-        "extendedType": 0,
-        "active": "N",
-        "used": "N",
-        "group": 0
-      },
-      {
-        "logicalNodeAddress": 3,
-        "logicalAddress": 1,
-        "masterAddress": "192.168.0.97",
-        "masterPort": 5001,
-        "name": "unit 3:1",
-        "displayName": "unit 3:1",
-        "extendedType": 0,
-        "active": "N",
-        "used": "N",
-        "group": 0
-      },
-      {
-        "logicalNodeAddress": 3,
-        "logicalAddress": 0,
-        "masterAddress": "192.168.0.97",
-        "masterPort": 5001,
-        "name": "unit 3:0",
-        "displayName": "unit 3:0",
-        "extendedType": 0,
-        "active": "N",
-        "used": "N",
-        "group": 0
-      },
       {
         "logicalNodeAddress": 3,
-        "logicalAddress": 30,
-        "masterAddress": "192.168.0.97",
-        "masterPort": 5001,
-        "name": "unit 3:30",
-        "displayName": "unit 3:30",
-        "extendedType": 0,
-        "active": "N",
-        "used": "N",
-        "group": 0
-      },
-      {
-        "logicalNodeAddress": 3,
-        "logicalAddress": 29,
-        "masterAddress": "192.168.0.97",
-        "masterPort": 5001,
-        "name": "unit 3:29",
-        "displayName": "unit 3:29",
-        "extendedType": 0,
-        "active": "N",
-        "used": "N",
-        "group": 0
-      },
-      {
-        "logicalNodeAddress": 3,
-        "logicalAddress": 35,
-        "masterAddress": "192.168.0.97",
-        "masterPort": 5001,
-        "name": "unit 3:35",
-        "displayName": "unit 3:35",
-        "extendedType": 0,
-        "active": "N",
-        "used": "N",
-        "group": 0
-      },
-      {
-        "logicalNodeAddress": 3,
-        "logicalAddress": 34,
-        "masterAddress": "192.168.0.97",
-        "masterPort": 5001,
-        "name": "unit 3:34",
-        "displayName": "unit 3:34",
-        "extendedType": 0,
-        "active": "N",
-        "used": "N",
-        "group": 0
-      },
-      {
-        "logicalNodeAddress": 3,
-        "logicalAddress": 33,
-        "masterAddress": "192.168.0.97",
-        "masterPort": 5001,
-        "name": "unit 3:33",
-        "displayName": "unit 3:33",
-        "extendedType": 0,
-        "active": "N",
-        "used": "N",
-        "group": 0
-      },
-      {
-        "logicalNodeAddress": 3,
-        "logicalAddress": 36,
+        "logicalAddress": 4,
         "masterAddress": "192.168.0.97",
         "masterPort": 5001,
-        "name": "unit 3:36",
-        "displayName": "unit 3:36",
-        "extendedType": 0,
-        "active": "N",
-        "used": "N",
+        "name": "All off",
+        "displayName": "Alles uitje",
+        "extendedType": 7,
+        "active": "Y",
+        "used": "Y",
         "group": 0
       },
       {
@@ -558,23 +397,11 @@
         "logicalAddress": 5,
         "masterAddress": "192.168.0.97",
         "masterPort": 5001,
-        "name": "unit 3:5",
-        "displayName": "unit 3:5",
-        "extendedType": 0,
-        "active": "N",
-        "used": "N",
-        "group": 0
-      },
-      {
-        "logicalNodeAddress": 3,
-        "logicalAddress": 4,
-        "masterAddress": "192.168.0.97",
-        "masterPort": 5001,
-        "name": "unit 3:4",
-        "displayName": "unit 3:4",
-        "extendedType": 0,
-        "active": "N",
-        "used": "N",
+        "name": "All on",
+        "displayName": "Alles aantje",
+        "extendedType": 7,
+        "active": "Y",
+        "used": "Y",
         "group": 0
       }
     ]

package/duotecno/logger.js

@@ -18,6 +18,7 @@ exports.logSettings = {
     "protocol": LogLevel.noLog,
     "webapp": LogLevel.log,
     "p1": LogLevel.log,
+    "shelly": LogLevel.log,
     "power": LogLevel.log,
     "smartapp": LogLevel.log
 };

package/duotecno/logger.ts

@@ -13,6 +13,7 @@ export const logSettings = {
   "protocol": LogLevel.noLog,
   "webapp": LogLevel.log,
   "p1": LogLevel.log,
+  "shelly": LogLevel.log,
   "power": LogLevel.log,
   "smartapp": LogLevel.log
 };

package/duotecno/master.js

@@ -466,6 +466,7 @@ class Master extends base_1.Base {
     receiveUnitInfo(message) {
         const unitInfo = protocol_1.Protocol.makeUnitInfo(message);
         let unit = this.findUnit(unitInfo.logicalNodeAddress, unitInfo.logicalAddress);
+        this.info("> received unit info: " + unitInfo.name + " (" + unitInfo.logicalNodeAddress + "," + unitInfo.logicalAddress + ") for unit: " + (unit === null || unit === void 0 ? void 0 : unit.name));
         if (!unit) {
             // find if in config
             const cunit = this.system.config.cunits.find(u => ((u.logicalNodeAddress == unitInfo.logicalNodeAddress) && (u.logicalAddress == unitInfo.logicalAddress)));
@@ -473,7 +474,6 @@ class Master extends base_1.Base {
                 unitInfo.extendedType = cunit.extendedType;
             const node = this.findNode(unitInfo.logicalNodeAddress);
             if (node) {
-                this.info("> received unit info: " + unitInfo.name + " (" + unitInfo.logicalNodeAddress + "," + unitInfo.logicalAddress + ")");
                 unit = new protocol_1.Unit(node, unitInfo, this.system.config.mood);
                 node.units.push(unit);
             }

package/duotecno/master.ts

@@ -520,6 +520,8 @@ export class Master extends Base {
 
     let unit = this.findUnit(unitInfo.logicalNodeAddress, unitInfo.logicalAddress);
 
+    this.info("> received unit info: " + unitInfo.name + " ("+unitInfo.logicalNodeAddress+","+unitInfo.logicalAddress+") for unit: " + unit?.name);
+
     if (!unit) {
       // find if in config
       const cunit = this.system.config.cunits.find(u => ((u.logicalNodeAddress == unitInfo.logicalNodeAddress) && (u.logicalAddress == unitInfo.logicalAddress)));
@@ -527,7 +529,6 @@ export class Master extends Base {
 
       const node = this.findNode(unitInfo.logicalNodeAddress);
       if (node) {
-        this.info("> received unit info: " + unitInfo.name + " ("+unitInfo.logicalNodeAddress+","+unitInfo.logicalAddress+")");
         unit = new Unit(node, unitInfo, this.system.config.mood);
         node.units.push(unit);
       } else {

package/duotecno/system.js

@@ -159,28 +159,33 @@ class System extends base_1.Base {
         this.writeConfig();
     }
     setActiveState(item) {
+        // for nodes
         if (item instanceof protocol_1.Node) {
             const masterAddress = item.master.getAddress();
             const masterPort = item.master.getPort();
+            // check if at least 1 unit is used
             const unitConfig = this.config.cunits.find((cu) => (cu.logicalNodeAddress === item.logicalAddress) &&
                 (cu.masterAddress === masterAddress) &&
                 (cu.masterPort == masterPort));
-            // there exists an active unit of this node
+            // if there is: set active to true of this node
             item.active = !!unitConfig;
         }
+        // for units
         if (item instanceof protocol_1.Unit) {
             const masterAddress = item.node.master.getAddress();
             const masterPort = item.node.master.getPort();
+            // see if there is a config record for this unit
             const unitConfig = this.config.cunits.find((cu) => (cu.logicalAddress === item.logicalAddress) &&
                 (cu.logicalNodeAddress === item.logicalNodeAddress) &&
                 (cu.masterAddress === masterAddress) &&
                 (cu.masterPort == masterPort));
-            ;
+            // if there is: copy active, used, displayName and group
             if (unitConfig) {
                 item.active = (unitConfig.active === "Y");
                 item.used = (unitConfig.used === "Y");
                 item.displayName = unitConfig.displayName || unitConfig.name;
                 item.group = unitConfig.group;
+                (0, logger_1.log)("system", "System.setActiveState(unit) -> config name: " + unitConfig.name + ", item name: " + item.name);
             }
             else {
                 item.active = false;

package/duotecno/system.ts

@@ -166,31 +166,40 @@ export class System extends Base {
   }
 
   setActiveState(item: Node | Unit) {
+    // for nodes
     if (item instanceof Node) {
       const masterAddress = item.master.getAddress();
       const masterPort = item.master.getPort();
+
+      // check if at least 1 unit is used
       const unitConfig = this.config.cunits.find((cu: UnitConfig) => 
         (cu.logicalNodeAddress === item.logicalAddress) && 
         (cu.masterAddress === masterAddress) && 
         (cu.masterPort == masterPort));
 
-      // there exists an active unit of this node
+      // if there is: set active to true of this node
       item.active = !! unitConfig;
     }
+
+    // for units
     if (item instanceof Unit) {
       const masterAddress = item.node.master.getAddress();
       const masterPort = item.node.master.getPort();
+
+      // see if there is a config record for this unit
       const unitConfig = this.config.cunits.find((cu: UnitConfig) => 
         (cu.logicalAddress === item.logicalAddress) && 
         (cu.logicalNodeAddress === item.logicalNodeAddress) && 
         (cu.masterAddress === masterAddress) && 
         (cu.masterPort == masterPort));
-      ;
+      
+      // if there is: copy active, used, displayName and group
       if (unitConfig) {
         item.active = (unitConfig.active === "Y");
         item.used = (unitConfig.used === "Y");
         item.displayName = unitConfig.displayName || unitConfig.name;
         item.group = unitConfig.group;
+        log("system", "System.setActiveState(unit) -> config name: " + unitConfig.name + ", item name: " + item.name);
       } else {
         item.active = false;
       }

package/duotecno/types.js

@@ -254,6 +254,7 @@ exports.Sanitizers = {
     powerbase: function (config) {
         if (!config)
             config = {};
+        config.debug = config.debug || false;
         config.rules = config.rules || [];
         config.rules = config.rules.map(sw => exports.Sanitizers.ruleConfig(sw));
         config.bindings = config.bindings || [];
@@ -269,12 +270,17 @@ exports.Sanitizers = {
         return cfg;
     },
     p1: function (config) {
-        config = exports.Sanitizers.powerbase(config);
-        return config;
+        if (!config)
+            config = {};
+        const cfg = exports.Sanitizers.powerbase(config);
+        return cfg;
     },
     shelly: function (config) {
-        config = exports.Sanitizers.powerbase(config);
-        return config;
+        if (!config)
+            config = {};
+        const cfg = exports.Sanitizers.powerbase(config);
+        cfg.addresses = (config === null || config === void 0 ? void 0 : config.addresses) || "";
+        return cfg;
     },
     switchConfig: function (aSwitch) {
         const sw = exports.Sanitizers.unitDef(aSwitch);
@@ -324,6 +330,9 @@ exports.Sanitizers = {
         b.power = binding.power || NaN;
         return b;
     },
+    //////////////
+    // Duotecno //
+    //////////////
     masterConfig: function (config) {
         config = (config) ? Object.assign({}, config) : {};
         config.name = config.name || "IP Master";

package/duotecno/types.ts

@@ -259,6 +259,13 @@ export interface SmartAppConfig extends BaseConfig {
   switches: Array<Switch>;
 }
 
+/////////////////////
+// Smartapp config //
+/////////////////////
+export interface BaseConfig {
+  debug?: boolean;
+}
+
 ///////////
 // Power //
 ///////////
@@ -273,6 +280,7 @@ export interface SmappeeConfig extends PowerBaseConfig {
 export interface P1Config extends PowerBaseConfig {
 }
 export interface ShellyConfig extends PowerBaseConfig {
+  addresses: string;
 }
 
 ////////////////
@@ -291,9 +299,7 @@ export interface Bridge {
   pin: string         // "577-02-003"
 };
 
-export interface BaseConfig {
-  debug?: boolean;
-}
+
 export interface PlatformConfig extends BaseConfig {
   manufacturer: string;
   platform: string;
@@ -428,6 +434,7 @@ export const Sanitizers = {
 
   powerbase: function(config: PowerBaseConfig): PowerBaseConfig {
     if (!config) config = <PowerBaseConfig>{};
+    config.debug = config.debug || false;
 
     config.rules = config.rules || [];
     config.rules = config.rules.map(sw => Sanitizers.ruleConfig(sw));
@@ -441,21 +448,23 @@ export const Sanitizers = {
 
   smappee: function(config: SmappeeConfig): SmappeeConfig {
     if (!config) config = <SmappeeConfig>{};
-
     const cfg = <SmappeeConfig> Sanitizers.powerbase(config);
 
     cfg.uid = config.uid || "--none--";
     return cfg;
   },
   p1: function(config: P1Config): P1Config {
-    config = Sanitizers.powerbase(config);
+    if (!config) config = <P1Config>{};
+    const cfg = Sanitizers.powerbase(config);
 
-    return config;
+    return cfg;
   },
   shelly: function(config: ShellyConfig): ShellyConfig {
-    config = Sanitizers.powerbase(config);
-
-    return config;
+    if (!config) config = <ShellyConfig>{};
+    const cfg = <ShellyConfig> Sanitizers.powerbase(config);
+    
+    cfg.addresses = config?.addresses || "";
+    return cfg;
   },
 
   switchConfig: function(aSwitch): Switch {
@@ -510,6 +519,9 @@ export const Sanitizers = {
     return b;
   },
 
+  //////////////
+  // Duotecno //
+  //////////////
   masterConfig: function(config?: MasterConfig): MasterConfig {
     config = (config) ? {...config} : <MasterConfig>{};
 

package/package.json

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

package/server/base.js

@@ -14,7 +14,9 @@ class Base {
         else
             this.readConfig();
         if (this.debug)
-            logger_1.logSettings["system"] = logger_1.LogLevel.debug;
+            logger_1.logSettings[this.type] = logger_1.LogLevel.debug;
+        else if (logger_1.logSettings[this.type] == logger_1.LogLevel.debug)
+            logger_1.logSettings[this.type] = logger_1.LogLevel.log;
         (0, logger_1.debug)("system", "==== read config -> " + JSON.stringify(this.config));
     }
     //////////////////

package/server/base.ts

@@ -21,7 +21,9 @@ export class Base {
       this.readConfig();
       
     if (this.debug)
-      logSettings["system"] = LogLevel.debug;
+      logSettings[this.type] = LogLevel.debug;
+    else if (logSettings[this.type] == LogLevel.debug)
+      logSettings[this.type] = LogLevel.log;
 
     debug("system", "==== read config -> " + JSON.stringify(this.config))
   }

package/server/p1.js

@@ -92,48 +92,48 @@ class P1 extends powerbase_1.PowerBase {
         });
     }
     consume(data) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
         if (!data['32.7.0'])
             return;
-        this.voltages = [(_a = data['32.7.0']) === null || _a === void 0 ? void 0 : _a.value, (_b = data['52.7.0']) === null || _b === void 0 ? void 0 : _b.value, (_c = data['72.7.0']) === null || _c === void 0 ? void 0 : _c.value];
-        this.realtime = { totalPower: ((_d = data['1.7.0']) === null || _d === void 0 ? void 0 : _d.value) * 1000,
-            totalReactivePower: ((_e = data['2.7.0']) === null || _e === void 0 ? void 0 : _e.value) * 1000,
-            totalExportEnergy: ((_f = data['2.8.1']) === null || _f === void 0 ? void 0 : _f.value) + ((_g = data['2.8.2']) === null || _g === void 0 ? void 0 : _g.value),
-            totalImportEnergy: ((_h = data['1.8.1']) === null || _h === void 0 ? void 0 : _h.value) + ((_j = data['1.8.2']) === null || _j === void 0 ? void 0 : _j.value),
-            monitorStatus: 0, utcTimeStamp: new Date().getTime() };
         this.channels = {
             0: {
-                name: "Zonnepanelen L1", type: "CT", flow: "PRODUCTION",
-                power: ((_k = data['22.7.0']) === null || _k === void 0 ? void 0 : _k.value) * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 0,
+                name: "Zonnepanelen L1", type: "CT", flow: "PRODUCTION", voltage: (_a = data['32.7.0']) === null || _a === void 0 ? void 0 : _a.value,
+                power: ((_b = data['22.7.0']) === null || _b === void 0 ? void 0 : _b.value) * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 0,
                 current: 0, apparentPower: 0, cosPhi: 0, formula: ""
             },
             1: {
-                name: "Zonnepanelen L2", type: "CT", flow: "PRODUCTION",
-                power: ((_l = data['42.7.0']) === null || _l === void 0 ? void 0 : _l.value) * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 1,
+                name: "Zonnepanelen L2", type: "CT", flow: "PRODUCTION", voltage: (_c = data['52.7.0']) === null || _c === void 0 ? void 0 : _c.value,
+                power: ((_d = data['42.7.0']) === null || _d === void 0 ? void 0 : _d.value) * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 1,
                 current: 0, apparentPower: 0, cosPhi: 0, formula: ""
             },
             2: {
-                name: "Zonnepanelen L3", type: "CT", flow: "PRODUCTION",
-                power: ((_m = data['62.7.0']) === null || _m === void 0 ? void 0 : _m.value) * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 2,
+                name: "Zonnepanelen L3", type: "CT", flow: "PRODUCTION", voltage: (_e = data['72.7.0']) === null || _e === void 0 ? void 0 : _e.value,
+                power: ((_f = data['62.7.0']) === null || _f === void 0 ? void 0 : _f.value) * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 2,
                 current: 0, apparentPower: 0, cosPhi: 0, formula: ""
             },
             3: {
-                name: "Grid L1", type: "CT", flow: "CONSUMPTION",
-                power: ((_o = data['21.7.0']) === null || _o === void 0 ? void 0 : _o.value) * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 0,
-                current: (_p = data['31.7.0']) === null || _p === void 0 ? void 0 : _p.value, apparentPower: 0, cosPhi: 0, formula: ""
+                name: "Grid L1", type: "CT", flow: "CONSUMPTION", voltage: (_g = data['32.7.0']) === null || _g === void 0 ? void 0 : _g.value,
+                power: ((_h = data['21.7.0']) === null || _h === void 0 ? void 0 : _h.value) * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 0,
+                current: (_j = data['31.7.0']) === null || _j === void 0 ? void 0 : _j.value, apparentPower: 0, cosPhi: 0, formula: ""
             },
             4: {
-                name: "Grid L2", type: "CT", flow: "CONSUMPTION",
-                power: ((_q = data['41.7.0']) === null || _q === void 0 ? void 0 : _q.value) * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 1,
-                current: (_r = data['51.7.0']) === null || _r === void 0 ? void 0 : _r.value, apparentPower: 0, cosPhi: 0, formula: ""
+                name: "Grid L2", type: "CT", flow: "CONSUMPTION", voltage: (_k = data['52.7.0']) === null || _k === void 0 ? void 0 : _k.value,
+                power: ((_l = data['41.7.0']) === null || _l === void 0 ? void 0 : _l.value) * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 1,
+                current: (_m = data['51.7.0']) === null || _m === void 0 ? void 0 : _m.value, apparentPower: 0, cosPhi: 0, formula: ""
             },
             5: {
-                name: "Grid L3", type: "CT", flow: "CONSUMPTION",
-                power: ((_s = data['61.7.0']) === null || _s === void 0 ? void 0 : _s.value) * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 2,
-                current: (_t = data['71.7.0']) === null || _t === void 0 ? void 0 : _t.value, apparentPower: 0, cosPhi: 0, formula: ""
+                name: "Grid L3", type: "CT", flow: "CONSUMPTION", voltage: (_o = data['72.7.0']) === null || _o === void 0 ? void 0 : _o.value,
+                power: ((_p = data['61.7.0']) === null || _p === void 0 ? void 0 : _p.value) * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 2,
+                current: (_q = data['71.7.0']) === null || _q === void 0 ? void 0 : _q.value, apparentPower: 0, cosPhi: 0, formula: ""
             }
         };
         // console.log(data);
+        this.voltages = [(_r = data['32.7.0']) === null || _r === void 0 ? void 0 : _r.value, (_s = data['52.7.0']) === null || _s === void 0 ? void 0 : _s.value, (_t = data['72.7.0']) === null || _t === void 0 ? void 0 : _t.value];
+        this.realtime = { totalPower: ((_u = data['1.7.0']) === null || _u === void 0 ? void 0 : _u.value) * 1000,
+            totalReactivePower: ((_v = data['2.7.0']) === null || _v === void 0 ? void 0 : _v.value) * 1000,
+            totalExportEnergy: ((_w = data['2.8.1']) === null || _w === void 0 ? void 0 : _w.value) + ((_x = data['2.8.2']) === null || _x === void 0 ? void 0 : _x.value),
+            totalImportEnergy: ((_y = data['1.8.1']) === null || _y === void 0 ? void 0 : _y.value) + ((_z = data['1.8.2']) === null || _z === void 0 ? void 0 : _z.value),
+            monitorStatus: 0, utcTimeStamp: new Date().getTime() };
         this.production = this.realtime.totalPower;
         this.consumption = this.realtime.totalReactivePower;
     }