From: Jérôme Benoit <jerome.benoit@sap.com>
Date: Mon, 5 Jun 2023 15:36:45 +0000 (+0200)
Subject: Merge branch 'main' into reservation-feature
X-Git-Tag: v1.2.16~13^2
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=d58b442097da31f8b974d51aef63c64470d9ab48;p=e-mobility-charging-stations-simulator.git

Merge branch 'main' into reservation-feature
---

d58b442097da31f8b974d51aef63c64470d9ab48
diff --cc src/charging-station/ChargingStation.ts
index 82ed3b8c,9a8f468b..a3f67696
--- a/src/charging-station/ChargingStation.ts
+++ b/src/charging-station/ChargingStation.ts
@@@ -67,11 -67,9 +67,12 @@@ import 
    PowerUnits,
    RegistrationStatusEnumType,
    RequestCommand,
 +  type Reservation,
 +  ReservationFilterKey,
 +  ReservationTerminationReason,
    type Response,
    StandardParametersKey,
+   type Status,
    type StatusNotificationRequest,
    type StatusNotificationResponse,
    StopTransactionReason,
@@@ -650,12 -645,9 +653,12 @@@ export class ChargingStation 
          if (this.getEnableStatistics() === true) {
            this.performanceStatistics?.start();
          }
 +        if (this.hasFeatureProfile(SupportedFeatureProfiles.Reservation)) {
 +          this.startReservationExpiryDateSetInterval();
 +        }
          this.openWSConnection();
          // Monitor charging station template file
-         this.templateFileWatcher = FileUtils.watchJsonFile(
+         this.templateFileWatcher = watchJsonFile(
            this.templateFile,
            FileType.ChargingStationTemplate,
            this.logPrefix(),
@@@ -1280,9 -1078,12 +1290,13 @@@
      return this.stationInfo?.stationInfoPersistentConfiguration ?? true;
    }
  
+   private getAutomaticTransactionGeneratorPersistentConfiguration(): boolean {
+     return this.stationInfo?.automaticTransactionGeneratorPersistentConfiguration ?? true;
+   }
+ 
    private handleUnsupportedVersion(version: OCPPVersion) {
 -    const errorMsg = `Unsupported protocol version '${version}' configured in template file ${this.templateFile}`;
 +    const errorMsg = `Unsupported protocol version '${version}' configured
 +      in template file ${this.templateFile}`;
      logger.error(`${this.logPrefix()} ${errorMsg}`);
      throw new BaseError(errorMsg);
    }
diff --cc src/charging-station/ocpp/OCPPConstants.ts
index 2d2a34a0,e82b7d70..b3f4dd32
--- a/src/charging-station/ocpp/OCPPConstants.ts
+++ b/src/charging-station/ocpp/OCPPConstants.ts
@@@ -101,35 -104,11 +105,39 @@@ export class OCPPConstants 
    static readonly OCPP_DATA_TRANSFER_RESPONSE_REJECTED = Object.freeze({
      status: DataTransferStatus.REJECTED,
    });
 -
++  
+   static readonly OCPP_DATA_TRANSFER_RESPONSE_UNKNOWN_VENDOR_ID = Object.freeze({
+     status: DataTransferStatus.UNKNOWN_VENDOR_ID,
+   });
  
 +  static readonly OCPP_RESERVATION_RESPONSE_ACCEPTED = Object.freeze({
 +    status: ReservationStatus.ACCEPTED,
 +  }); // Reservation has been made
 +
 +  static readonly OCPP_RESERVATION_RESPONSE_FAULTED = Object.freeze({
 +    status: ReservationStatus.FAULTED,
 +  }); // Reservation has not been made, because of connector in FAULTED state
 +
 +  static readonly OCPP_RESERVATION_RESPONSE_OCCUPIED = Object.freeze({
 +    status: ReservationStatus.OCCUPIED,
 +  }); // Reservation has not been made, because all connectors are OCCUPIED
 +
 +  static readonly OCPP_RESERVATION_RESPONSE_REJECTED = Object.freeze({
 +    status: ReservationStatus.REJECTED,
 +  }); // Reservation has not been made, because CS is not configured to accept reservations
 +
 +  static readonly OCPP_RESERVATION_RESPONSE_UNAVAILABLE = Object.freeze({
 +    status: ReservationStatus.UNAVAILABLE,
 +  }); // Reservation has not been made, because connectors are spec. connector is in UNAVAILABLE state
 +
 +  static readonly OCPP_CANCEL_RESERVATION_RESPONSE_ACCEPTED = Object.freeze({
 +    status: GenericStatus.Accepted,
 +  }); // Reservation for id has been cancelled has been made
 +
 +  static readonly OCPP_CANCEL_RESERVATION_RESPONSE_REJECTED = Object.freeze({
 +    status: GenericStatus.Rejected,
 +  }); // Reservation could not be cancelled, because there is no reservation active for id
 +
    protected constructor() {
      // This is intentional
    }