homebridge-enphase-envoy 9.3.6 → 9.3.7-beta.0

package/package.json

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

package/src/envoydevice.js

@@ -2423,17 +2423,17 @@ class EnvoyDevice extends EventEmitter {
                     energy: (acBatteries.whNow + this.acBatterieStorageOffset) ?? 0,
                     energyKw: (acBatteries.whNow + this.acBatterieStorageOffset) / 1000 ?? 0,
                     chargeStatus: CONSTANTS.ApiCodes[acBatteries.state] ?? 'Unknown',
-                    energyState: acBatteries.whNow > 0 ?? false,
-                    percentFull: 0
+                    energyStateSum: acBatteries.whNow > 0 ?? false,
+                    percentFullSum: 0
                 };
                 //add  ac batterie summary to pv object
                 this.pv.production.ct.acBatterie = acBatterie;
 
                 //update chaaracteristics
-                if (this.enphaseAcBatterieSummaryLevelAndStateService) {
-                    this.enphaseAcBatterieSummaryLevelAndStateService
-                        .updateCharacteristic(Characteristic.On, acBatterie.energyState)
-                        .updateCharacteristic(Characteristic.Brightness, acBatterie.percentFull)
+                if (this.acBatteriesSummaryLevelAndStateService) {
+                    this.acBatteriesSummaryLevelAndStateService
+                        .updateCharacteristic(Characteristic.On, acBatterie.energyStateSum)
+                        .updateCharacteristic(Characteristic.Brightness, acBatterie.percentFullSum)
                 }
 
                 if (this.acBatterieSummaryService) {
@@ -2441,7 +2441,7 @@ class EnvoyDevice extends EventEmitter {
                         .updateCharacteristic(Characteristic.enphaseAcBatterieSummaryReadingTime, acBatterie.readingTime)
                         .updateCharacteristic(Characteristic.enphaseAcBatterieSummaryPower, acBatterie.powerKw)
                         .updateCharacteristic(Characteristic.enphaseAcBatterieSummaryEnergy, acBatterie.energyKw)
-                        .updateCharacteristic(Characteristic.enphaseAcBatterieSummaryPercentFull, acBatterie.percentFull)
+                        .updateCharacteristic(Characteristic.enphaseAcBatterieSummaryPercentFull, acBatterie.percentFullSum)
                         .updateCharacteristic(Characteristic.enphaseAcBatterieSummaryActiveCount, acBatterie.activeCount)
                         .updateCharacteristic(Characteristic.enphaseAcBatterieSummaryState, acBatterie.chargeStatus);
                 }
@@ -2604,12 +2604,12 @@ class EnvoyDevice extends EventEmitter {
 
                     //calculate encharges percent full summ
                     this.ensemble.encharges.percentFullSum = (enchargesPercentFullSummary.reduce((total, num) => total + num, 0) / enchargesData.length) ?? 0;
-                    this.ensemble.encharges.energyState = this.ensemble.encharges.percentFullSum > 0;
+                    this.ensemble.encharges.energyStateSum = this.ensemble.encharges.percentFullSum > 0;
 
                     //update services
-                    if (this.enphaseEnchargesSummaryLevelAndStateService) {
-                        this.enphaseEnchargesSummaryLevelAndStateService
-                            .updateCharacteristic(Characteristic.On, this.ensemble.encharges.energyState)
+                    if (this.enchargesSummaryLevelAndStateService) {
+                        this.enchargesSummaryLevelAndStateService
+                            .updateCharacteristic(Characteristic.On,  this.ensemble.encharges.energyStateSum)
                             .updateCharacteristic(Characteristic.Brightness, this.ensemble.encharges.percentFullSum)
                     }
 
@@ -4192,10 +4192,10 @@ class EnvoyDevice extends EventEmitter {
         this.emit('devInfo', `Time: ${this.pv.envoy.time}`);
         const displayLog = this.envoyFirmware7xx && this.envoyFirmware7xxTokenGenerationMode === 0 ? this.emit('devInfo', `Token Valid: ${new Date(this.jwtToken.expires_at * 1000).toLocaleString()}`) : false;
         this.emit('devInfo', `------------------------------`);
-        this.emit('devInfo', `Q-Relays: ${this.feature.qRelays.count}`);
+        const displayLog12 = this.feature.qRelays.installed ? this.emit('devInfo', `Q-Relays: ${this.feature.qRelays.count}`) : false;
         this.emit('devInfo', `Inverters: ${this.feature.microinverters.count}`);
-        const displayLog12 = this.feature.acBatteries.installed ? this.emit('devInfo', `AC Batteries: ${this.feature.acBatteries.count}`) : false;
-        this.emit('devInfo', `--------------------------------`);
+        const displayLog13 = this.feature.acBatteries.installed ? this.emit('devInfo', `AC Batteries: ${this.feature.acBatteries.count}`) : false;
+        const displayLog14 = this.feature.qRelays.installed || this.feature.acBatteries.installed ? this.emit('devInfo', `--------------------------------`) : false;
         const displayLog0 = this.feature.meters.installed ? this.emit('devInfo', `Meters: Yes`) : false;
         const displayLog1 = this.feature.meters.installed && this.feature.meters.production.supported ? this.emit('devInfo', `Production: ${this.feature.meters.production.enabled ? `Enabled` : `Disabled`}`) : false;
         const displayLog2 = this.feature.meters.installed && this.feature.meters.consumption.supported ? this.emit('devInfo', `Consumption: ${this.feature.meters.consumption.enabled ? `Enabled` : `Disabled`}`) : false;
@@ -4834,26 +4834,26 @@ class EnvoyDevice extends EventEmitter {
                 if (productionCtAcBatterieSupported) {
                     //ac batteries summary level and state
                     const debug2 = this.enableDebugMode ? this.emit('debug', `Prepare AC Batteries Summary Service`) : false;
-                    this.enphaseAcBatterieSummaryLevelAndStateService = accessory.addService(Service.Lightbulb, `AC Batteries`, `enphaseAcBatterieSummaryLevelAndStateService`);
-                    this.enphaseAcBatterieSummaryLevelAndStateService.addOptionalCharacteristic(Characteristic.ConfiguredName);
-                    this.enphaseAcBatterieSummaryLevelAndStateService.setCharacteristic(Characteristic.ConfiguredName, `AC Batteries`);
-                    this.enphaseAcBatterieSummaryLevelAndStateService.getCharacteristic(Characteristic.On)
+                    this.acBatteriesSummaryLevelAndStateService = accessory.addService(Service.Lightbulb, `AC Batteries`, `acBatteriesSummaryLevelAndStateService`);
+                    this.acBatteriesSummaryLevelAndStateService.addOptionalCharacteristic(Characteristic.ConfiguredName);
+                    this.acBatteriesSummaryLevelAndStateService.setCharacteristic(Characteristic.ConfiguredName, `AC Batteries`);
+                    this.acBatteriesSummaryLevelAndStateService.getCharacteristic(Characteristic.On)
                         .onGet(async () => {
-                            const state = this.pv.production.ct.acBatterie.energyState;
+                            const state = this.pv.production.ct.acBatterie.energyStateSum;
                             const info = this.disableLogInfo ? false : this.emit('message', `AC Batteries energy state: ${state ? 'Charged' : 'Discharged'}`);
                             return state;
                         })
                         .onSet(async (state) => {
-                            this.enphaseAcBatterieSummaryLevelAndStateService.updateCharacteristic(Characteristic.On, this.pv.production.ct.acBatterie.energyState);
+                            this.acBatteriesSummaryLevelAndStateService.updateCharacteristic(Characteristic.On, this.pv.production.ct.acBatterie.energyStateSum);
                         })
-                    this.enphaseAcBatterieSummaryLevelAndStateService.getCharacteristic(Characteristic.Brightness)
+                    this.acBatteriesSummaryLevelAndStateService.getCharacteristic(Characteristic.Brightness)
                         .onGet(async () => {
-                            const state = this.pv.production.ct.acBatterie.percentFull;
-                            const info = this.disableLogInfo ? false : this.emit('message', `AC Batteries energy level: ${this.pv.production.ct.acBatterie.percentFull} %`);
+                            const state = this.pv.production.ct.acBatterie.percentFullSum;
+                            const info = this.disableLogInfo ? false : this.emit('message', `AC Batteries energy level: ${this.pv.production.ct.acBatterie.percentFullSum} %`);
                             return state;
                         })
                         .onSet(async (value) => {
-                            this.enphaseAcBatterieSummaryLevelAndStateService.updateCharacteristic(Characteristic.Brightness, this.pv.production.ct.acBatterie.percentFull);
+                            this.acBatteriesSummaryLevelAndStateService.updateCharacteristic(Characteristic.Brightness, this.pv.production.ct.acBatterie.percentFullSum);
                         })
 
 
@@ -5796,10 +5796,10 @@ class EnvoyDevice extends EventEmitter {
                 if (enchargesInstalled) {
                     //encharges summary level and state
                     const debug2 = this.enableDebugMode ? this.emit('debug', `Prepare Encharges Summary Service`) : false;
-                    this.enphaseEnchargesSummaryLevelAndStateService = accessory.addService(Service.Lightbulb, `Encharges`, `enphaseEnchargesSummaryLevelAndStateService`);
-                    this.enphaseEnchargesSummaryLevelAndStateService.addOptionalCharacteristic(Characteristic.ConfiguredName);
-                    this.enphaseEnchargesSummaryLevelAndStateService.setCharacteristic(Characteristic.ConfiguredName, 'Encharges');
-                    this.enphaseEnchargesSummaryLevelAndStateService.getCharacteristic(Characteristic.On)
+                    this.enchargesSummaryLevelAndStateService = accessory.addService(Service.Lightbulb, `Encharges`, `enchargesSummaryLevelAndStateService`);
+                    this.enchargesSummaryLevelAndStateService.addOptionalCharacteristic(Characteristic.ConfiguredName);
+                    this.enchargesSummaryLevelAndStateService.setCharacteristic(Characteristic.ConfiguredName, 'Encharges');
+                    this.enchargesSummaryLevelAndStateService.getCharacteristic(Characteristic.On)
                         .onGet(async () => {
                             const state = this.ensemble.encharges.energyStateSum;
                             const info = this.disableLogInfo ? false : this.emit('message', `Encharges energy state: ${state ? 'Charged' : 'Discharged'}`);
@@ -5807,12 +5807,12 @@ class EnvoyDevice extends EventEmitter {
                         })
                         .onSet(async (state) => {
                             try {
-                                this.enphaseEnchargesSummaryLevelAndStateService.updateCharacteristic(Characteristic.On, this.ensemble.encharges.energyStateSum);
+                                this.enchargesSummaryLevelAndStateService.updateCharacteristic(Characteristic.On, this.ensemble.encharges.energyStateSum);
                             } catch (error) {
                                 this.emit('warn', `Set Encharges energy state error: ${error}`);
                             };
                         });
-                    this.enphaseEnchargesSummaryLevelAndStateService.getCharacteristic(Characteristic.Brightness)
+                    this.enchargesSummaryLevelAndStateService.getCharacteristic(Characteristic.Brightness)
                         .onGet(async () => {
                             const state = this.ensemble.encharges.percentFullSum;
                             const info = this.disableLogInfo ? false : this.emit('message', `Encharges energy level: ${this.ensemble.encharges.percentFullSum} %`);
@@ -5820,7 +5820,7 @@ class EnvoyDevice extends EventEmitter {
                         })
                         .onSet(async (value) => {
                             try {
-                                this.enphaseEnchargesSummaryLevelAndStateService.updateCharacteristic(Characteristic.Brightness, this.ensemble.encharges.percentFullSum);
+                                this.enchargesSummaryLevelAndStateService.updateCharacteristic(Characteristic.Brightness, this.ensemble.encharges.percentFullSum);
                             } catch (error) {
                                 this.emit('warn', `Set Encharges energy level error: ${error}`);
                             };