X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftypes%2Focpp%2FResponses.ts;h=f14ef426871c107b8533d8744fde282f6930a857;hb=6b635033ddf255392ded26fd03fe1f128b15ad69;hp=c2b1f53a55a71cf39029238a417d691fb1612070;hpb=c9a4f9ea603df09541c6837fee50012256fb46ad;p=e-mobility-charging-stations-simulator.git diff --git a/src/types/ocpp/Responses.ts b/src/types/ocpp/Responses.ts index c2b1f53a..f14ef426 100644 --- a/src/types/ocpp/Responses.ts +++ b/src/types/ocpp/Responses.ts @@ -1,7 +1,8 @@ -import type ChargingStation from '../../charging-station/ChargingStation'; -import type { JsonType } from '../JsonType'; -import type { OCPP16MeterValuesResponse } from './1.6/MeterValues'; +import type { ChargingStation } from '../../charging-station'; import { + type ErrorType, + type JsonType, + type MessageType, OCPP16AvailabilityStatus, type OCPP16BootNotificationResponse, OCPP16ChargingProfileStatus, @@ -12,13 +13,14 @@ import { type OCPP16DiagnosticsStatusNotificationResponse, type OCPP16FirmwareStatusNotificationResponse, type OCPP16HeartbeatResponse, + type OCPP16MeterValuesResponse, type OCPP16StatusNotificationResponse, OCPP16TriggerMessageStatus, OCPP16UnlockStatus, -} from './1.6/Responses'; -import type { OCPP20BootNotificationResponse } from './2.0/Responses'; -import type { ErrorType } from './ErrorType'; -import type { MessageType } from './MessageType'; + type OCPP20BootNotificationResponse, + type OCPP20ClearCacheResponse, + type OCPP20StatusNotificationResponse, +} from '../internal'; export type Response = [MessageType.CALL_RESULT_MESSAGE, string, JsonType]; @@ -36,7 +38,11 @@ export type BootNotificationResponse = export type HeartbeatResponse = OCPP16HeartbeatResponse; -export type StatusNotificationResponse = OCPP16StatusNotificationResponse; +export type ClearCacheResponse = GenericResponse | OCPP20ClearCacheResponse; + +export type StatusNotificationResponse = + | OCPP16StatusNotificationResponse + | OCPP20StatusNotificationResponse; export type MeterValuesResponse = OCPP16MeterValuesResponse; @@ -46,13 +52,13 @@ export type DiagnosticsStatusNotificationResponse = OCPP16DiagnosticsStatusNotif export type FirmwareStatusNotificationResponse = OCPP16FirmwareStatusNotificationResponse; -export enum DefaultStatus { - ACCEPTED = 'Accepted', - REJECTED = 'Rejected', +export enum GenericStatus { + Accepted = 'Accepted', + Rejected = 'Rejected', } -export type DefaultResponse = { - status: DefaultStatus; +export type GenericResponse = { + status: GenericStatus; }; export enum RegistrationStatusEnumType {