X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2Focpp%2F1.6%2FMeterValues.ts;h=5a59230c15f08615608c3e5f7d840f4895873aba;hb=6625c5ec9c5260260aeb17e86ddd4ca5a2d15d10;hp=282df11a9ea5d827d8ef40c360f08358d5156220;hpb=e7aeea18e189dd087c8f951cf77a253e2818ae90;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 282df11a..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',
@@ -77,13 +76,13 @@ export enum OCPP16MeterValuePhase {
   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,15 +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;