fix: ensure the BootNotification interval is reused a registration

retries

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

diff --git a/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts b/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts
index 3666d04842877d15ba69cd4b73037fd575c4d667..be3abd7976023f4f6924280689962b6cc7a4d04d 100644 (file)
--- 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 be63f14aeef3cb23e50cdd7ba46ae9bc45f958a1..6e499d1f1e2cc35fda553490a587c0781a5a3362 100644 (file)
--- 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)