homebridge-enphase-envoy 10.2.1 → 10.2.2-beta.0

package/package.json

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

package/src/envoydevice.js

@@ -4065,8 +4065,10 @@ class EnvoyDevice extends EventEmitter {
 
                 if (this.logInfo) {
                     this.emit('info', `Power And Energy, ${obj.measurementType}, power: ${obj.powerKw} kW`);
-                    this.emit('info', `Power And Energy, ${obj.measurementType}, power peak: ${obj.powerPeakKw} kW`);
-                    if (!this.feature.liveData.supported || !this.feature.meters.production.enabled) this.emit('info', `Power And Energy, ${obj.measurementType}, power level: ${obj.powerLevel} %`);
+                    if (key === 'production' && (!this.feature.liveData.supported || !this.feature.meters.production.enabled)) {
+                        this.emit('info', `Power And Energy, ${obj.measurementType}, power level: ${obj.powerLevel} %`);
+                        this.emit('info', `Power And Energy, ${obj.measurementType}, power state: ${obj.powerState ? 'On' : 'Off'}`);
+                    }
                     this.emit('info', `Power And Energy, ${obj.measurementType}, energy today: ${obj.energyTodayKw} kWh`);
                     this.emit('info', `Power And Energy, ${obj.measurementType}, energy last seven days: ${obj.energyLastSevenDaysKw} kWh`);
                     this.emit('info', `Power And Energy, ${obj.measurementType}, energy lifetime: ${obj.energyLifetimeKw} kWh`);
@@ -6064,36 +6066,18 @@ class EnvoyDevice extends EventEmitter {
         }
 
         // Meters
-        if (this.feature.meters.installed) {
+        if (this.feature.meters.supported) {
             this.emit('devInfo', `Meters: Yes`);
 
-            if (this.feature.meters.production.supported) {
-                this.emit('devInfo', `Production: ${this.feature.meters.production.enabled ? 'Enabled' : 'Disabled'}`);
-            }
-            if (this.feature.meters.consumptionNet.supported) {
-                this.emit('devInfo', `Consumption Net: ${this.feature.meters.consumptionNet.enabled ? 'Enabled' : 'Disabled'}`);
-            }
-            if (this.feature.meters.consumptionTotal.supported) {
-                this.emit('devInfo', `Consumption Total: ${this.feature.meters.consumptionTotal.enabled ? 'Enabled' : 'Disabled'}`);
-            }
-            if (this.feature.meters.storage.supported) {
-                this.emit('devInfo', `Storage: ${this.feature.meters.storage.enabled ? 'Enabled' : 'Disabled'}`);
-            }
-            if (this.feature.meters.backfeed.supported) {
-                this.emit('devInfo', `Back Feed: ${this.feature.meters.backfeed.enabled ? 'Enabled' : 'Disabled'}`);
-            }
-            if (this.feature.meters.load.supported) {
-                this.emit('devInfo', `Load: ${this.feature.meters.load.enabled ? 'Enabled' : 'Disabled'}`);
-            }
-            if (this.feature.meters.evse.supported) {
-                this.emit('devInfo', `EV Charger: ${this.feature.meters.evse.enabled ? 'Enabled' : 'Disabled'}`);
-            }
-            if (this.feature.meters.pv3p.supported) {
-                this.emit('devInfo', `PV 3P: ${this.feature.meters.pv3p.enabled ? 'Enabled' : 'Disabled'}`);
-            }
-            if (this.feature.meters.generator.supported) {
-                this.emit('devInfo', `Generator: ${this.feature.meters.generator.enabled ? 'Enabled' : 'Disabled'}`);
-            }
+            if (this.feature.meters.production.supported) this.emit('devInfo', `Production: ${this.feature.meters.production.enabled ? 'Enabled' : 'Disabled'}`);
+            if (this.feature.meters.consumptionNet.supported) this.emit('devInfo', `Consumption Net: ${this.feature.meters.consumptionNet.enabled ? 'Enabled' : 'Disabled'}`);
+            if (this.feature.meters.consumptionTotal.supported) this.emit('devInfo', `Consumption Total: ${this.feature.meters.consumptionTotal.enabled ? 'Enabled' : 'Disabled'}`);
+            if (this.feature.meters.storage.supported) this.emit('devInfo', `Storage: ${this.feature.meters.storage.enabled ? 'Enabled' : 'Disabled'}`);
+            if (this.feature.meters.backfeed.supported) this.emit('devInfo', `Back Feed: ${this.feature.meters.backfeed.enabled ? 'Enabled' : 'Disabled'}`);
+            if (this.feature.meters.load.supported) this.emit('devInfo', `Load: ${this.feature.meters.load.enabled ? 'Enabled' : 'Disabled'}`);
+            if (this.feature.meters.evse.supported) this.emit('devInfo', `EV Charger: ${this.feature.meters.evse.enabled ? 'Enabled' : 'Disabled'}`);
+            if (this.feature.meters.pv3p.supported) this.emit('devInfo', `PV 3P: ${this.feature.meters.pv3p.enabled ? 'Enabled' : 'Disabled'}`);
+            if (this.feature.meters.generator.supported) this.emit('devInfo', `Generator: ${this.feature.meters.generator.enabled ? 'Enabled' : 'Disabled'}`);
 
             this.emit('devInfo', `--------------------------------`);
         }
@@ -6101,31 +6085,16 @@ class EnvoyDevice extends EventEmitter {
         // Ensemble
         const ensemble = this.feature.inventory.esubs;
         const hasEnsembleInfo = ensemble.enpowers.installed || ensemble.encharges.installed || ensemble.enpowers.dryContacts.installed || ensemble.generator.installed;
-
         if (hasEnsembleInfo) {
             this.emit('devInfo', `Ensemble: Yes`);
 
-            if (ensemble.enpowers.installed) {
-                this.emit('devInfo', `Enpowers: ${ensemble.enpowers.count}`);
-            }
-            if (ensemble.enpowers.dryContacts.installed) {
-                this.emit('devInfo', `Dry Contacts: ${ensemble.enpowers.dryContacts.count}`);
-            }
-            if (ensemble.encharges.installed) {
-                this.emit('devInfo', `IQ Battery: ${ensemble.encharges.count}`);
-            }
-            if (ensemble.collars.installed) {
-                this.emit('devInfo', `IQ Meter Collar: ${ensemble.collars.count}`);
-            }
-            if (ensemble.c6CombinerControllers.installed) {
-                this.emit('devInfo', `IQ Combiner Controller C6: ${ensemble.c6CombinerControllers.count}`);
-            }
-            if (ensemble.c6Rgms.installed) {
-                this.emit('devInfo', `IQ Rgm C6: ${ensemble.c6Rgms.count}`);
-            }
-            if (ensemble.generator.installed) {
-                this.emit('devInfo', `Generator: Yes`);
-            }
+            if (ensemble.enpowers.installed) this.emit('devInfo', `Enpowers: ${ensemble.enpowers.count}`);
+            if (ensemble.enpowers.dryContacts.installed) this.emit('devInfo', `Dry Contacts: ${ensemble.enpowers.dryContacts.count}`);
+            if (ensemble.encharges.installed) this.emit('devInfo', `IQ Battery: ${ensemble.encharges.count}`);
+            if (ensemble.collars.installed) this.emit('devInfo', `IQ Meter Collar: ${ensemble.collars.count}`);
+            if (ensemble.c6CombinerControllers.installed) this.emit('devInfo', `IQ Combiner Controller C6: ${ensemble.c6CombinerControllers.count}`);
+            if (ensemble.c6Rgms.installed) this.emit('devInfo', `IQ Rgm C6: ${ensemble.c6Rgms.count}`);
+            if (ensemble.generator.installed) this.emit('devInfo', `Generator: Yes`);
 
             this.emit('devInfo', `--------------------------------`);
         }
@@ -6194,62 +6163,64 @@ class EnvoyDevice extends EventEmitter {
                 .setCharacteristic(Characteristic.FirmwareRevision, this.pv.info.software.replace(/[a-zA-Z]/g, '') ?? '0');
 
             //system
-            if (this.logDebug) this.emit('debug', `Prepare System Service`);
-            const { serviceType, characteristicType, characteristicType1, state, level } = this.systemAccessory;
-
-            const systemService = accessory.addService(serviceType, accessoryName, `systemService`);
-            systemService.setPrimaryService(true);
-            systemService.addOptionalCharacteristic(Characteristic.ConfiguredName);
-            systemService.setCharacteristic(Characteristic.ConfiguredName, accessoryName);
-
-            // Handle production state characteristic
-            systemService.getCharacteristic(characteristicType)
-                .onGet(async () => {
-                    if (this.logInfo) this.emit('info', `Production state: ${state ? 'Enabled' : 'Disabled'}`);
-                    return state;
-                })
-                .onSet(async (value) => {
-                    if (!productionStateSupported || !pvControl) {
-                        if (this.logWarn) this.emit('warn', !productionStateSupported ? `Production state control not supported` : `System control is locked`);
-                        setTimeout(() => systemService.updateCharacteristic(characteristicType, !value), 250);
-                        return;
-                    }
+            if (this.systemAccessory) {
+                if (this.logDebug) this.emit('debug', `Prepare System Service`);
+                const { serviceType, characteristicType, characteristicType1, state, level } = this.systemAccessory;
 
-                    try {
-                        const tokenValid = await this.checkToken();
-                        if (!tokenValid || value === this.pv.productionState) {
+                const systemService = accessory.addService(serviceType, accessoryName, `systemService`);
+                systemService.setPrimaryService(true);
+                systemService.addOptionalCharacteristic(Characteristic.ConfiguredName);
+                systemService.setCharacteristic(Characteristic.ConfiguredName, accessoryName);
+
+                // Handle production state characteristic
+                systemService.getCharacteristic(characteristicType)
+                    .onGet(async () => {
+                        if (this.logInfo) this.emit('info', `Production state: ${state ? 'Enabled' : 'Disabled'}`);
+                        return state;
+                    })
+                    .onSet(async (value) => {
+                        if (!productionStateSupported || !pvControl) {
+                            if (this.logWarn) this.emit('warn', !productionStateSupported ? `Production state control not supported` : `System control is locked`);
                             setTimeout(() => systemService.updateCharacteristic(characteristicType, !value), 250);
                             return;
                         }
 
-                        await this.setProductionState(value);
-                        if (this.logDebug) this.emit('debug', `Set production state: ${value ? 'Enabled' : 'Disabled'}`);
-                    } catch (error) {
-                        if (this.logWarn) this.emit('warn', `Set production state error: ${error}`);
-                    }
-                });
+                        try {
+                            const tokenValid = await this.checkToken();
+                            if (!tokenValid || value === this.pv.productionState) {
+                                setTimeout(() => systemService.updateCharacteristic(characteristicType, !value), 250);
+                                return;
+                            }
 
-            // Handle production level characteristic
-            systemService.getCharacteristic(characteristicType1)
-                .onGet(async () => {
-                    if (this.logInfo) this.emit('info', `Production level: ${level} %`);
-                    return level;
-                })
-                .onSet(async (value) => {
-                    if (!pvControl) {
-                        if (this.logWarn) this.emit('warn', `System control is locked`);
-                        setTimeout(() => systemService.updateCharacteristic(characteristicType1, level), 250);
-                        return;
-                    }
+                            await this.setProductionState(value);
+                            if (this.logDebug) this.emit('debug', `Set production state: ${value ? 'Enabled' : 'Disabled'}`);
+                        } catch (error) {
+                            if (this.logWarn) this.emit('warn', `Set production state error: ${error}`);
+                        }
+                    });
 
-                    try {
-                        systemService.updateCharacteristic(characteristicType1, level);
-                    } catch (error) {
-                        if (this.logWarn) this.emit('warn', `Set production level error: ${error}`);
-                    }
-                });
+                // Handle production level characteristic
+                systemService.getCharacteristic(characteristicType1)
+                    .onGet(async () => {
+                        if (this.logInfo) this.emit('info', `Production level: ${level} %`);
+                        return level;
+                    })
+                    .onSet(async (value) => {
+                        if (!pvControl) {
+                            if (this.logWarn) this.emit('warn', `System control is locked`);
+                            setTimeout(() => systemService.updateCharacteristic(characteristicType1, level), 250);
+                            return;
+                        }
 
-            this.systemService = systemService;
+                        try {
+                            systemService.updateCharacteristic(characteristicType1, level);
+                        } catch (error) {
+                            if (this.logWarn) this.emit('warn', `Set production level error: ${error}`);
+                        }
+                    });
+
+                this.systemService = systemService;
+            }
 
             //data refresh control
             if (this.dataRefreshActiveControl) {