Merge branch 'master' into fix-template

[e-mobility-charging-stations-simulator.git] / src / types / Connectors.ts

diff --git a/src/types/Connectors.ts b/src/types/Connectors.ts
index 8063368bf0c0ff5388a803528f46ec1fdc781de4..027ac645d7f22336e399b79d0793f7ef85b51ac4 100644 (file)
--- a/src/types/Connectors.ts
+++ b/src/types/Connectors.ts
@@ -1,19 +1,29 @@
-import { ChargePointStatus } from './ocpp/1.6/ChargePointStatus';
-import { ChargingProfile } from './ocpp/1.6/ChargingProfile';
-import { SampledValue } from './ocpp/1.6/MeterValues';
+import { MeterValue, SampledValue } from './ocpp/MeterValues';
 
-export interface Connector {
+import { AvailabilityType } from './ocpp/Requests';
+import { ChargePointStatus } from './ocpp/ChargePointStatus';
+import { ChargingProfile } from './ocpp/ChargingProfile';
+
+export interface SampledValueTemplate extends SampledValue {
+  fluctuationPercent?: number;
+}
+
+export interface ConnectorStatus {
+  availability: AvailabilityType;
   bootStatus?: ChargePointStatus;
   status?: ChargePointStatus;
-  MeterValues: SampledValue[];
+  MeterValues: SampledValueTemplate[];
+  authorizeIdTag?: string;
+  idTagAuthorized?: boolean;
+  localAuthorizeIdTag?: string;
+  idTagLocalAuthorized?: boolean;
+  transactionRemoteStarted?: boolean;
   transactionStarted?: boolean;
   transactionId?: number;
   transactionSetInterval?: NodeJS.Timeout;
-  idTag?: string;
-  lastEnergyActiveImportRegisterValue?: number;
-  chargingProfiles?: ChargingProfile[]
-}
-
-export default interface Connectors {
-  [id: string]: Connector;
+  transactionIdTag?: string;
+  energyActiveImportRegisterValue?: number; // In Wh
+  transactionEnergyActiveImportRegisterValue?: number; // In Wh
+  transactionBeginMeterValue?: MeterValue;
+  chargingProfiles?: ChargingProfile[];
 }