From: Jérôme Benoit <jerome.benoit@sap.com>
Date: Fri, 4 Dec 2020 15:38:52 +0000 (+0100)
Subject: Revert "Heartbeat interval is expected to be a string."
X-Git-Tag: v1.0.1-0~167
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=e4cc41bf9a627c49cdeba1725a2471ad8637f424;p=e-mobility-charging-stations-simulator.git

Revert "Heartbeat interval is expected to be a string."

This reverts commit 03df629e6ac438a6963cf7241ccd767ed1b8530c.
---

diff --git a/src/charging-station/ChargingStation.ts b/src/charging-station/ChargingStation.ts
index e7f8166e..9367f653 100644
--- a/src/charging-station/ChargingStation.ts
+++ b/src/charging-station/ChargingStation.ts
@@ -615,7 +615,7 @@ export default class ChargingStation {
       await this._startMessageSequence();
     } else {
       do {
-        await Utils.sleep(Utils.convertToInt(this._bootNotificationResponse.interval) * 1000);
+        await Utils.sleep(this._bootNotificationResponse.interval * 1000);
         // Resend BootNotification
         this._bootNotificationResponse = await this.sendBootNotification();
       } while (this._bootNotificationResponse.status !== RegistrationStatus.ACCEPTED);
@@ -1122,8 +1122,8 @@ export default class ChargingStation {
     if (payload.status === RegistrationStatus.ACCEPTED) {
       this._heartbeatInterval = Utils.convertToInt(payload.interval) * 1000;
       this._heartbeatSetInterval ? this._restartHeartbeat() : this._startHeartbeat();
-      this._addConfigurationKey('HeartBeatInterval', payload.interval);
-      this._addConfigurationKey('HeartbeatInterval', payload.interval, false, false);
+      this._addConfigurationKey('HeartBeatInterval', payload.interval.toString());
+      this._addConfigurationKey('HeartbeatInterval', payload.interval.toString(), false, false);
       this._hasStopped && (this._hasStopped = false);
     } else if (payload.status === RegistrationStatus.PENDING) {
       logger.info(this._logPrefix() + ' Charging station in pending state on the central server');
diff --git a/src/types/ocpp/1.6/RequestResponses.ts b/src/types/ocpp/1.6/RequestResponses.ts
index 0a29c134..baf66c15 100644
--- a/src/types/ocpp/1.6/RequestResponses.ts
+++ b/src/types/ocpp/1.6/RequestResponses.ts
@@ -43,7 +43,7 @@ export enum RegistrationStatus {
 export interface BootNotificationResponse {
   status: RegistrationStatus;
   currentTime: string;
-  interval: string;
+  interval: number;
 }
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface