X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2Focpp%2F1.6%2FRequests.ts;h=32d9757f4cea58be69ca349976cbc760709933c2;hb=a223d9be48ad8828e6aef060dd3c45d4f99ea9a9;hp=f8a1957009e70c77f5a3a2d9152ec0dc88756d8f;hpb=78202038ffd2aca15aa97f45bc66ba42f40f2ec4;p=e-mobility-charging-stations-simulator.git

diff --git a/src/types/ocpp/1.6/Requests.ts b/src/types/ocpp/1.6/Requests.ts
index f8a19570..32d9757f 100644
--- a/src/types/ocpp/1.6/Requests.ts
+++ b/src/types/ocpp/1.6/Requests.ts
@@ -1,10 +1,14 @@
-import type { OCPP16ChargePointErrorCode } from './ChargePointErrorCode';
-import type { OCPP16ChargePointStatus } from './ChargePointStatus';
-import type { ChargingProfilePurposeType, OCPP16ChargingProfile } from './ChargingProfile';
-import type { OCPP16StandardParametersKey } from './Configuration';
-import type { OCPP16DiagnosticsStatus } from './DiagnosticsStatus';
-import type { EmptyObject } from '../../EmptyObject';
-import type { JsonObject } from '../../JsonType';
+import type { OCPP16ChargePointErrorCode } from './ChargePointErrorCode.js'
+import type { OCPP16ChargePointStatus } from './ChargePointStatus.js'
+import type {
+  OCPP16ChargingProfile,
+  OCPP16ChargingProfilePurposeType,
+  OCPP16ChargingRateUnitType
+} from './ChargingProfile.js'
+import type { OCPP16StandardParametersKey, OCPP16VendorParametersKey } from './Configuration.js'
+import type { OCPP16DiagnosticsStatus } from './DiagnosticsStatus.js'
+import type { EmptyObject } from '../../EmptyObject.js'
+import type { JsonObject } from '../../JsonType.js'
 
 export enum OCPP16RequestCommand {
   BOOT_NOTIFICATION = 'BootNotification',
@@ -16,7 +20,7 @@ export enum OCPP16RequestCommand {
   METER_VALUES = 'MeterValues',
   DIAGNOSTICS_STATUS_NOTIFICATION = 'DiagnosticsStatusNotification',
   FIRMWARE_STATUS_NOTIFICATION = 'FirmwareStatusNotification',
-  DATA_TRANSFER = 'DataTransfer',
+  DATA_TRANSFER = 'DataTransfer'
 }
 
 export enum OCPP16IncomingRequestCommand {
@@ -26,6 +30,7 @@ export enum OCPP16IncomingRequestCommand {
   UNLOCK_CONNECTOR = 'UnlockConnector',
   GET_CONFIGURATION = 'GetConfiguration',
   CHANGE_CONFIGURATION = 'ChangeConfiguration',
+  GET_COMPOSITE_SCHEDULE = 'GetCompositeSchedule',
   SET_CHARGING_PROFILE = 'SetChargingProfile',
   CLEAR_CHARGING_PROFILE = 'ClearChargingProfile',
   REMOTE_START_TRANSACTION = 'RemoteStartTransaction',
@@ -34,93 +39,103 @@ export enum OCPP16IncomingRequestCommand {
   TRIGGER_MESSAGE = 'TriggerMessage',
   DATA_TRANSFER = 'DataTransfer',
   UPDATE_FIRMWARE = 'UpdateFirmware',
+  RESERVE_NOW = 'ReserveNow',
+  CANCEL_RESERVATION = 'CancelReservation'
 }
 
-export type OCPP16HeartbeatRequest = EmptyObject;
+export type OCPP16HeartbeatRequest = EmptyObject
 
 export interface OCPP16BootNotificationRequest extends JsonObject {
-  chargePointVendor: string;
-  chargePointModel: string;
-  chargePointSerialNumber?: string;
-  chargeBoxSerialNumber?: string;
-  firmwareVersion?: string;
-  iccid?: string;
-  imsi?: string;
-  meterType?: string;
-  meterSerialNumber?: string;
+  chargePointVendor: string
+  chargePointModel: string
+  chargePointSerialNumber?: string
+  chargeBoxSerialNumber?: string
+  firmwareVersion?: string
+  iccid?: string
+  imsi?: string
+  meterType?: string
+  meterSerialNumber?: string
 }
 
 export interface OCPP16StatusNotificationRequest extends JsonObject {
-  connectorId: number;
-  errorCode: OCPP16ChargePointErrorCode;
-  status: OCPP16ChargePointStatus;
-  info?: string;
-  timestamp?: Date;
-  vendorId?: string;
-  vendorErrorCode?: string;
+  connectorId: number
+  errorCode: OCPP16ChargePointErrorCode
+  status: OCPP16ChargePointStatus
+  info?: string
+  timestamp?: Date
+  vendorId?: string
+  vendorErrorCode?: string
 }
 
-export type OCPP16ClearCacheRequest = EmptyObject;
+export type OCPP16ClearCacheRequest = EmptyObject
+
+type OCPP16ConfigurationKey = string | OCPP16StandardParametersKey | OCPP16VendorParametersKey
 
 export interface ChangeConfigurationRequest extends JsonObject {
-  key: string | OCPP16StandardParametersKey;
-  value: string;
+  key: OCPP16ConfigurationKey
+  value: string
 }
 
 export interface RemoteStartTransactionRequest extends JsonObject {
-  connectorId: number;
-  idTag: string;
-  chargingProfile?: OCPP16ChargingProfile;
+  connectorId: number
+  idTag: string
+  chargingProfile?: OCPP16ChargingProfile
 }
 
 export interface RemoteStopTransactionRequest extends JsonObject {
-  transactionId: number;
+  transactionId: number
 }
 
 export interface UnlockConnectorRequest extends JsonObject {
-  connectorId: number;
+  connectorId: number
 }
 
 export interface GetConfigurationRequest extends JsonObject {
-  key?: string | OCPP16StandardParametersKey[];
+  key?: OCPP16ConfigurationKey[]
 }
 
-export enum ResetType {
+enum ResetType {
   HARD = 'Hard',
-  SOFT = 'Soft',
+  SOFT = 'Soft'
 }
 
 export interface ResetRequest extends JsonObject {
-  type: ResetType;
+  type: ResetType
+}
+
+export interface OCPP16GetCompositeScheduleRequest extends JsonObject {
+  connectorId: number
+  duration: number
+  chargingRateUnit?: OCPP16ChargingRateUnitType
 }
 
 export interface SetChargingProfileRequest extends JsonObject {
-  connectorId: number;
-  csChargingProfiles: OCPP16ChargingProfile;
+  connectorId: number
+  csChargingProfiles: OCPP16ChargingProfile
 }
 
 export enum OCPP16AvailabilityType {
-  INOPERATIVE = 'Inoperative',
-  OPERATIVE = 'Operative',
+  Inoperative = 'Inoperative',
+  Operative = 'Operative'
 }
 
-export interface ChangeAvailabilityRequest extends JsonObject {
-  connectorId: number;
-  type: OCPP16AvailabilityType;
+export interface OCPP16ChangeAvailabilityRequest extends JsonObject {
+  connectorId: number
+  type: OCPP16AvailabilityType
 }
 
-export interface ClearChargingProfileRequest extends JsonObject {
-  id?: number;
-  connectorId?: number;
-  chargingProfilePurpose?: ChargingProfilePurposeType;
-  stackLevel?: number;
+export interface OCPP16ClearChargingProfileRequest extends JsonObject {
+  id?: number
+  connectorId?: number
+  chargingProfilePurpose?: OCPP16ChargingProfilePurposeType
+  stackLevel?: number
 }
 
 export interface OCPP16UpdateFirmwareRequest extends JsonObject {
-  location: string;
-  retrieveDate: Date;
-  retries?: number;
-  retryInterval?: number;
+  location: string
+  retrieveDate: Date
+  retries?: number
+  retryInterval?: number
 }
 
 export enum OCPP16FirmwareStatus {
@@ -130,23 +145,23 @@ export enum OCPP16FirmwareStatus {
   Idle = 'Idle',
   InstallationFailed = 'InstallationFailed',
   Installing = 'Installing',
-  Installed = 'Installed',
+  Installed = 'Installed'
 }
 
 export type OCPP16FirmwareStatusNotificationRequest = {
-  status: OCPP16FirmwareStatus;
-} & JsonObject;
+  status: OCPP16FirmwareStatus
+} & JsonObject
 
 export interface GetDiagnosticsRequest extends JsonObject {
-  location: string;
-  retries?: number;
-  retryInterval?: number;
-  startTime?: Date;
-  stopTime?: Date;
+  location: string
+  retries?: number
+  retryInterval?: number
+  startTime?: Date
+  stopTime?: Date
 }
 
 export interface OCPP16DiagnosticsStatusNotificationRequest extends JsonObject {
-  status: OCPP16DiagnosticsStatus;
+  status: OCPP16DiagnosticsStatus
 }
 
 export enum OCPP16MessageTrigger {
@@ -155,18 +170,30 @@ export enum OCPP16MessageTrigger {
   FirmwareStatusNotification = 'FirmwareStatusNotification',
   Heartbeat = 'Heartbeat',
   MeterValues = 'MeterValues',
-  StatusNotification = 'StatusNotification',
+  StatusNotification = 'StatusNotification'
 }
 
 export interface OCPP16TriggerMessageRequest extends JsonObject {
-  requestedMessage: OCPP16MessageTrigger;
-  connectorId?: number;
+  requestedMessage: OCPP16MessageTrigger
+  connectorId?: number
 }
 
 export enum OCPP16DataTransferVendorId {}
 
 export interface OCPP16DataTransferRequest extends JsonObject {
-  vendorId: string;
-  messageId?: string;
-  data?: string;
+  vendorId: string
+  messageId?: string
+  data?: string
+}
+
+export interface OCPP16ReserveNowRequest extends JsonObject {
+  connectorId: number
+  expiryDate: Date
+  idTag: string
+  parentIdTag?: string
+  reservationId: number
+}
+
+export interface OCPP16CancelReservationRequest extends JsonObject {
+  reservationId: number
 }