Move some types to their OCPP version directory.

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>

diff --git a/src/charging-station/AutomaticTransactionGenerator.ts b/src/charging-station/AutomaticTransactionGenerator.ts
index 399a9942fa0d7d64545c88fa4553c0956dbf8913..32d9d2e3ec9224dfc0bc2520e8a48c989313dca3 100644 (file)
--- a/src/charging-station/AutomaticTransactionGenerator.ts
+++ b/src/charging-station/AutomaticTransactionGenerator.ts
@@ -1,4 +1,4 @@
-import { AuthorizationStatus, StartTransactionResponse, StopTransactionReason, StopTransactionResponse } from '../types/Transaction';
+import { AuthorizationStatus, StartTransactionResponse, StopTransactionReason, StopTransactionResponse } from '../types/ocpp/1.6/Transaction';
 import { PerformanceObserver, performance } from 'perf_hooks';
 
 import ChargingStation from './ChargingStation';

diff --git a/src/charging-station/ChargingStation.ts b/src/charging-station/ChargingStation.ts
index 734960464a25351be459f8f82952cb0659741aeb..56738bb688287e4138ad0e8736fdb7ada7973e16 100644 (file)
--- a/src/charging-station/ChargingStation.ts
+++ b/src/charging-station/ChargingStation.ts
@@ -1,14 +1,14 @@
-import { AuthorizationStatus, StartTransactionResponse, StopTransactionReason, StopTransactionResponse } from '../types/Transaction';
+import { AuthorizationStatus, StartTransactionResponse, StopTransactionReason, StopTransactionResponse } from '../types/ocpp/1.6/Transaction';
 import ChargingStationConfiguration, { ConfigurationKey } from '../types/ChargingStationConfiguration';
 import ChargingStationTemplate, { PowerOutType } from '../types/ChargingStationTemplate';
-import { ConfigurationResponse, DefaultRequestResponse, UnlockResponse } from '../types/RequestResponses';
+import { ConfigurationResponse, DefaultRequestResponse, UnlockResponse } from '../types/ocpp/1.6/RequestResponses';
 import Connectors, { Connector } from '../types/Connectors';
-import MeterValue, { MeterValueLocation, MeterValueMeasurand, MeterValuePhase, MeterValueUnit } from '../types/MeterValue';
+import MeterValue, { MeterValueLocation, MeterValueMeasurand, MeterValuePhase, MeterValueUnit } from '../types/ocpp/1.6/MeterValue';
 import { PerformanceObserver, performance } from 'perf_hooks';
 
 import AutomaticTransactionGenerator from './AutomaticTransactionGenerator';
-import { ChargePointErrorCode } from '../types/ChargePointErrorCode';
-import { ChargePointStatus } from '../types/ChargePointStatus';
+import { ChargePointErrorCode } from '../types/ocpp/1.6/ChargePointErrorCode';
+import { ChargePointStatus } from '../types/ocpp/1.6/ChargePointStatus';
 import ChargingStationInfo from '../types/ChargingStationInfo';
 import Configuration from '../utils/Configuration';
 import Constants from '../utils/Constants.js';

diff --git a/src/types/Connectors.ts b/src/types/Connectors.ts
index 8e04989c7fc828daeea6f0c71efa3a908aa780de..845324562584c4179352bc759fea4fc8fe0f3633 100644 (file)
--- a/src/types/Connectors.ts
+++ b/src/types/Connectors.ts
@@ -1,5 +1,5 @@
-import { ChargePointStatus } from './ChargePointStatus';
-import MeterValue from './MeterValue';
+import { ChargePointStatus } from './ocpp/1.6/ChargePointStatus';
+import MeterValue from './ocpp/1.6/MeterValue';
 
 export interface Connector {
   bootStatus?: ChargePointStatus;

diff --git a/src/types/ChargePointErrorCode.ts b/src/types/ocpp/1.6/ChargePointErrorCode.ts
similarity index 100%
rename from src/types/ChargePointErrorCode.ts
rename to src/types/ocpp/1.6/ChargePointErrorCode.ts

diff --git a/src/types/ChargePointStatus.ts b/src/types/ocpp/1.6/ChargePointStatus.ts
similarity index 100%
rename from src/types/ChargePointStatus.ts
rename to src/types/ocpp/1.6/ChargePointStatus.ts

diff --git a/src/types/MeterValue.ts b/src/types/ocpp/1.6/MeterValue.ts
similarity index 100%
rename from src/types/MeterValue.ts
rename to src/types/ocpp/1.6/MeterValue.ts

diff --git a/src/types/RequestResponses.ts b/src/types/ocpp/1.6/RequestResponses.ts
similarity index 100%
rename from src/types/RequestResponses.ts
rename to src/types/ocpp/1.6/RequestResponses.ts

diff --git a/src/types/Transaction.ts b/src/types/ocpp/1.6/Transaction.ts
similarity index 100%
rename from src/types/Transaction.ts
rename to src/types/ocpp/1.6/Transaction.ts

diff --git a/src/utils/Constants.ts b/src/utils/Constants.ts
index e3b3ae6c120ab3b8dcff11008dbf780d34105efc..eab54ea5fe962be57997184ff6997d96d96780c5 100644 (file)
--- a/src/utils/Constants.ts
+++ b/src/utils/Constants.ts
@@ -1,4 +1,4 @@
-import { ConfigurationStatus, DefaultResponseStatus, UnlockStatus } from '../types/RequestResponses';
+import { ConfigurationStatus, DefaultResponseStatus, UnlockStatus } from '../types/ocpp/1.6/RequestResponses';
 
 export default class Constants {
   static readonly ENTITY_CHARGING_STATION = 'ChargingStation';