X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2Focpp%2F1.6%2FMeterValues.ts;h=5a59230c15f08615608c3e5f7d840f4895873aba;hb=6625c5ec9c5260260aeb17e86ddd4ca5a2d15d10;hp=97a7d24c9fd3396a1d7d364fec63c77fa6a347c1;hpb=c3ee95af4edd541595e3873c8aa4c93d38e59474;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 97a7d24c..5a59230c 100644
--- a/src/types/ocpp/1.6/MeterValues.ts
+++ b/src/types/ocpp/1.6/MeterValues.ts
@@ -1,5 +1,4 @@
-import { EmptyObject } from '../../EmptyObject';
-import { JsonType } from '../../JsonType';
+import type { EmptyObject, JsonObject } from '../../internal';
 
 export enum MeterValueUnit {
   WATT_HOUR = 'Wh',
@@ -17,7 +16,7 @@ export enum MeterValueUnit {
   TEMP_CELSIUS = 'Celsius',
   TEMP_FAHRENHEIT = 'Fahrenheit',
   TEMP_KELVIN = 'K',
-  PERCENT = 'Percent'
+  PERCENT = 'Percent',
 }
 
 export enum MeterValueContext {
@@ -28,7 +27,7 @@ export enum MeterValueContext {
   SAMPLE_PERIODIC = 'Sample.Periodic',
   TRANSACTION_BEGIN = 'Transaction.Begin',
   TRANSACTION_END = 'Transaction.End',
-  TRIGGER = 'Trigger'
+  TRIGGER = 'Trigger',
 }
 
 export enum OCPP16MeterValueMeasurand {
@@ -53,7 +52,7 @@ export enum OCPP16MeterValueMeasurand {
   FAN_RPM = 'RPM',
   STATE_OF_CHARGE = 'SoC',
   TEMPERATURE = 'Temperature',
-  VOLTAGE = 'Voltage'
+  VOLTAGE = 'Voltage',
 }
 
 export enum MeterValueLocation {
@@ -61,7 +60,7 @@ export enum MeterValueLocation {
   CABLE = 'Cable',
   EV = 'EV',
   INLET = 'Inlet',
-  OUTLET = 'Outlet'
+  OUTLET = 'Outlet',
 }
 
 export enum OCPP16MeterValuePhase {
@@ -74,16 +73,16 @@ export enum OCPP16MeterValuePhase {
   L3_N = 'L3-N',
   L1_L2 = 'L1-L2',
   L2_L3 = 'L2-L3',
-  L3_L1 = 'L3-L1'
+  L3_L1 = 'L3-L1',
 }
 
-export enum MeterValueFormat {
+enum MeterValueFormat {
   RAW = 'Raw',
   SIGNED_DATA = 'SignedData',
 }
 
-export interface OCPP16SampledValue extends JsonType {
-  value?: string;
+export interface OCPP16SampledValue extends JsonObject {
+  value: string;
   unit?: MeterValueUnit;
   context?: MeterValueContext;
   measurand?: OCPP16MeterValueMeasurand;
@@ -92,16 +91,15 @@ export interface OCPP16SampledValue extends JsonType {
   format?: MeterValueFormat;
 }
 
-export interface OCPP16MeterValue extends JsonType {
-  timestamp: string;
+export interface OCPP16MeterValue extends JsonObject {
+  timestamp: Date;
   sampledValue: OCPP16SampledValue[];
 }
 
-export interface MeterValuesRequest extends JsonType {
+export interface OCPP16MeterValuesRequest extends JsonObject {
   connectorId: number;
   transactionId?: number;
   meterValue: OCPP16MeterValue[];
 }
 
-export type MeterValuesResponse = EmptyObject;
-
+export type OCPP16MeterValuesResponse = EmptyObject;