homebridge-enphase-envoy 10.2.2-beta.113 → 10.2.2-beta.115
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.
- package/package.json +1 -1
- package/src/envoydata.js +1 -1
- package/src/envoydevice.js +5 -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.2-beta.
|
|
5
|
+
"version": "10.2.2-beta.115",
|
|
6
6
|
"description": "Homebridge p7ugin for Photovoltaic Energy System manufactured by Enphase.",
|
|
7
7
|
"license": "MIT",
|
|
8
8
|
"author": "grzegorz914",
|
package/src/envoydata.js
CHANGED
|
@@ -385,8 +385,8 @@ class EnvoyData extends EventEmitter {
|
|
|
385
385
|
this.locks = {
|
|
386
386
|
updateHome: false,
|
|
387
387
|
updateInventory: false,
|
|
388
|
-
updateMeters: false,
|
|
389
388
|
updateDevices: false,
|
|
389
|
+
updateMeters: false,
|
|
390
390
|
updatePowerAndEnergy: false,
|
|
391
391
|
updateEnsemble: false,
|
|
392
392
|
updateLiveData: false,
|
package/src/envoydevice.js
CHANGED
|
@@ -3691,7 +3691,7 @@ class EnvoyDevice extends EventEmitter {
|
|
|
3691
3691
|
provisioned: !!nsrb.provisioned,
|
|
3692
3692
|
operating: !!nsrb.operating,
|
|
3693
3693
|
relay: ApiCodes[nsrb.relay],
|
|
3694
|
-
relayState: nsrb.
|
|
3694
|
+
relayState: nsrb.relay === 'closed',
|
|
3695
3695
|
reasonCode: nsrb.reasonCode,
|
|
3696
3696
|
reason: nsrb.reason,
|
|
3697
3697
|
linesCount: nsrb.linesCount,
|
|
@@ -3964,7 +3964,7 @@ class EnvoyDevice extends EventEmitter {
|
|
|
3964
3964
|
|
|
3965
3965
|
if (key !== 'production' && !meterEnabled) continue;
|
|
3966
3966
|
|
|
3967
|
-
let sourceMeter, sourceEnergy;
|
|
3967
|
+
let sourceMeter, sourceEnergy, measurementType;
|
|
3968
3968
|
let power, powerLevel, powerState, powerPeak, powerPeakDetected;
|
|
3969
3969
|
let energyToday, energyLastSevenDays, energyLifetime, energyLifetimeUpload, energyLifetimeWithOffset;
|
|
3970
3970
|
const powerPeakStored = this.pv.powerAndEnergyData[key].powerPeak;
|
|
@@ -3973,6 +3973,7 @@ class EnvoyDevice extends EventEmitter {
|
|
|
3973
3973
|
case 'production': {
|
|
3974
3974
|
const sourcePcu = powerAndEnergy[key].pcu;
|
|
3975
3975
|
const sourceEim = powerAndEnergy[key].eim;
|
|
3976
|
+
measurementType = 'Production';
|
|
3976
3977
|
sourceMeter = meterEnabled ? meters.find(m => m.measurementType === 'production') : sourcePcu;
|
|
3977
3978
|
sourceEnergy = meterEnabled ? sourceEim : sourcePcu;
|
|
3978
3979
|
power = this.functions.isValidValue(sourceMeter.power) ? sourceMeter.power : null;
|
|
@@ -3988,6 +3989,7 @@ class EnvoyDevice extends EventEmitter {
|
|
|
3988
3989
|
break;
|
|
3989
3990
|
}
|
|
3990
3991
|
case 'consumptionNet': {
|
|
3992
|
+
measurementType = 'Consumption Net';
|
|
3991
3993
|
sourceMeter = meters.find(m => m.measurementType === 'net-consumption');
|
|
3992
3994
|
sourceEnergy = powerAndEnergy[key];
|
|
3993
3995
|
power = this.functions.isValidValue(sourceMeter.power) ? sourceMeter.power : null;
|
|
@@ -4001,6 +4003,7 @@ class EnvoyDevice extends EventEmitter {
|
|
|
4001
4003
|
break;
|
|
4002
4004
|
}
|
|
4003
4005
|
case 'consumptionTotal': {
|
|
4006
|
+
measurementType = 'Consumption Total';
|
|
4004
4007
|
sourceMeter = meters.find(m => m.measurementType === 'total-consumption');
|
|
4005
4008
|
sourceEnergy = powerAndEnergy[key];
|
|
4006
4009
|
power = this.functions.isValidValue(sourceMeter.power) ? sourceMeter.power : null;
|
|
@@ -4017,7 +4020,6 @@ class EnvoyDevice extends EventEmitter {
|
|
|
4017
4020
|
if (this.functions.isValidValue(powerPeak) && powerPeakDetected) powerPeakStored.powerPeak = powerPeak;
|
|
4018
4021
|
|
|
4019
4022
|
if (!sourceMeter) continue;
|
|
4020
|
-
const measurementType = ApiCodes[sourceMeter.measurementType];
|
|
4021
4023
|
if (this.logDebug) {
|
|
4022
4024
|
this.emit('debug', `${measurementType} data source meter:`, sourceMeter);
|
|
4023
4025
|
this.emit('debug', `${measurementType} data source energy:`, sourceEnergy);
|