X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2Focpp%2FConfiguration.ts;h=3081f13d5d4a123d882a1809474e1c009a738d40;hb=0a96409ab6db51ef7b2e6e292216d12c926f7e9c;hp=b13a24ba2be17c6c04f5c65f10eef3b5c2ed4828;hpb=c3ee95af4edd541595e3873c8aa4c93d38e59474;p=e-mobility-charging-stations-simulator.git

diff --git a/src/types/ocpp/Configuration.ts b/src/types/ocpp/Configuration.ts
index b13a24ba..3081f13d 100644
--- a/src/types/ocpp/Configuration.ts
+++ b/src/types/ocpp/Configuration.ts
@@ -1,24 +1,32 @@
-import { OCPP16StandardParametersKey, OCPP16SupportedFeatureProfiles, OCPP16VendorDefaultParametersKey } from './1.6/Configuration';
-
-import { JsonType } from '../JsonType';
-
-export type StandardParametersKey = OCPP16StandardParametersKey;
+import {
+  OCPP16StandardParametersKey,
+  OCPP16SupportedFeatureProfiles,
+  OCPP16VendorParametersKey,
+} from './1.6/Configuration';
+import {
+  OCPP20OptionalVariableName,
+  OCPP20RequiredVariableName,
+  OCPP20VendorVariableName,
+} from './2.0/Variables';
+import type { JsonObject } from '../JsonType';
 
 export const StandardParametersKey = {
-  ...OCPP16StandardParametersKey
-};
-
-export type VendorDefaultParametersKey = OCPP16VendorDefaultParametersKey;
-
-export const VendorDefaultParametersKey = {
-  ...OCPP16VendorDefaultParametersKey
-};
+  ...OCPP16StandardParametersKey,
+  ...OCPP20RequiredVariableName,
+  ...OCPP20OptionalVariableName,
+} as const;
+export type StandardParametersKey = OCPP16StandardParametersKey;
 
-export type SupportedFeatureProfiles = OCPP16SupportedFeatureProfiles;
+export const VendorParametersKey = {
+  ...OCPP16VendorParametersKey,
+  ...OCPP20VendorVariableName,
+} as const;
+export type VendorParametersKey = OCPP16VendorParametersKey;
 
 export const SupportedFeatureProfiles = {
-  ...OCPP16SupportedFeatureProfiles
-};
+  ...OCPP16SupportedFeatureProfiles,
+} as const;
+export type SupportedFeatureProfiles = OCPP16SupportedFeatureProfiles;
 
 export enum ConnectorPhaseRotation {
   NotApplicable = 'NotApplicable',
@@ -28,11 +36,13 @@ export enum ConnectorPhaseRotation {
   SRT = 'SRT',
   STR = 'STR',
   TRS = 'TRS',
-  TSR = 'TSR'
+  TSR = 'TSR',
 }
 
-export interface OCPPConfigurationKey extends JsonType {
-  key: string | StandardParametersKey;
+export type ConfigurationKeyType = string | StandardParametersKey | VendorParametersKey;
+
+export type OCPPConfigurationKey = {
+  key: ConfigurationKeyType;
   readonly: boolean;
   value?: string;
-}
+} & JsonObject;