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

package/package.json

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

package/src/envoydevice.js

@@ -4334,10 +4334,10 @@ class EnvoyDevice extends EventEmitter {
                             // Add to ensemble summary characteristics if live data not supported
                             if (!this.feature.liveData.supported || !this.feature.meters.storage.enabled) {
                                 ensembleSummaryCharacteristics.push(
-                                    { type: Characteristic.AggMaxEnergy, value: secctrl.aggMaxEnergyKw },
-                                    { type: Characteristic.EncAggBackupEnergy, value: secctrl.encAggBackupEnergy },
                                     { type: Characteristic.AggSoc, value: secctrl.aggSoc },
-                                    { type: Characteristic.encAggSoc, value: secctrl.encAggSoc });
+                                    { type: Characteristic.AggMaxEnergy, value: secctrl.aggMaxEnergyKw },
+                                    { type: Characteristic.EncAggSoc, value: secctrl.encAggSoc },
+                                    { type: Characteristic.EncAggBackupEnergy, value: secctrl.encAggBackupEnergy });
                             }
 
                             if (phaseA) {
@@ -4932,7 +4932,7 @@ class EnvoyDevice extends EventEmitter {
                                         this.enchargeProfileControlsServices?.[i]?.updateCharacteristic(type, value);
                                     }
                                 }
-
+                                if (this.logDebug) this.emit('debug', `Requesting encharges tariff data5`);
                                 // Encharge profile sensors update
                                 for (let i = 0; i < this.enchargeProfileSensors.length; i++) {
                                     const sensor = this.enchargeProfileSensors[i];
@@ -4955,7 +4955,7 @@ class EnvoyDevice extends EventEmitter {
                                 // Save updated tariff
                                 this.pv.inventoryData.esubs.encharges.tariff = tariff;
                             }
-
+                            if (this.logDebug) this.emit('debug', `Requesting encharges tariff data6`);
                             // Add rated power summary in kW
                             if (enchargesStatusSupported && this.functions.isValidValue(encharges.ratedPowerSumKw)) {
                                 this.pv.inventoryData.esubs.encharges.ratedPowerSumKw = encharges.ratedPowerSumKw;
@@ -4963,7 +4963,7 @@ class EnvoyDevice extends EventEmitter {
                                 // Add to ensemble summary characteristics
                                 ensembleSummaryCharacteristics.push({ type: Characteristic.RatedPower, value: encharges.ratedPowerSumKw });
                             }
-
+                            if (this.logDebug) this.emit('debug', `Requesting encharges tariff data7`);
                             // Add real power summary in kW
                             if (enchargesPowerSupported && this.functions.isValidValue(encharges.realPowerSumKw)) {
                                 this.pv.inventoryData.esubs.encharges.realPowerSumKw = encharges.realPowerSumKw;
@@ -4972,7 +4972,7 @@ class EnvoyDevice extends EventEmitter {
                                 ensembleSummaryCharacteristics.push({ type: Characteristic.RealPower, value: encharges.realPowerSumKw });
                             }
                         }
-
+                        if (this.logDebug) this.emit('debug', `Requesting encharges tariff data8`);
                         // Update ensemble summary service
                         for (const { type, value } of ensembleSummaryCharacteristics) {
                             if (!this.functions.isValidValue(value)) continue;
@@ -5592,8 +5592,8 @@ class EnvoyDevice extends EventEmitter {
 
                                     // Agg Energy and Soc
                                     const characteristics = [
-                                        { type: Characteristic.AggMaxEnergy, value: energySumKw, valueKey: 'aggMaxEnergyKw' },
                                         { type: Characteristic.AggSoc, value: percentFullSum, valueKey: 'aggSoc' },
+                                        { type: Characteristic.AggMaxEnergy, value: energySumKw, valueKey: 'aggMaxEnergyKw' },
                                     ];
 
                                     // Update storage summary services