From fcc3ada9f33a04267d32fac032eee1bd0ad98152 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Tue, 8 Apr 2025 11:59:15 +0200 Subject: [PATCH] fix: ensure the BootNotification interval is reused a registration retries MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- .../ocpp/1.6/OCPP16ResponseService.ts | 28 +++++++++---------- .../ocpp/2.0/OCPP20ResponseService.ts | 14 +++++----- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts b/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts index 3666d048..be3abd79 100644 --- a/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts +++ b/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts @@ -508,21 +508,21 @@ export class OCPP16ResponseService extends OCPPResponseService { ): void { if (Object.values(RegistrationStatusEnumType).includes(payload.status)) { chargingStation.bootNotificationResponse = payload + addConfigurationKey( + chargingStation, + OCPP16StandardParametersKey.HeartbeatInterval, + payload.interval.toString(), + {}, + { overwrite: true, save: true } + ) + addConfigurationKey( + chargingStation, + OCPP16StandardParametersKey.HeartBeatInterval, + payload.interval.toString(), + { visible: false }, + { overwrite: true, save: true } + ) if (chargingStation.inAcceptedState()) { - addConfigurationKey( - chargingStation, - OCPP16StandardParametersKey.HeartbeatInterval, - payload.interval.toString(), - {}, - { overwrite: true, save: true } - ) - addConfigurationKey( - chargingStation, - OCPP16StandardParametersKey.HeartBeatInterval, - payload.interval.toString(), - { visible: false }, - { overwrite: true, save: true } - ) chargingStation.emit(ChargingStationEvents.accepted) } else if (chargingStation.inPendingState()) { chargingStation.emit(ChargingStationEvents.pending) diff --git a/src/charging-station/ocpp/2.0/OCPP20ResponseService.ts b/src/charging-station/ocpp/2.0/OCPP20ResponseService.ts index be63f14a..6e499d1f 100644 --- a/src/charging-station/ocpp/2.0/OCPP20ResponseService.ts +++ b/src/charging-station/ocpp/2.0/OCPP20ResponseService.ts @@ -170,14 +170,14 @@ export class OCPP20ResponseService extends OCPPResponseService { ): void { if (Object.values(RegistrationStatusEnumType).includes(payload.status)) { chargingStation.bootNotificationResponse = payload + addConfigurationKey( + chargingStation, + OCPP20OptionalVariableName.HeartbeatInterval, + payload.interval.toString(), + {}, + { overwrite: true, save: true } + ) if (chargingStation.inAcceptedState()) { - addConfigurationKey( - chargingStation, - OCPP20OptionalVariableName.HeartbeatInterval, - payload.interval.toString(), - {}, - { overwrite: true, save: true } - ) chargingStation.emit(ChargingStationEvents.accepted) } else if (chargingStation.inPendingState()) { chargingStation.emit(ChargingStationEvents.pending) -- 2.43.0