homebridge-enphase-envoy 10.3.1-beta.4 → 10.3.1-beta.6

package/package.json

@@ -2,7 +2,7 @@
     "private": false,
     "displayName": "Enphase Envoy",
     "name": "homebridge-enphase-envoy",
-    "version": "10.3.1-beta.4",
+    "version": "10.3.1-beta.6",
     "description": "Homebridge p7ugin for Photovoltaic Energy System manufactured by Enphase.",
     "license": "MIT",
     "author": "grzegorz914",

package/src/envoydata.js

@@ -908,8 +908,8 @@ class EnvoyData extends EventEmitter {
 
             const comm = home.comm ?? {};
             const network = home.network ?? {};
-            const wirelessConnections = home.wireless_connection ?? [];
-            const networkInterfaces = network.interfaces ?? [];
+            const networkInterfaces = (network.interfaces ?? []).filter(iface => iface.ip !== '169.254.120.1');
+            const wirelessConnections = (home.wireless_connection ?? []).filter(kit => kit.signal_strength_max > 0);
 
             // Communication device support flags
             const microinvertersSupported = 'pcu' in comm;
@@ -927,11 +927,11 @@ class EnvoyData extends EventEmitter {
             this.feature.inventory.esubs.encharges.supported = enchargesSupported;
 
             this.feature.home.networkInterfaces.supported = networkInterfaces.length > 0;
-            this.feature.home.networkInterfaces.installed = networkInterfaces.some(i => i.signal_strength_max > 0);
+            this.feature.home.networkInterfaces.installed = networkInterfaces.some(i => i.carrier);
             this.feature.home.networkInterfaces.count = networkInterfaces.length;
 
             this.feature.home.wirelessConnections.supported = wirelessConnections.length > 0;
-            this.feature.home.wirelessConnections.installed = wirelessConnections.some(w => w.signal_strength_max > 0);
+            this.feature.home.wirelessConnections.installed = wirelessConnections.some(w => w.connected);
             this.feature.home.wirelessConnections.count = wirelessConnections.length;
             this.feature.home.supported = true;
 

package/src/envoydevice.js

@@ -3109,13 +3109,6 @@ class EnvoyDevice extends EventEmitter {
                     this.emit('devInfo', `SerialNr: ${info.serialNumber}`);
                     this.emit('devInfo', `Time: ${this.functions.formatTimestamp(info.time, timeZone)}`);
                     this.emit('devInfo', `------------------------------`);
-                    if (this.energyMeter) {
-                        this.emit('devInfo', `Eve Energy Meter: ${this.energyMeter ? 'Enabled' : 'Disabled'}`);
-                        this.emit('devInfo', `Production: Enabled`);
-                        if (feature.meters.consumptionNet.supported) this.emit('devInfo', `Consumption Net: ${feature.meters.consumptionNet.enabled ? 'Enabled' : 'Disabled'}`);
-                        if (feature.meters.consumptionTotal.supported) this.emit('devInfo', `Consumption Total: ${feature.meters.consumptionTotal.enabled ? 'Enabled' : 'Disabled'}`);
-                        this.emit('devInfo', `------------------------------`);
-                    }
 
                     // Inventory
                     let hasInventoryInfo = false;
@@ -3172,6 +3165,15 @@ class EnvoyDevice extends EventEmitter {
 
                         this.emit('devInfo', `--------------------------------`);
                     }
+
+                    // Eve Energy Meter
+                    if (this.energyMeter) {
+                        this.emit('devInfo', `EVE Meter: Yes`);
+                        this.emit('devInfo', `Production: Enabled`);
+                        if (feature.meters.consumptionNet.supported) this.emit('devInfo', `Consumption Net: ${feature.meters.consumptionNet.enabled ? 'Enabled' : 'Disabled'}`);
+                        if (feature.meters.consumptionTotal.supported) this.emit('devInfo', `Consumption Total: ${feature.meters.consumptionTotal.enabled ? 'Enabled' : 'Disabled'}`);
+                        this.emit('devInfo', `------------------------------`);
+                    }
                 })
                 .on('updateDataSampling', (state) => {
                     if (this.logDebug) this.emit('debug', `Update data sampling`);
@@ -3203,7 +3205,7 @@ class EnvoyDevice extends EventEmitter {
                         const comm = home.comm ?? {};
                         const network = home.network ?? {};
                         const wirelessConnections = home.wireless_connection ?? [];
-                        const networkInterfaces = network.interfaces ?? [];
+                        const networkInterfaces = network.interfaces ?? []
                         // Communication device support flags
                         const commEnsemble = comm.esub ?? {};
                         const commEncharges = Array.isArray(comm.encharge) ? comm.encharge : [];