repositories
/
e-mobility-charging-stations-simulator.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix: ensure custom meterValues values are taken
[e-mobility-charging-stations-simulator.git]
/
src
/
charging-station
/
ocpp
/
1.6
/
OCPP16ResponseService.ts
diff --git
a/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts
b/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts
index e978b24fdfee0fcab7a0323383ec87f2f0e595ec..edec1e4eb53f40bc62f93349d4e97db907637fad 100644
(file)
--- a/
src/charging-station/ocpp/1.6/OCPP16ResponseService.ts
+++ b/
src/charging-station/ocpp/1.6/OCPP16ResponseService.ts
@@
-516,7
+516,7
@@
export class OCPP16ResponseService extends OCPPResponseService {
if (
connectorStatus?.transactionRemoteStarted === true &&
chargingStation.getAuthorizeRemoteTxRequests() === true &&
if (
connectorStatus?.transactionRemoteStarted === true &&
chargingStation.getAuthorizeRemoteTxRequests() === true &&
- chargingStation.
getRemoteAuthorization()
=== true &&
+ chargingStation.
stationInfo?.remoteAuthorization
=== true &&
connectorStatus?.idTagLocalAuthorized === false &&
connectorStatus?.idTagAuthorized === false
) {
connectorStatus?.idTagLocalAuthorized === false &&
connectorStatus?.idTagAuthorized === false
) {
@@
-629,7
+629,7
@@
export class OCPP16ResponseService extends OCPPResponseService {
ReservationTerminationReason.TRANSACTION_STARTED,
);
}
ReservationTerminationReason.TRANSACTION_STARTED,
);
}
- chargingStation.
getBeginEndMeterValues()
&&
+ chargingStation.
stationInfo?.beginEndMeterValues
&&
(await chargingStation.ocppRequestService.requestHandler<
OCPP16MeterValuesRequest,
OCPP16MeterValuesResponse
(await chargingStation.ocppRequestService.requestHandler<
OCPP16MeterValuesRequest,
OCPP16MeterValuesResponse
@@
-712,9
+712,9
@@
export class OCPP16ResponseService extends OCPPResponseService {
);
return;
}
);
return;
}
- chargingStation.
getBeginEndMeterValues()
=== true &&
- chargingStation.
getOcppStrictCompliance()
=== false &&
- chargingStation.
getOutOfOrderEndMeterValues()
=== true &&
+ chargingStation.
stationInfo?.beginEndMeterValues
=== true &&
+ chargingStation.
stationInfo?.ocppStrictCompliance
=== false &&
+ chargingStation.
stationInfo?.outOfOrderEndMeterValues
=== true &&
(await chargingStation.ocppRequestService.requestHandler<
OCPP16MeterValuesRequest,
OCPP16MeterValuesResponse
(await chargingStation.ocppRequestService.requestHandler<
OCPP16MeterValuesRequest,
OCPP16MeterValuesResponse
@@
-755,7
+755,7
@@
export class OCPP16ResponseService extends OCPPResponseService {
requestPayload.transactionId
} STOPPED on ${
chargingStation.stationInfo.chargingStationId
requestPayload.transactionId
} STOPPED on ${
chargingStation.stationInfo.chargingStationId
- }#${transactionConnectorId} with status '${payload.idTagInfo?.status
?? 'undefined'
}'`;
+ }#${transactionConnectorId} with status '${payload.idTagInfo?.status}'`;
if (
isNullOrUndefined(payload.idTagInfo) ||
payload.idTagInfo?.status === OCPP16AuthorizationStatus.ACCEPTED
if (
isNullOrUndefined(payload.idTagInfo) ||
payload.idTagInfo?.status === OCPP16AuthorizationStatus.ACCEPTED