X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2Focpp%2F1.6%2FMeterValues.ts;h=0d9d3263f755d184639bef69d041b10142eca758;hb=844e496b3482e49145467af3f74df54811e91cb6;hp=47163ffc1d784208541b7885bdceda9818f8fd90;hpb=f738a0e9257a5bd6d46a79a5845b929c4a06e94f;p=e-mobility-charging-stations-simulator.git

diff --git a/src/types/ocpp/1.6/MeterValues.ts b/src/types/ocpp/1.6/MeterValues.ts
index 47163ffc..0d9d3263 100644
--- a/src/types/ocpp/1.6/MeterValues.ts
+++ b/src/types/ocpp/1.6/MeterValues.ts
@@ -1,3 +1,6 @@
+import { EmptyObject } from '../../EmptyObject';
+import { JsonObject } from '../../JsonType';
+
 export enum MeterValueUnit {
   WATT_HOUR = 'Wh',
   KILO_WATT_HOUR = 'kWh',
@@ -14,7 +17,7 @@ export enum MeterValueUnit {
   TEMP_CELSIUS = 'Celsius',
   TEMP_FAHRENHEIT = 'Fahrenheit',
   TEMP_KELVIN = 'K',
-  PERCENT = 'Percent'
+  PERCENT = 'Percent',
 }
 
 export enum MeterValueContext {
@@ -25,10 +28,10 @@ export enum MeterValueContext {
   SAMPLE_PERIODIC = 'Sample.Periodic',
   TRANSACTION_BEGIN = 'Transaction.Begin',
   TRANSACTION_END = 'Transaction.End',
-  TRIGGER = 'Trigger'
+  TRIGGER = 'Trigger',
 }
 
-export enum MeterValueMeasurand {
+export enum OCPP16MeterValueMeasurand {
   CURRENT_EXPORT = 'Current.Export',
   CURRENT_IMPORT = 'Current.Import',
   CURRENT_OFFERED = 'Current.Offered',
@@ -50,7 +53,7 @@ export enum MeterValueMeasurand {
   FAN_RPM = 'RPM',
   STATE_OF_CHARGE = 'SoC',
   TEMPERATURE = 'Temperature',
-  VOLTAGE = 'Voltage'
+  VOLTAGE = 'Voltage',
 }
 
 export enum MeterValueLocation {
@@ -58,10 +61,10 @@ export enum MeterValueLocation {
   CABLE = 'Cable',
   EV = 'EV',
   INLET = 'Inlet',
-  OUTLET = 'Outlet'
+  OUTLET = 'Outlet',
 }
 
-export enum MeterValuePhase {
+export enum OCPP16MeterValuePhase {
   L1 = 'L1',
   L2 = 'L2',
   L3 = 'L3',
@@ -71,7 +74,7 @@ export enum MeterValuePhase {
   L3_N = 'L3-N',
   L1_L2 = 'L1-L2',
   L2_L3 = 'L2-L3',
-  L3_L1 = 'L3-L1'
+  L3_L1 = 'L3-L1',
 }
 
 export enum MeterValueFormat {
@@ -79,27 +82,25 @@ export enum MeterValueFormat {
   SIGNED_DATA = 'SignedData',
 }
 
-export interface SampledValue {
-  value?: string;
+export interface OCPP16SampledValue extends JsonObject {
+  value: string;
   unit?: MeterValueUnit;
   context?: MeterValueContext;
-  measurand?: MeterValueMeasurand;
-  phase?: MeterValuePhase;
+  measurand?: OCPP16MeterValueMeasurand;
+  phase?: OCPP16MeterValuePhase;
   location?: MeterValueLocation;
   format?: MeterValueFormat;
 }
 
-export interface MeterValue {
+export interface OCPP16MeterValue extends JsonObject {
   timestamp: string;
-  sampledValue: SampledValue[];
+  sampledValue: OCPP16SampledValue[];
 }
 
-export interface MeterValuesRequest {
+export interface OCPP16MeterValuesRequest extends JsonObject {
   connectorId: number;
   transactionId?: number;
-  meterValue: MeterValue | MeterValue[];
+  meterValue: OCPP16MeterValue[];
 }
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface MeterValuesResponse {}
-
+export type OCPP16MeterValuesResponse = EmptyObject;