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

diff --git a/src/types/ocpp/Configuration.ts b/src/types/ocpp/Configuration.ts
index 5aa96818..3081f13d 100644
--- a/src/types/ocpp/Configuration.ts
+++ b/src/types/ocpp/Configuration.ts
@@ -1,28 +1,32 @@
 import {
   OCPP16StandardParametersKey,
   OCPP16SupportedFeatureProfiles,
-  OCPP16VendorDefaultParametersKey,
+  OCPP16VendorParametersKey,
 } from './1.6/Configuration';
-
-import { JsonObject } from '../JsonType';
-
-export type StandardParametersKey = OCPP16StandardParametersKey;
+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,
-};
+  ...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,
-};
+} as const;
+export type SupportedFeatureProfiles = OCPP16SupportedFeatureProfiles;
 
 export enum ConnectorPhaseRotation {
   NotApplicable = 'NotApplicable',
@@ -35,8 +39,10 @@ export enum ConnectorPhaseRotation {
   TSR = 'TSR',
 }
 
-export interface OCPPConfigurationKey extends JsonObject {
-  key: string | StandardParametersKey;
+export type ConfigurationKeyType = string | StandardParametersKey | VendorParametersKey;
+
+export type OCPPConfigurationKey = {
+  key: ConfigurationKeyType;
   readonly: boolean;
   value?: string;
-}
+} & JsonObject;