From 29bf6658d0689f5df26575d3b171163fe1d52d04 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Wed, 11 Nov 2020 21:28:57 +0100 Subject: [PATCH] Move some types to their OCPP version directory. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- src/charging-station/AutomaticTransactionGenerator.ts | 2 +- src/charging-station/ChargingStation.ts | 10 +++++----- src/types/Connectors.ts | 4 ++-- src/types/{ => ocpp/1.6}/ChargePointErrorCode.ts | 0 src/types/{ => ocpp/1.6}/ChargePointStatus.ts | 0 src/types/{ => ocpp/1.6}/MeterValue.ts | 0 src/types/{ => ocpp/1.6}/RequestResponses.ts | 0 src/types/{ => ocpp/1.6}/Transaction.ts | 0 src/utils/Constants.ts | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) rename src/types/{ => ocpp/1.6}/ChargePointErrorCode.ts (100%) rename src/types/{ => ocpp/1.6}/ChargePointStatus.ts (100%) rename src/types/{ => ocpp/1.6}/MeterValue.ts (100%) rename src/types/{ => ocpp/1.6}/RequestResponses.ts (100%) rename src/types/{ => ocpp/1.6}/Transaction.ts (100%) diff --git a/src/charging-station/AutomaticTransactionGenerator.ts b/src/charging-station/AutomaticTransactionGenerator.ts index 399a9942..32d9d2e3 100644 --- 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 73496046..56738bb6 100644 --- 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 8e04989c..84532456 100644 --- 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 e3b3ae6c..eab54ea5 100644 --- 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'; -- 2.34.1