homebridge-enphase-envoy 10.2.6-beta.10 → 10.2.6-beta.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/src/energymeter.js +7 -7
  3. package/src/envoydevice.js +3 -3
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "private": false,
3
3
  "displayName": "Enphase Envoy",
4
4
  "name": "homebridge-enphase-envoy",
5
- "version": "10.2.6-beta.10",
5
+ "version": "10.2.6-beta.11",
6
6
  "description": "Homebridge p7ugin for Photovoltaic Energy System manufactured by Enphase.",
7
7
  "license": "MIT",
8
8
  "author": "grzegorz914",
package/src/energymeter.js CHANGED
@@ -960,8 +960,8 @@ class EnergyMeter extends EventEmitter {
960
960
  const key = MetersKeyMap[meterType];
961
961
  const measurementType = ApiCodes[meterType];
962
962
 
963
- let sourceMeter, sourceEnergy, energyLifetimeWithOffset;
964
- let power, energyLifetime;
963
+ let sourceMeter, sourceEnergy;
964
+ let power, energyLifetime, energyLifetimeWithOffset;
965
965
  switch (key) {
966
966
  case 'production': {
967
967
  const sourcePcu = this.pv.powerAndEnergy[key].pcu;
@@ -970,7 +970,7 @@ class EnergyMeter extends EventEmitter {
970
970
  sourceEnergy = meterEnabled ? sourceEim : sourcePcu;
971
971
  power = this.functions.isValidValue(sourceMeter.power) ? sourceMeter.power : null;
972
972
  energyLifetime = this.functions.isValidValue(sourceMeter.energyLifetime) ? sourceMeter.energyLifetime / 1000 : null;
973
- energyLifetimeWithOffset = this.functions.isValidValue(sourceMeter.energyLifetime) ? energyLifetime + this.energyProductionLifetimeOffset : null;
973
+ energyLifetimeWithOffset = this.functions.isValidValue(energyLifetime) ? energyLifetime + this.energyProductionLifetimeOffset : null;
974
974
  break;
975
975
  }
976
976
  case 'consumptionNet': {
@@ -978,7 +978,7 @@ class EnergyMeter extends EventEmitter {
978
978
  sourceEnergy = this.pv.powerAndEnergy.consumptionNet;
979
979
  power = this.functions.isValidValue(sourceMeter.power) ? sourceMeter.power : null;
980
980
  energyLifetime = this.functions.isValidValue(sourceMeter.energyLifetime) ? sourceMeter.energyLifetime / 1000 : null;
981
- energyLifetimeWithOffset = this.functions.isValidValue(sourceMeter.energyLifetime) ? energyLifetime + this.energyConsumptionNetLifetimeOffset : null;
981
+ energyLifetimeWithOffset = this.functions.isValidValue(energyLifetime) ? energyLifetime + this.energyConsumptionNetLifetimeOffset : null;
982
982
  break;
983
983
  }
984
984
  case 'consumptionTotal': {
@@ -986,7 +986,7 @@ class EnergyMeter extends EventEmitter {
986
986
  sourceEnergy = this.pv.powerAndEnergy.consumptionTotal;
987
987
  power = this.functions.isValidValue(sourceMeter.power) ? sourceMeter.power : null;
988
988
  energyLifetime = this.functions.isValidValue(sourceMeter.energyLifetime) ? sourceMeter.energyLifetime / 1000 : null;
989
- energyLifetimeWithOffset = this.functions.isValidValue(sourceMeter.energyLifetime) ? energyLifetime + this.energyConsumptionTotalLifetimeOffset : null;
989
+ energyLifetimeWithOffset = this.functions.isValidValue(energyLifetime) ? energyLifetime + this.energyConsumptionTotalLifetimeOffset : null;
990
990
  break;
991
991
  }
992
992
  }
@@ -1015,8 +1015,8 @@ class EnergyMeter extends EventEmitter {
1015
1015
 
1016
1016
  // Create characteristics energy meter
1017
1017
  const characteristics = [
1018
- { type: Characteristic.EvePower, value: obj.power },
1019
- { type: Characteristic.EveEnergyLifetime, value: obj.energyLifetimeWithOffset },
1018
+ { type: Characteristic.EvePower, value: power },
1019
+ { type: Characteristic.EveEnergyLifetime, value: energyLifetimeWithOffset },
1020
1020
  ];
1021
1021
 
1022
1022
  // Create characteristics energy meter
package/src/envoydevice.js CHANGED
@@ -3820,7 +3820,7 @@ class EnvoyDevice extends EventEmitter {
3820
3820
  energyLastSevenDays = this.functions.isValidValue(sourceEnergy.energyLastSevenDays) ? sourceEnergy.energyLastSevenDays : null;
3821
3821
  energyLifetime = this.functions.isValidValue(sourceMeter.energyLifetime) ? sourceMeter.energyLifetime : null;
3822
3822
  energyLifetimeUpload = this.functions.isValidValue(sourceMeter.energyLifetimeUpload) ? sourceMeter.energyLifetimeUpload : null;
3823
- energyLifetimeWithOffset = this.functions.isValidValue(sourceMeter.energyLifetime) ? energyLifetime + this.energyProductionLifetimeOffset : null;
3823
+ energyLifetimeWithOffset = this.functions.isValidValue(energyLifetime) ? energyLifetime + this.energyProductionLifetimeOffset : null;
3824
3824
  break;
3825
3825
  }
3826
3826
  case 'consumptionNet': {
@@ -3833,7 +3833,7 @@ class EnvoyDevice extends EventEmitter {
3833
3833
  energyLastSevenDays = this.functions.isValidValue(sourceEnergy.energyLastSevenDays) ? sourceEnergy.energyLastSevenDays : null;
3834
3834
  energyLifetime = this.functions.isValidValue(sourceMeter.energyLifetime) ? sourceMeter.energyLifetime : null;
3835
3835
  energyLifetimeUpload = this.functions.isValidValue(sourceMeter.energyLifetimeUpload) ? sourceMeter.energyLifetimeUpload : null;
3836
- energyLifetimeWithOffset = this.functions.isValidValue(sourceMeter.energyLifetime) ? energyLifetime + this.energyConsumptionNetLifetimeOffset : null;
3836
+ energyLifetimeWithOffset = this.functions.isValidValue(energyLifetime) ? energyLifetime + this.energyConsumptionNetLifetimeOffset : null;
3837
3837
  break;
3838
3838
  }
3839
3839
  case 'consumptionTotal': {
@@ -3845,7 +3845,7 @@ class EnvoyDevice extends EventEmitter {
3845
3845
  energyToday = this.functions.isValidValue(sourceEnergy.energyToday) ? sourceEnergy.energyToday : null;
3846
3846
  energyLastSevenDays = this.functions.isValidValue(sourceEnergy.energyLastSevenDays) ? sourceEnergy.energyLastSevenDays : null;
3847
3847
  energyLifetime = this.functions.isValidValue(sourceMeter.energyLifetime) ? sourceMeter.energyLifetime : null;
3848
- energyLifetimeWithOffset = this.functions.isValidValue(sourceMeter.energyLifetime) ? energyLifetime + this.energyConsumptionTotalLifetimeOffset : null;
3848
+ energyLifetimeWithOffset = this.functions.isValidValue(energyLifetime) ? energyLifetime + this.energyConsumptionTotalLifetimeOffset : null;
3849
3849
  break;
3850
3850
  }
3851
3851
  }