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

package/package.json

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

package/src/envoydata.js

@@ -338,7 +338,6 @@ class EnvoyData extends EventEmitter {
                         devices: [],
                         settings: {},
                         tariff: {},
-                        tariffRaw: {},
                         ratedPowerSumKw: null,
                         realPowerSumKw: null,
                         phaseA: false,
@@ -450,7 +449,7 @@ class EnvoyData extends EventEmitter {
         const tokenNotValid = errorString.includes('status code 401');
         if (tokenNotValid) {
             if (this.checkTokenRunning) return;
-            
+
             this.feature.info.jwtToken.token = '';
             this.feature.info.tokenValid = false;
             return;
@@ -1963,7 +1962,7 @@ class EnvoyData extends EventEmitter {
                 };
 
                 // Calculate encharges rated power summary in kW
-                this.pv.inventory.esubs.encharges.ratedPowerSumKw = enchargesRatedPowerSummary.length > 0 ? (enchargesRatedPowerSummary.reduce((total, num) => total + num, 0) / enchargesRatedPowerSummary.length) / 1000 : null;
+                this.pv.inventory.esubs.encharges.ratedPowerSumKw = enchargesRatedPowerSummary.length > 0 ? enchargesRatedPowerSummary.reduce((total, num) => total + num, 0) / 1000 : null;
             }
 
             // Update enpowers statuses if installed
@@ -2043,7 +2042,7 @@ class EnvoyData extends EventEmitter {
             if (this.logDebug) this.emit('debug', `Ensemble power response:`, responseData);
 
             const devices = responseData.devices ?? [];
-            if (!devices.length === 0) return false;
+            if (devices.length === 0) return false;
 
             // update encharges
             const enchargesRealPowerSummary = [];
@@ -2052,7 +2051,7 @@ class EnvoyData extends EventEmitter {
                 const serialNumber = device.serial_num;
                 const encharge = encharges.find(device => device.serialNumber === serialNumber);
                 if (this.logDebug) this.emit('debug', `Ensemble device power:`, device);
-                if (!device) continue;
+                if (!encharge) continue;
 
                 encharge.power = {
                     serialNumber: device.serial_num,
@@ -2066,7 +2065,7 @@ class EnvoyData extends EventEmitter {
             }
 
             // Calculate encharges real power summary in kW
-            this.pv.inventory.esubs.encharges.realPowerSumKw = enchargesRealPowerSummary.length > 0 ? (enchargesRealPowerSummary.reduce((total, num) => total + num, 0) / enchargesRealPowerSummary.length) / 1000 : null;
+            this.pv.inventory.esubs.encharges.realPowerSumKw = enchargesRealPowerSummary.length > 0 ? enchargesRealPowerSummary.reduce((total, num) => total + num, 0) / 1000000 : null;
 
             // ensemble power supported
             this.feature.ensemble.power.supported = true;
@@ -2092,15 +2091,14 @@ class EnvoyData extends EventEmitter {
             const enchargesSettingsSupported = 'enc_settings' in enchargesSettings;
             if (!enchargesSettingsSupported) return false;
 
-            const settings = enchargesSettings.enc_settings;
-            const encharges = this.pv.inventory.esubs.encharges;
-            encharges.settings = {
-                enable: settings.enable,                 // boolean
-                country: settings.country,               // string
-                currentLimit: settings.current_limit,    // float
-                perPhase: settings.per_phase             // boolean
+            const settings  = {
+                enable: enchargesSettings.enc_settings.enable,                 // boolean
+                country: enchargesSettings.enc_settings.country,               // string
+                currentLimit: enchargesSettings.enc_settings.current_limit,    // float
+                perPhase: enchargesSettings.enc_settings.per_phase             // boolean
             };
 
+            this.pv.inventory.esubs.encharges.settings = settings;
             this.feature.inventory.esubs.encharges.settings.supported = true;
 
             // RESTFul and MQTT update
@@ -2119,12 +2117,11 @@ class EnvoyData extends EventEmitter {
         try {
             const response = await this.axiosInstance.get(ApiUrls.TariffSettingsGetPut);
             const tariffSettings = response.data;
-
             if (this.logDebug) this.emit('debug', 'Tariff:', tariffSettings);
 
             const enchargesTariffSupported = 'tariff' in tariffSettings;
             if (!enchargesTariffSupported) return false;
-            this.pv.inventory.esubs.encharges.tariffRaw = tariffSettings;
+
             this.pv.inventory.esubs.encharges.tariff = tariffSettings;
             this.feature.inventory.esubs.encharges.tariff.supported = true;
 
@@ -2549,7 +2546,7 @@ class EnvoyData extends EventEmitter {
         if (this.logDebug) this.emit('debug', `Requesting set encharge settings`);
 
         try {
-            const tariff = this.pv.inventory.esubs.encharges.tariffRaw.tariff;
+            const tariff = this.pv.inventory.esubs.encharges.tariff.tariff;
             tariff.storage_settings.mode = profile;
             tariff.storage_settings.reserved_soc = reservedSoc;
             tariff.storage_settings.charge_from_grid = chargeFromGrid;

package/src/envoydevice.js

@@ -1988,8 +1988,8 @@ class EnvoyDevice extends EventEmitter {
                                 }
 
                                 if (ensemblesCountersSupported) characteristics.push({ type: Characteristic.RestPower, label: 'rest power', value: counters.restPowerKw, unit: 'kW' });
-                                if (enchargesStatusSupported) characteristics.push({ type: Characteristic.RatedPower, label: 'rated power', value: this.pv.inventoryData.esubs.ratedPowerSumKw, unit: 'kW' });
-                                if (enchargesPowerSupported) characteristics.push({ type: Characteristic.RealPower, label: 'real power', value: this.pv.inventoryData.esubs.realPowerSumKw, unit: 'kW' });
+                                if (enchargesStatusSupported) characteristics.push({ type: Characteristic.RatedPower, label: 'rated power', value: this.pv.inventoryData.esubs.encharges.ratedPowerSumKw, unit: 'kW' });
+                                if (enchargesPowerSupported) characteristics.push({ type: Characteristic.RealPower, label: 'real power', value: this.pv.inventoryData.esubs.encharges.realPowerSumKw, unit: 'kW' });
 
                                 for (const { type, label, value, unit = '', postfix = '' } of characteristics) {
                                     if (!this.functions.isValidValue(value)) continue;
@@ -2399,24 +2399,23 @@ class EnvoyDevice extends EventEmitter {
                                         if (this.logDebug) this.emit('debug', `Prepare ${enchargeName} Profile Sensor Services`);
 
                                         this.enchargeProfileSensorsServices = [];
-
                                         for (let i = 0; i < this.enchargeProfileSensors.length; i++) {
                                             const sensor = this.enchargeProfileSensors[i];
                                             const { namePrefix, name, serviceType, characteristicType } = sensor;
                                             const serviceName = namePrefix ? `${accessoryName} ${name}` : name;
 
-                                            const service = accessory.addService(serviceType, serviceName, `enchargeProfileSensorService${i}`);
-                                            service.addOptionalCharacteristic(Characteristic.ConfiguredName);
-                                            service.setCharacteristic(Characteristic.ConfiguredName, serviceName);
+                                            const sensorService = accessory.addService(serviceType, serviceName, `enchargeProfileSensorService${i}`);
+                                            sensorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
+                                            sensorService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
 
-                                            service.getCharacteristic(characteristicType)
+                                            sensorService.getCharacteristic(characteristicType)
                                                 .onGet(async () => {
                                                     const currentState = sensor.state;
                                                     if (this.logInfo) this.emit('info', `${enchargeName} profile: ${name}, state: ${currentState ? 'Active' : 'Not Active'}`);
                                                     return currentState;
                                                 });
 
-                                            this.enchargeProfileSensorsServices.push(service);
+                                            this.enchargeProfileSensorsServices.push(sensorService);
                                         }
                                     }
                                 }
@@ -2695,7 +2694,7 @@ class EnvoyDevice extends EventEmitter {
                                         { type: Characteristic.AdminState, label: 'admin state', value: collar.adminStateStr },
                                         { type: Characteristic.Status, label: 'status', value: collar.deviceStatus },
                                         { type: Characteristic.MidState, label: 'mid state', value: collar.midState },
-                                        { type: Characteristic.GridState, label: 'mid state', value: collar.gridState },
+                                        { type: Characteristic.GridState, label: 'grid state', value: collar.gridState },
                                         { type: Characteristic.Communicating, label: 'communicating', value: collar.communicating, postfix: collar.communicating ? 'Yes' : 'No' },
                                         { type: Characteristic.Temperature, label: 'temperature', value: collar.temperature, unit: '°C' },
                                         { type: Characteristic.ReadingTime, label: 'reading time', value: collar.readingTime }