Merge branch 'main' into reservation-feature

[e-mobility-charging-stations-simulator.git] / src / types / ocpp / Responses.ts

diff --git a/src/types/ocpp/Responses.ts b/src/types/ocpp/Responses.ts
index ae6ae45d67d6404b9ac9f6153d8af8550d438191..a2f431d452d602b47875f1ee332ecb10a7748740 100644 (file)
--- a/src/types/ocpp/Responses.ts
+++ b/src/types/ocpp/Responses.ts
@@ -1,10 +1,8 @@
-import type { ChargingStation } from '../../charging-station';
+import type { OCPP16MeterValuesResponse } from './1.6/MeterValues';
 import {
-  type ErrorType,
-  type JsonType,
-  type MessageType,
   OCPP16AvailabilityStatus,
   type OCPP16BootNotificationResponse,
+  OCPP16CancelReservationStatus,
   OCPP16ChargingProfileStatus,
   OCPP16ClearChargingProfileStatus,
   OCPP16ConfigurationStatus,
@@ -13,14 +11,20 @@ import {
   type OCPP16DiagnosticsStatusNotificationResponse,
   type OCPP16FirmwareStatusNotificationResponse,
   type OCPP16HeartbeatResponse,
-  type OCPP16MeterValuesResponse,
+  OCPP16ReservationStatus,
   type OCPP16StatusNotificationResponse,
   OCPP16TriggerMessageStatus,
   OCPP16UnlockStatus,
-  type OCPP20BootNotificationResponse,
-  type OCPP20ClearCacheResponse,
-  type OCPP20StatusNotificationResponse,
-} from '../internal';
+} from './1.6/Responses';
+import type {
+  OCPP20BootNotificationResponse,
+  OCPP20ClearCacheResponse,
+  OCPP20StatusNotificationResponse,
+} from './2.0/Responses';
+import type { ErrorType } from './ErrorType';
+import type { MessageType } from './MessageType';
+import type { ChargingStation } from '../../charging-station';
+import type { JsonType } from '../JsonType';
 
 export type Response = [MessageType.CALL_RESULT_MESSAGE, string, JsonType];
 
@@ -53,8 +57,8 @@ export type DiagnosticsStatusNotificationResponse = OCPP16DiagnosticsStatusNotif
 export type FirmwareStatusNotificationResponse = OCPP16FirmwareStatusNotificationResponse;
 
 export enum GenericStatus {
-  ACCEPTED = 'Accepted',
-  REJECTED = 'Rejected',
+  Accepted = 'Accepted',
+  Rejected = 'Rejected',
 }
 
 export type GenericResponse = {
@@ -101,3 +105,13 @@ export const DataTransferStatus = {
   ...OCPP16DataTransferStatus,
 } as const;
 export type DataTransferStatus = OCPP16DataTransferStatus;
+
+export type ReservationStatus = OCPP16ReservationStatus;
+export const ReservationStatus = {
+  ...OCPP16ReservationStatus,
+};
+
+export type CancelReservationStatus = OCPP16CancelReservationStatus;
+export const CancelReservationStatus = {
+  ...OCPP16CancelReservationStatus,
+};