Move OCPP command payload constants into its own file

[e-mobility-charging-stations-simulator.git] / src / types / ocpp / 1.6 / MeterValues.ts

diff --git a/src/types/ocpp/1.6/MeterValues.ts b/src/types/ocpp/1.6/MeterValues.ts
index 54c283fbbeb4b39e0b9ca34c93ddc4523b76eb53..79bad3626e7dfd650cde76c8cdc6a3af79dc04e8 100644 (file)
--- a/src/types/ocpp/1.6/MeterValues.ts
+++ b/src/types/ocpp/1.6/MeterValues.ts
@@ -1,5 +1,5 @@
-import { EmptyObject } from '../../EmptyObject';
-import { JsonType } from '../../JsonType';
+import type { EmptyObject } from '../../EmptyObject';
+import type { JsonObject } from '../../JsonType';
 
 export enum MeterValueUnit {
   WATT_HOUR = 'Wh',
@@ -82,8 +82,8 @@ export enum MeterValueFormat {
   SIGNED_DATA = 'SignedData',
 }
 
-export interface OCPP16SampledValue extends JsonType {
-  value?: string;
+export interface OCPP16SampledValue extends JsonObject {
+  value: string;
   unit?: MeterValueUnit;
   context?: MeterValueContext;
   measurand?: OCPP16MeterValueMeasurand;
@@ -92,12 +92,12 @@ export interface OCPP16SampledValue extends JsonType {
   format?: MeterValueFormat;
 }
 
-export interface OCPP16MeterValue extends JsonType {
+export interface OCPP16MeterValue extends JsonObject {
   timestamp: string;
   sampledValue: OCPP16SampledValue[];
 }
 
-export interface OCPP16MeterValuesRequest extends JsonType {
+export interface OCPP16MeterValuesRequest extends JsonObject {
   connectorId: number;
   transactionId?: number;
   meterValue: OCPP16MeterValue[];