@zetra/citrineos-base 1.8.3-fork.137 → 1.8.3-fork.139
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.
|
@@ -12,9 +12,11 @@ export class MeterValueUtils {
|
|
|
12
12
|
* @return {number} total Kwh based on the best available energy measurement.
|
|
13
13
|
*/
|
|
14
14
|
static getTotalKwh(meterValues, currentTotal, meterStart) {
|
|
15
|
+
// A batch without usable energy readings (e.g. only Sample.Clock, or only Power/SoC)
|
|
16
|
+
// carries no new information: keep the running total instead of resetting it to 0.
|
|
15
17
|
const filteredValues = this.filterValidMeterValues(meterValues);
|
|
16
18
|
if (filteredValues.length === 0) {
|
|
17
|
-
return
|
|
19
|
+
return currentTotal;
|
|
18
20
|
}
|
|
19
21
|
const registerMap = this.getRegisterValuesMap(filteredValues);
|
|
20
22
|
if (registerMap.size > 0) {
|
|
@@ -34,7 +36,7 @@ export class MeterValueUtils {
|
|
|
34
36
|
const latestTimestamp = Math.max(...Array.from(netMap.keys()));
|
|
35
37
|
return netMap.get(latestTimestamp);
|
|
36
38
|
}
|
|
37
|
-
return
|
|
39
|
+
return currentTotal;
|
|
38
40
|
}
|
|
39
41
|
static getMeterStart(meterValues) {
|
|
40
42
|
const filteredValues = this.filterValidMeterValues(meterValues);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MeterValueUtils.js","sourceRoot":"","sources":["../../src/util/MeterValueUtils.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,aAAa,EACb,SAAS,EACT,kBAAkB,GAGnB,MAAM,kCAAkC,CAAC;AAG1C,MAAM,OAAO,eAAe;IAClB,MAAM,CAAU,aAAa,GAAG,IAAI,GAAG,CAAyB;QACtE,kBAAkB,CAAC,mBAAmB,CAAC;QACvC,kBAAkB,CAAC,iBAAiB,CAAC;QACrC,kBAAkB,CAAC,iBAAiB,CAAC;KACtC,CAAC,CAAC;IAEH;;;;;OAKG;IACI,MAAM,CAAC,WAAW,CACvB,WAA4B,EAC5B,YAAoB,EACpB,UAAmB;QAEnB,MAAM,cAAc,GAAG,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC;QAChE,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAChC,OAAO,
|
|
1
|
+
{"version":3,"file":"MeterValueUtils.js","sourceRoot":"","sources":["../../src/util/MeterValueUtils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zetra/citrineos-base",
|
|
3
|
-
"version": "1.8.3-fork.
|
|
3
|
+
"version": "1.8.3-fork.139",
|
|
4
4
|
"description": "The base module for OCPP v2.0.1 including all interfaces. This module is not intended to be used directly, but rather as a dependency for other modules.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|