homebridge-enphase-envoy 10.2.6-beta.9 → 10.2.6

package/CHANGELOG.md

@@ -16,7 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - fix [#216](https://github.com/grzegorz914/homebridge-enphase-envoy/issues/216)
 - fix [#217](https://github.com/grzegorz914/homebridge-enphase-envoy/issues/217)
 - fix wireless connections kit publish
-- added network interface services
+- added network interface service and characteristics
 - cleanup
 
 ## [10.2.5] - (17.10.2025)

package/package.json

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

package/src/customcharacteristics.js

@@ -1892,69 +1892,7 @@ export default (api) => {
     }
     Service.EnvoyService = EnvoyService;
 
-    //Wireless connection kit service
-    class NetworkInterfaceService extends Service {
-        constructor(displayName, subtype) {
-            super(displayName, '00000010-000A-1000-8000-0026BB765291', subtype);
-            // Mandatory Characteristics
-            this.addCharacteristic(Characteristic.Type);
-            // Optional Characteristics
-            this.addOptionalCharacteristic(Characteristic.SignalStrength);
-            this.addOptionalCharacteristic(Characteristic.AddressIp);
-            this.addOptionalCharacteristic(Characteristic.ConfiguredName);
-        }
-    }
-    Service.NetworkInterfaceService = NetworkInterfaceService;
-
-    //Wireless connection kit service
-    class WirelessConnectionKitService extends Service {
-        constructor(displayName, subtype) {
-            super(displayName, '00000010-000A-1000-8000-0026BB765291', subtype);
-            // Mandatory Characteristics
-            this.addCharacteristic(Characteristic.Type);
-            // Optional Characteristics
-            this.addOptionalCharacteristic(Characteristic.SignalStrength);
-            this.addOptionalCharacteristic(Characteristic.Connected);
-            this.addOptionalCharacteristic(Characteristic.ConfiguredName);
-        }
-    }
-    Service.WirelessConnectionKitService = WirelessConnectionKitService;
-
-    //Microinverter service
-    class MicroinverterService extends Service {
-        constructor(displayName, subtype) {
-            super(displayName, '00000007-000A-1000-8000-0026BB765291', subtype);
-            // Mandatory Characteristics
-            this.addCharacteristic(Characteristic.Status);
-            // Optional Characteristics
-            this.addOptionalCharacteristic(Characteristic.Producing);
-            this.addOptionalCharacteristic(Characteristic.Communicating);
-            this.addOptionalCharacteristic(Characteristic.Provisioned);
-            this.addOptionalCharacteristic(Characteristic.Operating);
-            this.addOptionalCharacteristic(Characteristic.GfiClear);
-            this.addOptionalCharacteristic(Characteristic.Phase);
-            this.addOptionalCharacteristic(Characteristic.Firmware);
-            this.addOptionalCharacteristic(Characteristic.PowerW);
-            this.addOptionalCharacteristic(Characteristic.PowerPeakW);
-            this.addOptionalCharacteristic(Characteristic.EnergyTodayWh);
-            this.addOptionalCharacteristic(Characteristic.EnergyYesterdayWh);
-            this.addOptionalCharacteristic(Characteristic.EnergyLastSevenDays);
-            this.addOptionalCharacteristic(Characteristic.EnergyLifetime);
-            this.addOptionalCharacteristic(Characteristic.Current);
-            this.addOptionalCharacteristic(Characteristic.Voltage);
-            this.addOptionalCharacteristic(Characteristic.Frequency);
-            this.addOptionalCharacteristic(Characteristic.CurrentDc);
-            this.addOptionalCharacteristic(Characteristic.VoltageDc);
-            this.addOptionalCharacteristic(Characteristic.Temperature);
-            this.addOptionalCharacteristic(Characteristic.PlcLevel);
-            this.addOptionalCharacteristic(Characteristic.GridProfile);
-            this.addOptionalCharacteristic(Characteristic.ReadingTime);
-            this.addOptionalCharacteristic(Characteristic.ConfiguredName);
-        }
-    }
-    Service.MicroinverterService = MicroinverterService;
-
-    //qrelay service
+    //Qrelay service
     class QrelayService extends Service {
         constructor(displayName, subtype) {
             super(displayName, '00000002-000A-1000-8000-0026BB765291', subtype);
@@ -1985,50 +1923,6 @@ export default (api) => {
     }
     Service.QrelayService = QrelayService;
 
-    //AC Batterie service
-    class AcBatterieService extends Service {
-        constructor(displayName, subtype) {
-            super(displayName, '00000006-000A-1000-8000-0026BB765291', subtype);
-            // Mandatory Characteristics
-            this.addCharacteristic(Characteristic.ChargeState);
-            // Optional Characteristics
-            this.addOptionalCharacteristic(Characteristic.Status);
-            this.addOptionalCharacteristic(Characteristic.Producing);
-            this.addOptionalCharacteristic(Characteristic.Communicating);
-            this.addOptionalCharacteristic(Characteristic.Provisioned);
-            this.addOptionalCharacteristic(Characteristic.Operating);
-            this.addOptionalCharacteristic(Characteristic.GfiClear);
-            this.addOptionalCharacteristic(Characteristic.SleepEnabled);
-            this.addOptionalCharacteristic(Characteristic.PercentFull);
-            this.addOptionalCharacteristic(Characteristic.MaxCellTemp);
-            this.addOptionalCharacteristic(Characteristic.SleepMinSoc);
-            this.addOptionalCharacteristic(Characteristic.SleepMaxSoc);
-            this.addOptionalCharacteristic(Characteristic.Firmware);
-            this.addOptionalCharacteristic(Characteristic.PlcLevel);
-            this.addOptionalCharacteristic(Characteristic.GridProfile);
-            this.addOptionalCharacteristic(Characteristic.ReadingTime);
-            this.addOptionalCharacteristic(Characteristic.ConfiguredName);
-        }
-    }
-    Service.AcBatterieService = AcBatterieService;
-
-    //AC Batterie summary service
-    class AcBatterieSummaryService extends Service {
-        constructor(displayName, subtype) {
-            super(displayName, '00000005-000A-1000-8000-0026BB765291', subtype);
-            // Mandatory Characteristics
-            this.addCharacteristic(Characteristic.ChargeState);
-            // Optional Characteristics
-            this.addOptionalCharacteristic(Characteristic.Power);
-            this.addOptionalCharacteristic(Characteristic.Energy);
-            this.addOptionalCharacteristic(Characteristic.PercentFull);
-            this.addOptionalCharacteristic(Characteristic.ActiveCount);
-            this.addOptionalCharacteristic(Characteristic.GridProfile);
-            this.addOptionalCharacteristic(Characteristic.ReadingTime);
-            this.addOptionalCharacteristic(Characteristic.ConfiguredName);
-        }
-    }
-    Service.AcBatterieSummaryService = AcBatterieSummaryService;
 
     //Meters service
     class MeterService extends Service {
@@ -2083,24 +1977,109 @@ export default (api) => {
     }
     Service.PowerAndEnergyService = PowerAndEnergyService;
 
-    //Ensemble inventory service
-    class EnsembleService extends Service {
+    //AC Batterie summary service
+    class AcBatterieSummaryService extends Service {
         constructor(displayName, subtype) {
-            super(displayName, '00000011-000B-1000-8000-0026BB765291', subtype);
+            super(displayName, '00000005-000A-1000-8000-0026BB765291', subtype);
+            // Mandatory Characteristics
+            this.addCharacteristic(Characteristic.ChargeState);
+            // Optional Characteristics
+            this.addOptionalCharacteristic(Characteristic.Power);
+            this.addOptionalCharacteristic(Characteristic.Energy);
+            this.addOptionalCharacteristic(Characteristic.PercentFull);
+            this.addOptionalCharacteristic(Characteristic.ActiveCount);
+            this.addOptionalCharacteristic(Characteristic.GridProfile);
+            this.addOptionalCharacteristic(Characteristic.ReadingTime);
+            this.addOptionalCharacteristic(Characteristic.ConfiguredName);
+        }
+    }
+    Service.AcBatterieSummaryService = AcBatterieSummaryService;
+
+    //AC Batterie service
+    class AcBatterieService extends Service {
+        constructor(displayName, subtype) {
+            super(displayName, '00000006-000A-1000-8000-0026BB765291', subtype);
+            // Mandatory Characteristics
+            this.addCharacteristic(Characteristic.ChargeState);
+            // Optional Characteristics
+            this.addOptionalCharacteristic(Characteristic.Status);
+            this.addOptionalCharacteristic(Characteristic.Producing);
+            this.addOptionalCharacteristic(Characteristic.Communicating);
+            this.addOptionalCharacteristic(Characteristic.Provisioned);
+            this.addOptionalCharacteristic(Characteristic.Operating);
+            this.addOptionalCharacteristic(Characteristic.GfiClear);
+            this.addOptionalCharacteristic(Characteristic.SleepEnabled);
+            this.addOptionalCharacteristic(Characteristic.PercentFull);
+            this.addOptionalCharacteristic(Characteristic.MaxCellTemp);
+            this.addOptionalCharacteristic(Characteristic.SleepMinSoc);
+            this.addOptionalCharacteristic(Characteristic.SleepMaxSoc);
+            this.addOptionalCharacteristic(Characteristic.Firmware);
+            this.addOptionalCharacteristic(Characteristic.PlcLevel);
+            this.addOptionalCharacteristic(Characteristic.GridProfile);
+            this.addOptionalCharacteristic(Characteristic.ReadingTime);
+            this.addOptionalCharacteristic(Characteristic.ConfiguredName);
+        }
+    }
+    Service.AcBatterieService = AcBatterieService;
+
+
+    //Microinverter service
+    class MicroinverterService extends Service {
+        constructor(displayName, subtype) {
+            super(displayName, '00000007-000A-1000-8000-0026BB765291', subtype);
             // Mandatory Characteristics
             this.addCharacteristic(Characteristic.Status);
             // Optional Characteristics
+            this.addOptionalCharacteristic(Characteristic.Producing);
             this.addOptionalCharacteristic(Characteristic.Communicating);
+            this.addOptionalCharacteristic(Characteristic.Provisioned);
             this.addOptionalCharacteristic(Characteristic.Operating);
             this.addOptionalCharacteristic(Characteristic.GfiClear);
+            this.addOptionalCharacteristic(Characteristic.Phase);
             this.addOptionalCharacteristic(Characteristic.Firmware);
+            this.addOptionalCharacteristic(Characteristic.PowerW);
+            this.addOptionalCharacteristic(Characteristic.PowerPeakW);
+            this.addOptionalCharacteristic(Characteristic.EnergyTodayWh);
+            this.addOptionalCharacteristic(Characteristic.EnergyYesterdayWh);
+            this.addOptionalCharacteristic(Characteristic.EnergyLastSevenDays);
+            this.addOptionalCharacteristic(Characteristic.EnergyLifetime);
+            this.addOptionalCharacteristic(Characteristic.Current);
+            this.addOptionalCharacteristic(Characteristic.Voltage);
+            this.addOptionalCharacteristic(Characteristic.Frequency);
+            this.addOptionalCharacteristic(Characteristic.CurrentDc);
+            this.addOptionalCharacteristic(Characteristic.VoltageDc);
+            this.addOptionalCharacteristic(Characteristic.Temperature);
+            this.addOptionalCharacteristic(Characteristic.PlcLevel);
+            this.addOptionalCharacteristic(Characteristic.GridProfile);
+            this.addOptionalCharacteristic(Characteristic.ReadingTime);
+            this.addOptionalCharacteristic(Characteristic.ConfiguredName);
+        }
+    }
+    Service.MicroinverterService = MicroinverterService;
+
+    // Enpower service
+    class EnpowerService extends Service {
+        constructor(displayName, subtype) {
+            super(displayName, '00000008-000A-1000-8000-0026BB765291', subtype);
+            // Mandatory Characteristics
+            this.addCharacteristic(Characteristic.AdminState);
+            // Optional Characteristics
+            this.addOptionalCharacteristic(Characteristic.Communicating);
+            this.addOptionalCharacteristic(Characteristic.CommLevelSubGhz);
+            this.addOptionalCharacteristic(Characteristic.CommLevel24Ghz);
+            this.addOptionalCharacteristic(Characteristic.Temperature);
+            this.addOptionalCharacteristic(Characteristic.OperatingState);
+            this.addOptionalCharacteristic(Characteristic.GridMode);
+            this.addOptionalCharacteristic(Characteristic.EnchgGridMode);
+            this.addOptionalCharacteristic(Characteristic.Status);
             this.addOptionalCharacteristic(Characteristic.ReadingTime);
             this.addOptionalCharacteristic(Characteristic.CommInterface);
-            this.addOptionalCharacteristic(Characteristic.AdminState);
+            this.addOptionalCharacteristic(Characteristic.PlcLevel);
+            this.addOptionalCharacteristic(Characteristic.GridProfile);
             this.addOptionalCharacteristic(Characteristic.ConfiguredName);
         }
     }
-    Service.EnsembleService = EnsembleService;
+    Service.EnpowerService = EnpowerService;
 
     //Ennsemble service
     class EnsembleSummaryService extends Service {
@@ -2135,6 +2114,81 @@ export default (api) => {
     }
     Service.EnsembleSummaryService = EnsembleSummaryService;
 
+    //Wireless connection kit service
+    class WirelessConnectionKitService extends Service {
+        constructor(displayName, subtype) {
+            super(displayName, '00000010-000A-1000-8000-0026BB765291', subtype);
+            // Mandatory Characteristics
+            this.addCharacteristic(Characteristic.Type);
+            // Optional Characteristics
+            this.addOptionalCharacteristic(Characteristic.SignalStrength);
+            this.addOptionalCharacteristic(Characteristic.Connected);
+            this.addOptionalCharacteristic(Characteristic.ConfiguredName);
+        }
+    }
+    Service.WirelessConnectionKitService = WirelessConnectionKitService;
+
+    //Ensemble inventory service
+    class EnsembleService extends Service {
+        constructor(displayName, subtype) {
+            super(displayName, '00000011-000B-1000-8000-0026BB765291', subtype);
+            // Mandatory Characteristics
+            this.addCharacteristic(Characteristic.Status);
+            // Optional Characteristics
+            this.addOptionalCharacteristic(Characteristic.Communicating);
+            this.addOptionalCharacteristic(Characteristic.Operating);
+            this.addOptionalCharacteristic(Characteristic.GfiClear);
+            this.addOptionalCharacteristic(Characteristic.Firmware);
+            this.addOptionalCharacteristic(Characteristic.ReadingTime);
+            this.addOptionalCharacteristic(Characteristic.CommInterface);
+            this.addOptionalCharacteristic(Characteristic.AdminState);
+            this.addOptionalCharacteristic(Characteristic.ConfiguredName);
+        }
+    }
+    Service.EnsembleService = EnsembleService;
+
+    //Live data service
+    class LiveDataService extends Service {
+        constructor(displayName, subtype) {
+            super(displayName, '00000012-000A-1000-8000-0026BB765291', subtype);
+            // Mandatory Characteristics
+            this.addCharacteristic(Characteristic.Power);
+            // Optional Characteristics
+            this.addOptionalCharacteristic(Characteristic.PowerL1);
+            this.addOptionalCharacteristic(Characteristic.PowerL2);
+            this.addOptionalCharacteristic(Characteristic.PowerL3);
+            this.addOptionalCharacteristic(Characteristic.ApparentPower);
+            this.addOptionalCharacteristic(Characteristic.ApparentPowerL1);
+            this.addOptionalCharacteristic(Characteristic.ApparentPowerL2);
+            this.addOptionalCharacteristic(Characteristic.ApparentPowerL3);
+            this.addOptionalCharacteristic(Characteristic.ReadingTime);
+            this.addOptionalCharacteristic(Characteristic.ConfiguredName);
+        }
+    }
+    Service.LiveDataService = LiveDataService;
+
+    //Generator service
+    class GerneratorService extends Service {
+        constructor(displayName, subtype) {
+            super(displayName, '00000013-000A-1000-8000-0026BB765291', subtype);
+            // Mandatory Characteristics
+            this.addCharacteristic(Characteristic.AdminMode);
+            // Optional Characteristics
+            this.addOptionalCharacteristic(Characteristic.Type);
+            this.addOptionalCharacteristic(Characteristic.AdminState);
+            this.addOptionalCharacteristic(Characteristic.OperatingState);
+            this.addOptionalCharacteristic(Characteristic.StartSoc);
+            this.addOptionalCharacteristic(Characteristic.StopSoc);
+            this.addOptionalCharacteristic(Characteristic.ExexOn);
+            this.addOptionalCharacteristic(Characteristic.Shedule);
+            this.addOptionalCharacteristic(Characteristic.Present);
+            this.addOptionalCharacteristic(Characteristic.ReadingTime);
+            this.addOptionalCharacteristic(Characteristic.ConfiguredName);
+        }
+    }
+    Service.GerneratorService = GerneratorService;
+
+
     //Encharge service
     class EnchargeService extends Service {
         constructor(displayName, subtype) {
@@ -2165,34 +2219,10 @@ export default (api) => {
     }
     Service.EnchargeService = EnchargeService;
 
-    // Enpower service
-    class EnpowerService extends Service {
-        constructor(displayName, subtype) {
-            super(displayName, '00000008-000A-1000-8000-0026BB765291', subtype);
-            // Mandatory Characteristics
-            this.addCharacteristic(Characteristic.AdminState);
-            // Optional Characteristics
-            this.addOptionalCharacteristic(Characteristic.Communicating);
-            this.addOptionalCharacteristic(Characteristic.CommLevelSubGhz);
-            this.addOptionalCharacteristic(Characteristic.CommLevel24Ghz);
-            this.addOptionalCharacteristic(Characteristic.Temperature);
-            this.addOptionalCharacteristic(Characteristic.OperatingState);
-            this.addOptionalCharacteristic(Characteristic.GridMode);
-            this.addOptionalCharacteristic(Characteristic.EnchgGridMode);
-            this.addOptionalCharacteristic(Characteristic.Status);
-            this.addOptionalCharacteristic(Characteristic.ReadingTime);
-            this.addOptionalCharacteristic(Characteristic.CommInterface);
-            this.addOptionalCharacteristic(Characteristic.PlcLevel);
-            this.addOptionalCharacteristic(Characteristic.GridProfile);
-            this.addOptionalCharacteristic(Characteristic.ConfiguredName);
-        }
-    }
-    Service.EnpowerService = EnpowerService;
-
     //Collar service
     class CollarService extends Service {
         constructor(displayName, subtype) {
-            super(displayName, '00000014-000A-1000-8000-0026BB765291', subtype);
+            super(displayName, '00000015-000A-1000-8000-0026BB765291', subtype);
             // Mandatory Characteristics
             this.addCharacteristic(Characteristic.AdminState);
             // Optional Characteristics
@@ -2211,7 +2241,7 @@ export default (api) => {
     //C6 combiner controler service
     class C6CombinerControlerService extends Service {
         constructor(displayName, subtype) {
-            super(displayName, '00000015-000A-1000-8000-0026BB765291', subtype);
+            super(displayName, '00000016-000A-1000-8000-0026BB765291', subtype);
             // Mandatory Characteristics
             this.addCharacteristic(Characteristic.AdminState);
             // Optional Characteristics
@@ -2227,7 +2257,7 @@ export default (api) => {
     //C6 rgm servicee
     class C6RgmService extends Service {
         constructor(displayName, subtype) {
-            super(displayName, '00000016-000A-1000-8000-0026BB765291', subtype);
+            super(displayName, '00000017-000A-1000-8000-0026BB765291', subtype);
             // Mandatory Characteristics
             this.addCharacteristic(Characteristic.Status);
             // Optional Characteristics
@@ -2239,46 +2269,19 @@ export default (api) => {
     }
     Service.C6RgmService = C6RgmService;
 
-    //Generator service
-    class GerneratorService extends Service {
-        constructor(displayName, subtype) {
-            super(displayName, '00000013-000A-1000-8000-0026BB765291', subtype);
-            // Mandatory Characteristics
-            this.addCharacteristic(Characteristic.AdminMode);
-            // Optional Characteristics
-            this.addOptionalCharacteristic(Characteristic.Type);
-            this.addOptionalCharacteristic(Characteristic.AdminState);
-            this.addOptionalCharacteristic(Characteristic.OperatingState);
-            this.addOptionalCharacteristic(Characteristic.StartSoc);
-            this.addOptionalCharacteristic(Characteristic.StopSoc);
-            this.addOptionalCharacteristic(Characteristic.ExexOn);
-            this.addOptionalCharacteristic(Characteristic.Shedule);
-            this.addOptionalCharacteristic(Characteristic.Present);
-            this.addOptionalCharacteristic(Characteristic.ReadingTime);
-            this.addOptionalCharacteristic(Characteristic.ConfiguredName);
-        }
-    }
-    Service.GerneratorService = GerneratorService;
-
-    //Live data service
-    class LiveDataService extends Service {
+    //Network interafe service
+    class NetworkInterfaceService extends Service {
         constructor(displayName, subtype) {
-            super(displayName, '00000012-000A-1000-8000-0026BB765291', subtype);
+            super(displayName, '00000018-000A-1000-8000-0026BB765291', subtype);
             // Mandatory Characteristics
-            this.addCharacteristic(Characteristic.Power);
+            this.addCharacteristic(Characteristic.Type);
             // Optional Characteristics
-            this.addOptionalCharacteristic(Characteristic.PowerL1);
-            this.addOptionalCharacteristic(Characteristic.PowerL2);
-            this.addOptionalCharacteristic(Characteristic.PowerL3);
-            this.addOptionalCharacteristic(Characteristic.ApparentPower);
-            this.addOptionalCharacteristic(Characteristic.ApparentPowerL1);
-            this.addOptionalCharacteristic(Characteristic.ApparentPowerL2);
-            this.addOptionalCharacteristic(Characteristic.ApparentPowerL3);
-            this.addOptionalCharacteristic(Characteristic.ReadingTime);
+            this.addOptionalCharacteristic(Characteristic.SignalStrength);
+            this.addOptionalCharacteristic(Characteristic.AddressIp);
             this.addOptionalCharacteristic(Characteristic.ConfiguredName);
         }
     }
-    Service.LiveDataService = LiveDataService;
+    Service.NetworkInterfaceService = NetworkInterfaceService;
 
     // EVE electric meter
     class EvePower extends Characteristic {

package/src/energymeter.js

@@ -960,8 +960,8 @@ class EnergyMeter extends EventEmitter {
                 const key = MetersKeyMap[meterType];
                 const measurementType = ApiCodes[meterType];
 
-                let sourceMeter, sourceEnergy, energyLifetimeWithOffset;
-                let power, energyLifetime;
+                let sourceMeter, sourceEnergy;
+                let power, energyLifetime, energyLifetimeWithOffset;
                 switch (key) {
                     case 'production': {
                         const sourcePcu = this.pv.powerAndEnergy[key].pcu;
@@ -970,7 +970,7 @@ class EnergyMeter extends EventEmitter {
                         sourceEnergy = meterEnabled ? sourceEim : sourcePcu;
                         power = this.functions.isValidValue(sourceMeter.power) ? sourceMeter.power : null;
                         energyLifetime = this.functions.isValidValue(sourceMeter.energyLifetime) ? sourceMeter.energyLifetime / 1000 : null;
-                        energyLifetimeWithOffset = this.functions.isValidValue(sourceMeter.energyLifetime) ? energyLifetime + this.energyProductionLifetimeOffset : null;
+                        energyLifetimeWithOffset = this.functions.isValidValue(energyLifetime) ? energyLifetime + this.energyProductionLifetimeOffset : null;
                         break;
                     }
                     case 'consumptionNet': {
@@ -978,7 +978,7 @@ class EnergyMeter extends EventEmitter {
                         sourceEnergy = this.pv.powerAndEnergy.consumptionNet;
                         power = this.functions.isValidValue(sourceMeter.power) ? sourceMeter.power : null;
                         energyLifetime = this.functions.isValidValue(sourceMeter.energyLifetime) ? sourceMeter.energyLifetime / 1000 : null;
-                        energyLifetimeWithOffset = this.functions.isValidValue(sourceMeter.energyLifetime) ? energyLifetime + this.energyConsumptionNetLifetimeOffset : null;
+                        energyLifetimeWithOffset = this.functions.isValidValue(energyLifetime) ? energyLifetime + this.energyConsumptionNetLifetimeOffset : null;
                         break;
                     }
                     case 'consumptionTotal': {
@@ -986,7 +986,7 @@ class EnergyMeter extends EventEmitter {
                         sourceEnergy = this.pv.powerAndEnergy.consumptionTotal;
                         power = this.functions.isValidValue(sourceMeter.power) ? sourceMeter.power : null;
                         energyLifetime = this.functions.isValidValue(sourceMeter.energyLifetime) ? sourceMeter.energyLifetime / 1000 : null;
-                        energyLifetimeWithOffset = this.functions.isValidValue(sourceMeter.energyLifetime) ? energyLifetime + this.energyConsumptionTotalLifetimeOffset : null;
+                        energyLifetimeWithOffset = this.functions.isValidValue(energyLifetime) ? energyLifetime + this.energyConsumptionTotalLifetimeOffset : null;
                         break;
                     }
                 }
@@ -1015,8 +1015,8 @@ class EnergyMeter extends EventEmitter {
 
                     // Create characteristics energy meter
                     const characteristics = [
-                        { type: Characteristic.EvePower, value: obj.power },
-                        { type: Characteristic.EveEnergyLifetime, value: obj.energyLifetimeWithOffset },
+                        { type: Characteristic.EvePower, value: power },
+                        { type: Characteristic.EveEnergyLifetime, value: energyLifetimeWithOffset },
                     ];
 
                     // Create characteristics energy meter

package/src/envoydevice.js

@@ -3272,6 +3272,15 @@ class EnvoyDevice extends EventEmitter {
                                 powerFactorDivide: meter.powerFactorDivide,
                             };
 
+                            // Emit info logs if enabled
+                            if (this.logInfo) {
+                                this.emit('info', `Meter: ${measurementType}, state: ${meterData.state ? 'Enabled' : 'Disabled'}`);
+                                this.emit('info', `Meter: ${measurementType}, phase mode: ${meterData.phaseMode}`);
+                                this.emit('info', `Meter: ${measurementType}, phase count: ${meterData.phaseCount}`);
+                                this.emit('info', `Meter: ${measurementType}, metering status: ${meterData.meteringStatus}`);
+                                this.emit('info', `Meter: ${measurementType}, status: ${meterData.deviceStatus}`);
+                            }
+
                             // Create characteristics
                             const characteristics = [
                                 { type: Characteristic.State, value: meterData.state },
@@ -3303,6 +3312,16 @@ class EnvoyDevice extends EventEmitter {
                                     channels: meter.channels,
                                 });
 
+                                // Emit info logs if enabled
+                                if (this.logInfo) {
+                                    this.emit('info', `Meter: ${measurementType}, power: ${meterData.powerKw} kW`);
+                                    this.emit('info', `Meter: ${measurementType}, energy lifetime: ${meterData.energyLifetimeKw} kWh`);
+                                    this.emit('info', `Meter: ${measurementType}, current: ${meterData.current} A`);
+                                    this.emit('info', `Meter: ${measurementType}, voltage: ${meterData.voltage} V`);
+                                    this.emit('info', `Meter: ${measurementType}, power factor: ${meterData.pwrFactor} cos φ`);
+                                    this.emit('info', `Meter: ${measurementType}, frequency: ${meterData.frequency} Hz`);
+                                }
+
                                 // Add characteristics
                                 characteristics.push(
                                     { type: Characteristic.Power, value: meterData.powerKw },
@@ -3318,24 +3337,6 @@ class EnvoyDevice extends EventEmitter {
                                 if (measurementType !== 'Consumption Total') characteristics.push({ type: Characteristic.EnergyLifetimeUpload, value: meterData.energyLifetimeUploadKw });
                             }
 
-                            // Emit info logs if enabled
-                            if (this.logInfo) {
-                                this.emit('info', `Meter: ${measurementType}, state: ${meterData.state ? 'Enabled' : 'Disabled'}`);
-                                this.emit('info', `Meter: ${measurementType}, phase mode: ${meterData.phaseMode}`);
-                                this.emit('info', `Meter: ${measurementType}, phase count: ${meterData.phaseCount}`);
-                                this.emit('info', `Meter: ${measurementType}, metering status: ${meterData.meteringStatus}`);
-                                this.emit('info', `Meter: ${measurementType}, status: ${meterData.deviceStatus}`);
-
-                                if (meter.state) {
-                                    this.emit('info', `Meter: ${measurementType}, power: ${meterData.powerKw} kW`);
-                                    this.emit('info', `Meter: ${measurementType}, energy lifetime: ${meterData.energyLifetimeKw} kWh`);
-                                    this.emit('info', `Meter: ${measurementType}, current: ${meterData.current} A`);
-                                    this.emit('info', `Meter: ${measurementType}, voltage: ${meterData.voltage} V`);
-                                    this.emit('info', `Meter: ${measurementType}, power factor: ${meterData.pwrFactor} cos φ`);
-                                    this.emit('info', `Meter: ${measurementType}, frequency: ${meterData.frequency} Hz`);
-                                }
-                            }
-
                             // Update meters services
                             for (const { type, value } of characteristics) {
                                 if (!this.functions.isValidValue(value)) continue;
@@ -3819,7 +3820,7 @@ class EnvoyDevice extends EventEmitter {
                                     energyLastSevenDays = this.functions.isValidValue(sourceEnergy.energyLastSevenDays) ? sourceEnergy.energyLastSevenDays : null;
                                     energyLifetime = this.functions.isValidValue(sourceMeter.energyLifetime) ? sourceMeter.energyLifetime : null;
                                     energyLifetimeUpload = this.functions.isValidValue(sourceMeter.energyLifetimeUpload) ? sourceMeter.energyLifetimeUpload : null;
-                                    energyLifetimeWithOffset = this.functions.isValidValue(sourceMeter.energyLifetime) ? energyLifetime + this.energyProductionLifetimeOffset : null;
+                                    energyLifetimeWithOffset = this.functions.isValidValue(energyLifetime) ? energyLifetime + this.energyProductionLifetimeOffset : null;
                                     break;
                                 }
                                 case 'consumptionNet': {
@@ -3832,7 +3833,7 @@ class EnvoyDevice extends EventEmitter {
                                     energyLastSevenDays = this.functions.isValidValue(sourceEnergy.energyLastSevenDays) ? sourceEnergy.energyLastSevenDays : null;
                                     energyLifetime = this.functions.isValidValue(sourceMeter.energyLifetime) ? sourceMeter.energyLifetime : null;
                                     energyLifetimeUpload = this.functions.isValidValue(sourceMeter.energyLifetimeUpload) ? sourceMeter.energyLifetimeUpload : null;
-                                    energyLifetimeWithOffset = this.functions.isValidValue(sourceMeter.energyLifetime) ? energyLifetime + this.energyConsumptionNetLifetimeOffset : null;
+                                    energyLifetimeWithOffset = this.functions.isValidValue(energyLifetime) ? energyLifetime + this.energyConsumptionNetLifetimeOffset : null;
                                     break;
                                 }
                                 case 'consumptionTotal': {
@@ -3844,7 +3845,7 @@ class EnvoyDevice extends EventEmitter {
                                     energyToday = this.functions.isValidValue(sourceEnergy.energyToday) ? sourceEnergy.energyToday : null;
                                     energyLastSevenDays = this.functions.isValidValue(sourceEnergy.energyLastSevenDays) ? sourceEnergy.energyLastSevenDays : null;
                                     energyLifetime = this.functions.isValidValue(sourceMeter.energyLifetime) ? sourceMeter.energyLifetime : null;
-                                    energyLifetimeWithOffset = this.functions.isValidValue(sourceMeter.energyLifetime) ? energyLifetime + this.energyConsumptionTotalLifetimeOffset : null;
+                                    energyLifetimeWithOffset = this.functions.isValidValue(energyLifetime) ? energyLifetime + this.energyConsumptionTotalLifetimeOffset : null;
                                     break;
                                 }
                             }