From 6b10669bf67da4baa14bc5b28161710e4025c913 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Sun, 20 Jun 2021 13:56:40 +0200 Subject: [PATCH] Consistent name for MeterValues related CS template tunable. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- README.md | 2 +- src/charging-station/ChargingStation.ts | 4 ++-- src/charging-station/ocpp/1.6/OCPP16RequestService.ts | 2 +- src/types/ChargingStationTemplate.ts | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index a4a39038..6748a91a 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ outOfOrderEndMeterValues | true/false | false | boolean | send Transaction.End M meteringPerTransaction | true/false | true | boolean | disable metering on a per transaction basis transactionDataMeterValues | true/false | false | boolean | enable transaction data MeterValues at stop transaction mainVoltageMeterValues | true/false | true | boolean | include charging station main voltage MeterValues on three phased charging stations -phaseLineToLineVoltage | true/false | true | boolean | include charging station line to line voltage MeterValues on three phased charging stations +phaseLineToLineVoltageMeterValues | true/false | true | boolean | include charging station line to line voltage MeterValues on three phased charging stations Configuration | | | ChargingStationConfiguration | charging stations OCPP configuration parameters AutomaticTransactionGenerator | | | AutomaticTransactionGenerator | charging stations ATG configuration Connectors | | | Connectors | charging stations connectors configuration diff --git a/src/charging-station/ChargingStation.ts b/src/charging-station/ChargingStation.ts index 8be54a78..0f2034fa 100644 --- a/src/charging-station/ChargingStation.ts +++ b/src/charging-station/ChargingStation.ts @@ -169,8 +169,8 @@ export default class ChargingStation { return this.stationInfo.mainVoltageMeterValues ?? true; } - public getPhaseLineToLineVoltage(): boolean { - return this.stationInfo.phaseLineToLineVoltage ?? false; + public getPhaseLineToLineVoltageMeterValues(): boolean { + return this.stationInfo.phaseLineToLineVoltageMeterValues ?? false; } public getEnergyActiveImportRegisterByTransactionId(transactionId: number): number | undefined { diff --git a/src/charging-station/ocpp/1.6/OCPP16RequestService.ts b/src/charging-station/ocpp/1.6/OCPP16RequestService.ts index 628c1203..f009a4ab 100644 --- a/src/charging-station/ocpp/1.6/OCPP16RequestService.ts +++ b/src/charging-station/ocpp/1.6/OCPP16RequestService.ts @@ -151,7 +151,7 @@ export default class OCPP16RequestService extends OCPPRequestService { } meterValue.sampledValue.push(OCPP16ServiceUtils.buildSampledValue(voltagePhaseLineToNeutralSampledValueTemplate ?? voltageSampledValueTemplate, voltagePhaseLineToNeutralMeasurandValue ?? voltageMeasurandValue, null, phaseLineToNeutralValue as OCPP16MeterValuePhase)); - if (self.chargingStation.getPhaseLineToLineVoltage()) { + if (self.chargingStation.getPhaseLineToLineVoltageMeterValues()) { const phaseLineToLineValue = `L${phase}-L${(phase + 1) % self.chargingStation.getNumberOfPhases() !== 0 ? (phase + 1) % self.chargingStation.getNumberOfPhases() : self.chargingStation.getNumberOfPhases()}`; const voltagePhaseLineToLineSampledValueTemplate = self.chargingStation.getSampledValueTemplate(connectorId, OCPP16MeterValueMeasurand.VOLTAGE, phaseLineToLineValue as OCPP16MeterValuePhase); let voltagePhaseLineToLineMeasurandValue: number; diff --git a/src/types/ChargingStationTemplate.ts b/src/types/ChargingStationTemplate.ts index 0c90c622..5fff748b 100644 --- a/src/types/ChargingStationTemplate.ts +++ b/src/types/ChargingStationTemplate.ts @@ -63,7 +63,7 @@ export default interface ChargingStationTemplate { meteringPerTransaction?: boolean; transactionDataMeterValues?: boolean; mainVoltageMeterValues?: boolean; - phaseLineToLineVoltage?: boolean; + phaseLineToLineVoltageMeterValues?: boolean; Configuration?: ChargingStationConfiguration; AutomaticTransactionGenerator: AutomaticTransactionGenerator; Connectors: Connectors; -- 2.34.1