From 7e3926cc4cda3fa4db175501b239cb3d8c575d4f Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= <jerome.benoit@sap.com>
Date: Wed, 3 Mar 2021 11:38:44 +0100
Subject: [PATCH] Fix some types definition.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
---
 src/types/ocpp/ChargePointErrorCode.ts | 2 +-
 src/types/ocpp/ChargePointStatus.ts    | 2 +-
 src/types/ocpp/Configuration.ts        | 2 +-
 src/types/ocpp/MeterValues.ts          | 2 +-
 src/types/ocpp/Requests.ts             | 6 +++---
 src/types/ocpp/Responses.ts            | 2 +-
 src/types/ocpp/Transaction.ts          | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/types/ocpp/ChargePointErrorCode.ts b/src/types/ocpp/ChargePointErrorCode.ts
index 30d91ad8..016e51d9 100644
--- a/src/types/ocpp/ChargePointErrorCode.ts
+++ b/src/types/ocpp/ChargePointErrorCode.ts
@@ -1,6 +1,6 @@
 import { OCPP16ChargePointErrorCode } from './1.6/ChargePointErrorCode';
 
-export type ChargePointErrorCode = typeof ChargePointErrorCode;
+export type ChargePointErrorCode = OCPP16ChargePointErrorCode;
 
 export const ChargePointErrorCode = {
   ...OCPP16ChargePointErrorCode
diff --git a/src/types/ocpp/ChargePointStatus.ts b/src/types/ocpp/ChargePointStatus.ts
index 595edc41..daa9779b 100644
--- a/src/types/ocpp/ChargePointStatus.ts
+++ b/src/types/ocpp/ChargePointStatus.ts
@@ -1,6 +1,6 @@
 import { OCPP16ChargePointStatus } from './1.6/ChargePointStatus';
 
-export type ChargePointStatus = typeof ChargePointStatus;
+export type ChargePointStatus = OCPP16ChargePointStatus;
 
 export const ChargePointStatus = {
   ...OCPP16ChargePointStatus
diff --git a/src/types/ocpp/Configuration.ts b/src/types/ocpp/Configuration.ts
index 54fba5a2..f4865325 100644
--- a/src/types/ocpp/Configuration.ts
+++ b/src/types/ocpp/Configuration.ts
@@ -1,6 +1,6 @@
 import { OCPP16StandardParametersKey } from './1.6/Configuration';
 
-export type StandardParametersKey = typeof StandardParametersKey;
+export type StandardParametersKey = OCPP16StandardParametersKey;
 
 export const StandardParametersKey = {
   ...OCPP16StandardParametersKey
diff --git a/src/types/ocpp/MeterValues.ts b/src/types/ocpp/MeterValues.ts
index c8c28386..b052ce69 100644
--- a/src/types/ocpp/MeterValues.ts
+++ b/src/types/ocpp/MeterValues.ts
@@ -1,6 +1,6 @@
 import { OCPP16MeterValueMeasurand, OCPP16SampledValue } from './1.6/MeterValues';
 
-export type MeterValueMeasurand = typeof MeterValueMeasurand;
+export type MeterValueMeasurand = OCPP16MeterValueMeasurand;
 
 export const MeterValueMeasurand = {
   ...OCPP16MeterValueMeasurand
diff --git a/src/types/ocpp/Requests.ts b/src/types/ocpp/Requests.ts
index 8292156d..d4388efe 100644
--- a/src/types/ocpp/Requests.ts
+++ b/src/types/ocpp/Requests.ts
@@ -9,19 +9,19 @@ export default interface Requests {
 
 export type BootNotificationRequest = OCPP16BootNotificationRequest;
 
-export type AvailabilityType = typeof AvailabilityType;
+export type AvailabilityType = OCPP16AvailabilityType;
 
 export const AvailabilityType = {
   ...OCPP16AvailabilityType
 };
 
-export type RequestCommand = typeof RequestCommand;
+export type RequestCommand = OCPP16RequestCommand;
 
 export const RequestCommand = {
   ...OCPP16RequestCommand
 };
 
-export type IncomingRequestCommand = typeof IncomingRequestCommand;
+export type IncomingRequestCommand = OCPP16IncomingRequestCommand;
 
 export const IncomingRequestCommand = {
   ...OCPP16IncomingRequestCommand
diff --git a/src/types/ocpp/Responses.ts b/src/types/ocpp/Responses.ts
index 7e0a3c32..d134f545 100644
--- a/src/types/ocpp/Responses.ts
+++ b/src/types/ocpp/Responses.ts
@@ -2,7 +2,7 @@ import { OCPP16BootNotificationResponse, OCPP16RegistrationStatus } from './1.6/
 
 export type BootNotificationResponse = OCPP16BootNotificationResponse;
 
-export type RegistrationStatus = typeof RegistrationStatus;
+export type RegistrationStatus = OCPP16RegistrationStatus;
 
 export const RegistrationStatus = {
   ...OCPP16RegistrationStatus
diff --git a/src/types/ocpp/Transaction.ts b/src/types/ocpp/Transaction.ts
index cca05a39..83764a21 100644
--- a/src/types/ocpp/Transaction.ts
+++ b/src/types/ocpp/Transaction.ts
@@ -1,6 +1,6 @@
 import { OCPP16AuthorizationStatus, OCPP16AuthorizeResponse, OCPP16StartTransactionResponse, OCPP16StopTransactionReason, OCPP16StopTransactionResponse } from './1.6/Transaction';
 
-export type AuthorizationStatus = typeof AuthorizationStatus;
+export type AuthorizationStatus = OCPP16AuthorizationStatus;
 
 export const AuthorizationStatus = {
   ...OCPP16AuthorizationStatus,
@@ -8,7 +8,7 @@ export const AuthorizationStatus = {
 
 export type AuthorizeResponse = OCPP16AuthorizeResponse;
 
-export type StopTransactionReason = typeof StopTransactionReason;
+export type StopTransactionReason = OCPP16StopTransactionReason;
 
 export const StopTransactionReason = {
   ...OCPP16StopTransactionReason,
-- 
2.34.1