jooby-codec 2.9.0 → 2.11.0

package/dist/obis-observer/commands/uplink/{GetShortNameInfoResponse.js → GetObisInfoResponse.js}

@@ -2,10 +2,10 @@ import Command from '../../Command.js';
 import CommandBinaryBuffer, { REQUEST_ID_SIZE, OBIS_PROFILE_SIZE } from '../../CommandBinaryBuffer.js';
 import { UPLINK } from '../../constants/directions.js';
 import { contentTypes } from '../../constants/index.js';
-const COMMAND_ID = 0x0c;
+const COMMAND_ID = 0x4b;
 const examples = [
     {
-        name: 'short name info with obis code 0.9.1 and obis profile',
+        name: 'response to GetObisInfo with obis code 0.9.1 and obis profile',
         parameters: {
             requestId: 3,
             obis: {
@@ -25,57 +25,68 @@ const examples = [
                 }
             }
         },
-        hex: { header: '0c', body: '0b 03 02 00 09 01 01 58 02 14 3d 15' }
+        hex: { header: '4b 0b', body: '03 02 00 09 01 01 58 02 14 3d 15' }
+    },
+    {
+        name: 'response to GetObisInfo with obis code 0.9.1 without obis profile',
+        parameters: {
+            requestId: 3,
+            obis: {
+                c: 0,
+                d: 9,
+                e: 1
+            }
+        },
+        hex: { header: '4b 05', body: '03 02 00 09 01' }
+    },
+    {
+        name: 'response to GetObisInfo without data',
+        parameters: {
+            requestId: 3
+        },
+        hex: { header: '4b 01', body: '03' }
     }
 ];
-class GetShortNameInfoResponse extends Command {
+class GetObisInfoResponse extends Command {
     constructor(parameters) {
         super();
         this.parameters = parameters;
-        let size = 1 + REQUEST_ID_SIZE;
+        let size = REQUEST_ID_SIZE;
         if (parameters.obis) {
             size += CommandBinaryBuffer.getObisSize(parameters.obis);
-        }
-        if (parameters.obisProfile) {
-            size += OBIS_PROFILE_SIZE;
+            if (parameters.obisProfile) {
+                size += OBIS_PROFILE_SIZE;
+            }
         }
         this.size = size;
     }
     static fromBytes(data) {
         const buffer = new CommandBinaryBuffer(data);
-        let size = buffer.getUint8() - REQUEST_ID_SIZE;
         const requestId = buffer.getUint8();
-        let obis;
-        let obisProfile;
-        if (size > 0) {
-            obis = buffer.getObis();
-            size -= CommandBinaryBuffer.getObisSize(obis);
+        if (buffer.isEmpty) {
+            return new GetObisInfoResponse({ requestId });
         }
-        if (size > 0) {
-            obisProfile = buffer.getObisProfile();
-        }
-        return new GetShortNameInfoResponse({ requestId, obis, obisProfile });
+        const obis = buffer.getObis();
+        return buffer.isEmpty
+            ? new GetObisInfoResponse({ requestId, obis })
+            : new GetObisInfoResponse({ requestId, obis, obisProfile: buffer.getObisProfile() });
     }
     toBytes() {
-        if (typeof this.size !== 'number') {
-            throw new Error('unknown or invalid size');
-        }
         const buffer = new CommandBinaryBuffer(this.size);
         const { requestId, obis, obisProfile } = this.parameters;
-        buffer.setUint8(this.size - 1);
         buffer.setUint8(requestId);
         if (obis) {
             buffer.setObis(obis);
-        }
-        if (obisProfile) {
-            buffer.setObisProfile(obisProfile);
+            if (obisProfile) {
+                buffer.setObisProfile(obisProfile);
+            }
         }
         return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
     }
 }
-GetShortNameInfoResponse.id = COMMAND_ID;
-GetShortNameInfoResponse.directionType = UPLINK;
-GetShortNameInfoResponse.examples = examples;
-GetShortNameInfoResponse.hasParameters = true;
-export default GetShortNameInfoResponse;
-//# sourceMappingURL=GetShortNameInfoResponse.js.map
+GetObisInfoResponse.id = COMMAND_ID;
+GetObisInfoResponse.directionType = UPLINK;
+GetObisInfoResponse.examples = examples;
+GetObisInfoResponse.hasParameters = true;
+export default GetObisInfoResponse;
+//# sourceMappingURL=GetObisInfoResponse.js.map

package/dist/obis-observer/commands/uplink/GetObisInfoResponse.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GetObisInfoResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetObisInfoResponse.ts"],"names":[],"mappings":"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"}

package/dist/obis-observer/commands/uplink/GetObisProfileResponse.d.ts

@@ -0,0 +1,16 @@
+import Command, { TCommandExampleList } from '../../Command.js';
+import { ICommandParameters, IObisProfile } from '../../CommandBinaryBuffer.js';
+interface IGetObisProfileResponseParameters extends ICommandParameters {
+    obisProfile?: IObisProfile;
+}
+declare class GetObisProfileResponse extends Command {
+    parameters: IGetObisProfileResponseParameters;
+    constructor(parameters: IGetObisProfileResponseParameters);
+    static readonly id = 73;
+    static readonly directionType = 2;
+    static readonly examples: TCommandExampleList;
+    static readonly hasParameters = true;
+    static fromBytes(data: Uint8Array): GetObisProfileResponse;
+    toBytes(): Uint8Array;
+}
+export default GetObisProfileResponse;

package/dist/obis-observer/commands/uplink/{GetShortNameProfileResponse.js → GetObisProfileResponse.js}

@@ -2,11 +2,11 @@ import Command from '../../Command.js';
 import CommandBinaryBuffer, { REQUEST_ID_SIZE, OBIS_PROFILE_SIZE } from '../../CommandBinaryBuffer.js';
 import { UPLINK } from '../../constants/directions.js';
 import { contentTypes } from '../../constants/index.js';
-const COMMAND_ID = 0x0a;
+const COMMAND_ID = 0x49;
 const COMMAND_SIZE = REQUEST_ID_SIZE + OBIS_PROFILE_SIZE;
 const examples = [
     {
-        name: 'profile for short name 121',
+        name: 'response to GetObisProfile',
         parameters: {
             requestId: 3,
             obisProfile: {
@@ -21,35 +21,42 @@ const examples = [
                 }
             }
         },
-        hex: { header: '0a', body: '03 01 58 02 14 3d 13' }
+        hex: { header: '49 07', body: '03 01 58 02 14 3d 13' }
+    },
+    {
+        name: 'response to GetObisProfile without data',
+        parameters: {
+            requestId: 3
+        },
+        hex: { header: '49 01', body: '03' }
     }
 ];
-class GetShortNameProfileResponse extends Command {
+class GetObisProfileResponse extends Command {
     constructor(parameters) {
         super();
         this.parameters = parameters;
-        this.size = COMMAND_SIZE;
+        this.size = parameters.obisProfile ? COMMAND_SIZE : REQUEST_ID_SIZE;
     }
     static fromBytes(data) {
         const buffer = new CommandBinaryBuffer(data);
         const requestId = buffer.getUint8();
-        const obisProfile = buffer.getObisProfile();
-        return new GetShortNameProfileResponse({ requestId, obisProfile });
+        return buffer.isEmpty
+            ? new GetObisProfileResponse({ requestId })
+            : new GetObisProfileResponse({ requestId, obisProfile: buffer.getObisProfile() });
     }
     toBytes() {
-        if (typeof this.size !== 'number') {
-            throw new Error('unknown or invalid size');
-        }
         const buffer = new CommandBinaryBuffer(this.size);
         const { requestId, obisProfile } = this.parameters;
         buffer.setUint8(requestId);
-        buffer.setObisProfile(obisProfile);
+        if (obisProfile) {
+            buffer.setObisProfile(obisProfile);
+        }
         return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
     }
 }
-GetShortNameProfileResponse.id = COMMAND_ID;
-GetShortNameProfileResponse.directionType = UPLINK;
-GetShortNameProfileResponse.examples = examples;
-GetShortNameProfileResponse.hasParameters = true;
-export default GetShortNameProfileResponse;
-//# sourceMappingURL=GetShortNameProfileResponse.js.map
+GetObisProfileResponse.id = COMMAND_ID;
+GetObisProfileResponse.directionType = UPLINK;
+GetObisProfileResponse.examples = examples;
+GetObisProfileResponse.hasParameters = true;
+export default GetObisProfileResponse;
+//# sourceMappingURL=GetObisProfileResponse.js.map

package/dist/obis-observer/commands/uplink/GetObisProfileResponse.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GetObisProfileResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetObisProfileResponse.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAAE,iBAAiB,EAAmC,MAAM,8BAA8B,CAAC;AACvI,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AACrD,OAAO,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAUtD,MAAM,UAAU,GAAG,IAAI,CAAC;AACxB,MAAM,YAAY,GAAG,eAAe,GAAG,iBAAiB,CAAC;AAEzD,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,4BAA4B;QAClC,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,WAAW,EAAE;gBACT,aAAa,EAAE,GAAG;gBAClB,aAAa,EAAE,GAAG;gBAClB,cAAc,EAAE,EAAE;gBAClB,KAAK,EAAE;oBACH,WAAW,EAAE,YAAY,CAAC,MAAM;oBAChC,YAAY,EAAE,KAAK;oBACnB,eAAe,EAAE,IAAI;oBACrB,eAAe,EAAE,IAAI;iBACxB;aACJ;SACJ;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,sBAAsB,EAAC;KACvD;IACD;QACI,IAAI,EAAE,yCAAyC;QAC/C,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;SACf;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAC;KACrC;CACJ,CAAC;AAiCF,MAAM,sBAAuB,SAAQ,OAAO;IACxC,YAAqB,UAA6C;QAC9D,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAmC;QAG9D,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,eAAe,CAAC;IACxE,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QAEpC,OAAO,MAAM,CAAC,OAAO;YACjB,CAAC,CAAC,IAAI,sBAAsB,CAAC,EAAC,SAAS,EAAC,CAAC;YACzC,CAAC,CAAC,IAAI,sBAAsB,CAAC,EAAC,SAAS,EAAE,WAAW,EAAE,MAAM,CAAC,cAAc,EAAE,EAAC,CAAC,CAAC;IACxF,CAAC;IAGD,OAAO;QACH,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC;QAC5D,MAAM,EAAC,SAAS,EAAE,WAAW,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAEjD,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAE3B,IAAK,WAAW,EAAG;YACf,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;SACtC;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AA/Be,yBAAE,GAAG,UAAU,CAAC;AAEhB,oCAAa,GAAG,MAAM,CAAC;AAEvB,+BAAQ,GAAG,QAAQ,CAAC;AAEpB,oCAAa,GAAG,IAAI,CAAC;AA6BzC,eAAe,sBAAsB,CAAC"}

package/dist/obis-observer/commands/uplink/GetObserverCapabilitiesResponse.d.ts

@@ -0,0 +1,19 @@
+import Command, { TCommandExampleList } from '../../Command.js';
+import { ICommandParameters } from '../../CommandBinaryBuffer.js';
+interface IGetObserverCapabilitiesResponseParameters extends ICommandParameters {
+    maxMeterProfilesNumber: number;
+    maxMetersNumber: number;
+    maxObisProfilesNumber: number;
+    isMultiModeSupported: boolean;
+}
+declare class GetObserverCapabilitiesResponse extends Command {
+    parameters: IGetObserverCapabilitiesResponseParameters;
+    constructor(parameters: IGetObserverCapabilitiesResponseParameters);
+    static readonly id = 4;
+    static readonly directionType = 2;
+    static readonly examples: TCommandExampleList;
+    static readonly hasParameters = true;
+    static fromBytes(data: Uint8Array): GetObserverCapabilitiesResponse;
+    toBytes(): Uint8Array;
+}
+export default GetObserverCapabilitiesResponse;

package/dist/obis-observer/commands/uplink/GetObserverCapabilitiesResponse.js

@@ -0,0 +1,53 @@
+import Command from '../../Command.js';
+import { REQUEST_ID_SIZE } from '../../CommandBinaryBuffer.js';
+import { UPLINK } from '../../constants/directions.js';
+const COMMAND_ID = 0x04;
+const examples = [
+    {
+        name: 'response to GetObserverCapabilities',
+        parameters: {
+            requestId: 7,
+            maxMeterProfilesNumber: 8,
+            maxMetersNumber: 8,
+            maxObisProfilesNumber: 255,
+            isMultiModeSupported: true
+        },
+        hex: {
+            header: '04 05',
+            body: '07 08 08 ff 01'
+        }
+    }
+];
+class GetObserverCapabilitiesResponse extends Command {
+    constructor(parameters) {
+        super();
+        this.parameters = parameters;
+        this.size = REQUEST_ID_SIZE + 4;
+    }
+    static fromBytes(data) {
+        const [requestId, maxMeterProfilesNumber, maxMetersNumber, maxObisProfilesNumber, isMultiModeSupported] = data;
+        return new GetObserverCapabilitiesResponse({
+            requestId,
+            maxMeterProfilesNumber,
+            maxMetersNumber,
+            maxObisProfilesNumber,
+            isMultiModeSupported: isMultiModeSupported !== 0
+        });
+    }
+    toBytes() {
+        const { parameters } = this;
+        return Command.toBytes(COMMAND_ID, new Uint8Array([
+            parameters.requestId,
+            parameters.maxMeterProfilesNumber,
+            parameters.maxMetersNumber,
+            parameters.maxObisProfilesNumber,
+            parameters.isMultiModeSupported ? 1 : 0
+        ]));
+    }
+}
+GetObserverCapabilitiesResponse.id = COMMAND_ID;
+GetObserverCapabilitiesResponse.directionType = UPLINK;
+GetObserverCapabilitiesResponse.examples = examples;
+GetObserverCapabilitiesResponse.hasParameters = true;
+export default GetObserverCapabilitiesResponse;
+//# sourceMappingURL=GetObserverCapabilitiesResponse.js.map

package/dist/obis-observer/commands/uplink/GetObserverCapabilitiesResponse.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GetObserverCapabilitiesResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetObserverCapabilitiesResponse.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAC,eAAe,EAAqB,MAAM,8BAA8B,CAAC;AACjF,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAcrD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,qCAAqC;QAC3C,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,sBAAsB,EAAE,CAAC;YACzB,eAAe,EAAE,CAAC;YAClB,qBAAqB,EAAE,GAAG;YAC1B,oBAAoB,EAAE,IAAI;SAC7B;QACD,GAAG,EAAE;YACD,MAAM,EAAE,OAAO;YACf,IAAI,EAAE,gBAAgB;SACzB;KACJ;CACJ,CAAC;AA4BF,MAAM,+BAAgC,SAAQ,OAAO;IACjD,YAAqB,UAAsD;QACvE,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAA4C;QAIvE,IAAI,CAAC,IAAI,GAAG,eAAe,GAAG,CAAC,CAAC;IACpC,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,CACF,SAAS,EACT,sBAAsB,EACtB,eAAe,EACf,qBAAqB,EACrB,oBAAoB,CACvB,GAAG,IAAI,CAAC;QAET,OAAO,IAAI,+BAA+B,CAAC;YACvC,SAAS;YACT,sBAAsB;YACtB,eAAe;YACf,qBAAqB;YACrB,oBAAoB,EAAE,oBAAoB,KAAK,CAAC;SACnD,CAAC,CAAC;IACP,CAAC;IAGD,OAAO;QACH,MAAM,EAAC,UAAU,EAAC,GAAG,IAAI,CAAC;QAE1B,OAAO,OAAO,CAAC,OAAO,CAClB,UAAU,EACV,IAAI,UAAU,CAAC;YACX,UAAU,CAAC,SAAS;YACpB,UAAU,CAAC,sBAAsB;YACjC,UAAU,CAAC,eAAe;YAC1B,UAAU,CAAC,qBAAqB;YAChC,UAAU,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAC1C,CAAC,CACL,CAAC;IACN,CAAC;;AA1Ce,kCAAE,GAAG,UAAU,CAAC;AAEhB,6CAAa,GAAG,MAAM,CAAC;AAEvB,wCAAQ,GAAG,QAAQ,CAAC;AAEpB,6CAAa,GAAG,IAAI,CAAC;AAwCzC,eAAe,+BAA+B,CAAC"}

package/dist/obis-observer/commands/uplink/{GetDeviceInfoResponse.d.ts → GetObserverInfoResponse.d.ts}

@@ -1,18 +1,18 @@
 import Command, { TCommandExampleList } from '../../Command.js';
 import { ICommandParameters, IVersion } from '../../CommandBinaryBuffer.js';
-interface IGetDeviceInfoResponseParameters extends ICommandParameters {
+interface IGetObserverInfoResponseParameters extends ICommandParameters {
     softwareVersion: IVersion;
     hardwareVersion: IVersion;
     deviceName: string;
 }
-declare class GetDeviceInfoResponse extends Command {
-    parameters: IGetDeviceInfoResponseParameters;
-    constructor(parameters: IGetDeviceInfoResponseParameters);
-    static readonly id = 33;
+declare class GetObserverInfoResponse extends Command {
+    parameters: IGetObserverInfoResponseParameters;
+    constructor(parameters: IGetObserverInfoResponseParameters);
+    static readonly id = 2;
     static readonly directionType = 2;
     static readonly examples: TCommandExampleList;
     static readonly hasParameters = true;
-    static fromBytes(data: Uint8Array): GetDeviceInfoResponse;
+    static fromBytes(data: Uint8Array): GetObserverInfoResponse;
     toBytes(): Uint8Array;
 }
-export default GetDeviceInfoResponse;
+export default GetObserverInfoResponse;

package/dist/obis-observer/commands/uplink/{GetDeviceInfoResponse.js → GetObserverInfoResponse.js}

@@ -1,10 +1,10 @@
 import Command from '../../Command.js';
 import CommandBinaryBuffer, { REQUEST_ID_SIZE } from '../../CommandBinaryBuffer.js';
 import { UPLINK } from '../../constants/directions.js';
-const COMMAND_ID = 0x21;
+const COMMAND_ID = 0x02;
 const examples = [
     {
-        name: 'response from device "Jooby Electra RM LoraWan 1D485 EU"',
+        name: 'response to GetObserverInfo with device name "Jooby Electra RM LoraWan 1D485 EU"',
         parameters: {
             requestId: 7,
             softwareVersion: {
@@ -18,33 +18,28 @@ const examples = [
             deviceName: 'Jooby Electra RM LoraWan 1D485 EU'
         },
         hex: {
-            header: '21',
-            body: '27 07 00 01 01 01 21 4a 6f 6f 62 79 20 45 6c 65 63 74 72 61 20 52 4d 20 4c 6f 72 61 57 61 6e 20 31 44 34 38 35 20 45 55'
+            header: '02 27',
+            body: '07 00 01 01 01 21 4a 6f 6f 62 79 20 45 6c 65 63 74 72 61 20 52 4d 20 4c 6f 72 61 57 61 6e 20 31 44 34 38 35 20 45 55'
         }
     }
 ];
-class GetDeviceInfoResponse extends Command {
+class GetObserverInfoResponse extends Command {
     constructor(parameters) {
         super();
         this.parameters = parameters;
-        this.size = 1 + REQUEST_ID_SIZE + 2 + 2 + 1 + parameters.deviceName.length;
+        this.size = REQUEST_ID_SIZE + 2 + 2 + 1 + parameters.deviceName.length;
     }
     static fromBytes(data) {
         const buffer = new CommandBinaryBuffer(data);
-        buffer.seek(buffer.offset + 1);
         const requestId = buffer.getUint8();
         const softwareVersion = buffer.getVersion();
         const hardwareVersion = buffer.getVersion();
         const deviceName = buffer.getString();
-        return new GetDeviceInfoResponse({ requestId, softwareVersion, hardwareVersion, deviceName });
+        return new GetObserverInfoResponse({ requestId, softwareVersion, hardwareVersion, deviceName });
     }
     toBytes() {
-        if (typeof this.size !== 'number') {
-            throw new Error('unknown or invalid size');
-        }
         const buffer = new CommandBinaryBuffer(this.size);
         const { requestId, softwareVersion, hardwareVersion, deviceName } = this.parameters;
-        buffer.setUint8(this.size - 1);
         buffer.setUint8(requestId);
         buffer.setVersion(softwareVersion);
         buffer.setVersion(hardwareVersion);
@@ -52,9 +47,9 @@ class GetDeviceInfoResponse extends Command {
         return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
     }
 }
-GetDeviceInfoResponse.id = COMMAND_ID;
-GetDeviceInfoResponse.directionType = UPLINK;
-GetDeviceInfoResponse.examples = examples;
-GetDeviceInfoResponse.hasParameters = true;
-export default GetDeviceInfoResponse;
-//# sourceMappingURL=GetDeviceInfoResponse.js.map
+GetObserverInfoResponse.id = COMMAND_ID;
+GetObserverInfoResponse.directionType = UPLINK;
+GetObserverInfoResponse.examples = examples;
+GetObserverInfoResponse.hasParameters = true;
+export default GetObserverInfoResponse;
+//# sourceMappingURL=GetObserverInfoResponse.js.map

package/dist/obis-observer/commands/uplink/GetObserverInfoResponse.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GetObserverInfoResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetObserverInfoResponse.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAA+B,MAAM,8BAA8B,CAAC;AAChH,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAarD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,kFAAkF;QACxF,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,eAAe,EAAE;gBACb,KAAK,EAAE,CAAC;gBACR,KAAK,EAAE,CAAC;aACX;YACD,eAAe,EAAE;gBACb,KAAK,EAAE,CAAC;gBACR,KAAK,EAAE,CAAC;aACX;YACD,UAAU,EAAE,mCAAmC;SAClD;QACD,GAAG,EAAE;YACD,MAAM,EAAE,OAAO;YACf,IAAI,EAAE,sHAAsH;SAC/H;KACJ;CACJ,CAAC;AAqCF,MAAM,uBAAwB,SAAQ,OAAO;IACzC,YAAqB,UAA8C;QAC/D,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAoC;QAI/D,IAAI,CAAC,IAAI,GAAG,eAAe,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC;IAC3E,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpC,MAAM,eAAe,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QAC5C,MAAM,eAAe,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QAE5C,MAAM,UAAU,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QAEtC,OAAO,IAAI,uBAAuB,CAAC,EAAC,SAAS,EAAE,eAAe,EAAE,eAAe,EAAE,UAAU,EAAC,CAAC,CAAC;IAClG,CAAC;IAGD,OAAO;QACH,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC;QAC5D,MAAM,EAAC,SAAS,EAAE,eAAe,EAAE,eAAe,EAAE,UAAU,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAElF,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QACnC,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QACnC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QAE7B,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AAhCe,0BAAE,GAAG,UAAU,CAAC;AAEhB,qCAAa,GAAG,MAAM,CAAC;AAEvB,gCAAQ,GAAG,QAAQ,CAAC;AAEpB,qCAAa,GAAG,IAAI,CAAC;AA8BzC,eAAe,uBAAuB,CAAC"}

package/dist/obis-observer/commands/uplink/GetObserverSingleModeResponse.d.ts

@@ -0,0 +1,16 @@
+import Command, { TCommandExampleList } from '../../Command.js';
+import { ICommandParameters } from '../../CommandBinaryBuffer.js';
+interface IGetObserverSingleModeResponseParameters extends ICommandParameters {
+    isSingleMode: boolean;
+}
+declare class GetObserverSingleModeResponse extends Command {
+    parameters: IGetObserverSingleModeResponseParameters;
+    constructor(parameters: IGetObserverSingleModeResponseParameters);
+    static readonly id = 14;
+    static readonly directionType = 2;
+    static readonly examples: TCommandExampleList;
+    static readonly hasParameters = true;
+    static fromBytes([requestId, isSingleMode]: Uint8Array): GetObserverSingleModeResponse;
+    toBytes(): Uint8Array;
+}
+export default GetObserverSingleModeResponse;

package/dist/obis-observer/commands/uplink/GetObserverSingleModeResponse.js

@@ -0,0 +1,33 @@
+import Command from '../../Command.js';
+import { REQUEST_ID_SIZE } from '../../CommandBinaryBuffer.js';
+import { UPLINK } from '../../constants/directions.js';
+const COMMAND_ID = 0x0e;
+const examples = [
+    {
+        name: 'response to GetObserverSingleMode',
+        parameters: {
+            requestId: 7,
+            isSingleMode: true
+        },
+        hex: { header: '0e 02', body: '07 01' }
+    }
+];
+class GetObserverSingleModeResponse extends Command {
+    constructor(parameters) {
+        super();
+        this.parameters = parameters;
+        this.size = REQUEST_ID_SIZE + 4;
+    }
+    static fromBytes([requestId, isSingleMode]) {
+        return new GetObserverSingleModeResponse({ requestId, isSingleMode: isSingleMode !== 0 });
+    }
+    toBytes() {
+        return Command.toBytes(COMMAND_ID, new Uint8Array([this.parameters.requestId, this.parameters.isSingleMode ? 1 : 0]));
+    }
+}
+GetObserverSingleModeResponse.id = COMMAND_ID;
+GetObserverSingleModeResponse.directionType = UPLINK;
+GetObserverSingleModeResponse.examples = examples;
+GetObserverSingleModeResponse.hasParameters = true;
+export default GetObserverSingleModeResponse;
+//# sourceMappingURL=GetObserverSingleModeResponse.js.map

package/dist/obis-observer/commands/uplink/GetObserverSingleModeResponse.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GetObserverSingleModeResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetObserverSingleModeResponse.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAC,eAAe,EAAqB,MAAM,8BAA8B,CAAC;AACjF,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAUrD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,mCAAmC;QACzC,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,YAAY,EAAE,IAAI;SACrB;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAC;KACxC;CACJ,CAAC;AAyBF,MAAM,6BAA8B,SAAQ,OAAO;IAC/C,YAAqB,UAAoD;QACrE,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAA0C;QAGrE,IAAI,CAAC,IAAI,GAAG,eAAe,GAAG,CAAC,CAAC;IACpC,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,CAAC,SAAS,EAAE,YAAY,CAAa;QACpD,OAAO,IAAI,6BAA6B,CAAC,EAAC,SAAS,EAAE,YAAY,EAAE,YAAY,KAAK,CAAC,EAAC,CAAC,CAAC;IAC5F,CAAC;IAGD,OAAO;QACH,OAAO,OAAO,CAAC,OAAO,CAClB,UAAU,EACV,IAAI,UAAU,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACpF,CAAC;IACN,CAAC;;AApBe,gCAAE,GAAG,UAAU,CAAC;AAEhB,2CAAa,GAAG,MAAM,CAAC;AAEvB,sCAAQ,GAAG,QAAQ,CAAC;AAEpB,2CAAa,GAAG,IAAI,CAAC;AAkBzC,eAAe,6BAA6B,CAAC"}

package/dist/obis-observer/commands/uplink/GetObserverUptimeResponse.d.ts

@@ -0,0 +1,16 @@
+import Command, { TCommandExampleList } from '../../Command.js';
+import { ICommandParameters } from '../../CommandBinaryBuffer.js';
+interface IGetObserverUptimeResponseParameters extends ICommandParameters {
+    uptime: number;
+}
+declare class GetObserverUptimeResponse extends Command {
+    parameters: IGetObserverUptimeResponseParameters;
+    constructor(parameters: IGetObserverUptimeResponseParameters);
+    static readonly id = 6;
+    static readonly directionType = 2;
+    static readonly examples: TCommandExampleList;
+    static readonly hasParameters = true;
+    static fromBytes(data: Uint8Array): GetObserverUptimeResponse;
+    toBytes(): Uint8Array;
+}
+export default GetObserverUptimeResponse;

package/dist/obis-observer/commands/uplink/GetObserverUptimeResponse.js

@@ -0,0 +1,41 @@
+import Command from '../../Command.js';
+import CommandBinaryBuffer, { REQUEST_ID_SIZE } from '../../CommandBinaryBuffer.js';
+import { UPLINK } from '../../constants/directions.js';
+const COMMAND_ID = 0x06;
+const examples = [
+    {
+        name: 'response to GetObserverUptime',
+        parameters: {
+            requestId: 7,
+            uptime: 4016
+        },
+        hex: { header: '06 05', body: '07 00 00 0f b0' }
+    }
+];
+class GetObserverUptimeResponse extends Command {
+    constructor(parameters) {
+        super();
+        this.parameters = parameters;
+        this.size = REQUEST_ID_SIZE + 4;
+    }
+    static fromBytes(data) {
+        const buffer = new CommandBinaryBuffer(data);
+        return new GetObserverUptimeResponse({
+            requestId: buffer.getUint8(),
+            uptime: buffer.getUint32()
+        });
+    }
+    toBytes() {
+        const buffer = new CommandBinaryBuffer(this.size);
+        const { requestId, uptime } = this.parameters;
+        buffer.setUint8(requestId);
+        buffer.setUint32(uptime);
+        return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
+    }
+}
+GetObserverUptimeResponse.id = COMMAND_ID;
+GetObserverUptimeResponse.directionType = UPLINK;
+GetObserverUptimeResponse.examples = examples;
+GetObserverUptimeResponse.hasParameters = true;
+export default GetObserverUptimeResponse;
+//# sourceMappingURL=GetObserverUptimeResponse.js.map

package/dist/obis-observer/commands/uplink/GetObserverUptimeResponse.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GetObserverUptimeResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetObserverUptimeResponse.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAAqB,MAAM,8BAA8B,CAAC;AACtG,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAUrD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,+BAA+B;QACrC,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,MAAM,EAAE,IAAI;SACf;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAC;KACjD;CACJ,CAAC;AAyBF,MAAM,yBAA0B,SAAQ,OAAO;IAC3C,YAAqB,UAAgD;QACjE,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAsC;QAGjE,IAAI,CAAC,IAAI,GAAG,eAAe,GAAG,CAAC,CAAC;IACpC,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,OAAO,IAAI,yBAAyB,CAAC;YACjC,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC5B,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE;SAC7B,CAAC,CAAC;IACP,CAAC;IAGD,OAAO;QACH,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC;QAC5D,MAAM,EAAC,SAAS,EAAE,MAAM,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAE5C,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAEzB,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AA5Be,4BAAE,GAAG,UAAU,CAAC;AAEhB,uCAAa,GAAG,MAAM,CAAC;AAEvB,kCAAQ,GAAG,QAAQ,CAAC;AAEpB,uCAAa,GAAG,IAAI,CAAC;AA0BzC,eAAe,yBAAyB,CAAC"}

package/dist/obis-observer/commands/uplink/ObservationReport.d.ts

@@ -1,14 +1,14 @@
 import Command, { TCommandExampleList } from '../../Command.js';
-import { IShortNameFloat } from '../../CommandBinaryBuffer.js';
+import { IObisValueFloat } from '../../CommandBinaryBuffer.js';
 import { TTime2000 } from '../../../utils/time.js';
 interface IObservationReportParameters {
     time2000: TTime2000;
-    shortNameList: Array<IShortNameFloat>;
+    obisValueList: Array<IObisValueFloat>;
 }
 declare class ObservationReport extends Command {
     parameters: IObservationReportParameters;
     constructor(parameters: IObservationReportParameters);
-    static readonly id = 26;
+    static readonly id = 81;
     static readonly directionType = 2;
     static readonly examples: TCommandExampleList;
     static readonly hasParameters = true;

package/dist/obis-observer/commands/uplink/ObservationReport.js

@@ -1,51 +1,47 @@
 import Command from '../../Command.js';
 import CommandBinaryBuffer, { DATE_TIME_SIZE } from '../../CommandBinaryBuffer.js';
 import { UPLINK } from '../../constants/directions.js';
-const COMMAND_ID = 0x1a;
+const COMMAND_ID = 0x51;
 const examples = [
     {
-        name: 'get observation report from 2023.12.23 00:00:00 GMT',
+        name: 'observation report from 2023.12.23 00:00:00 GMT',
         parameters: {
             time2000: 756604800,
-            shortNameList: [
+            obisValueList: [
                 { code: 50, content: 34.33 },
                 { code: 56, content: 45.33 }
             ]
         },
-        hex: { header: '1a', body: '0e 2d 18 df 80 32 42 09 51 ec 38 42 35 51 ec' }
+        hex: { header: '51 0e', body: '2d 18 df 80 32 42 09 51 ec 38 42 35 51 ec' }
     }
 ];
 class ObservationReport extends Command {
     constructor(parameters) {
         super();
         this.parameters = parameters;
-        let size = 1 + DATE_TIME_SIZE;
-        this.parameters.shortNameList.forEach(shortName => {
-            size += CommandBinaryBuffer.getShortNameContentSize(shortName);
+        let size = DATE_TIME_SIZE;
+        this.parameters.obisValueList.forEach(obisValue => {
+            size += CommandBinaryBuffer.getObisContentSize(obisValue);
         });
         this.size = size;
     }
     static fromBytes(data) {
         const buffer = new CommandBinaryBuffer(data);
-        let size = buffer.getUint8() - DATE_TIME_SIZE;
+        let size = data.length - DATE_TIME_SIZE;
         const time2000 = buffer.getUint32();
-        const shortNameList = [];
+        const obisValueList = [];
         while (size > 0) {
-            const shortName = buffer.getShortNameFloat();
-            size -= CommandBinaryBuffer.getShortNameContentSize(shortName);
-            shortNameList.push(shortName);
+            const obisValue = buffer.getObisValueFloat();
+            size -= CommandBinaryBuffer.getObisContentSize(obisValue);
+            obisValueList.push(obisValue);
         }
-        return new ObservationReport({ time2000, shortNameList });
+        return new ObservationReport({ time2000, obisValueList });
     }
     toBytes() {
-        if (typeof this.size !== 'number') {
-            throw new Error('unknown or invalid size');
-        }
         const buffer = new CommandBinaryBuffer(this.size);
-        const { time2000, shortNameList } = this.parameters;
-        buffer.setUint8(this.size - 1);
+        const { time2000, obisValueList } = this.parameters;
         buffer.setUint32(time2000);
-        shortNameList.forEach(shortName => buffer.setShortNameFloat(shortName));
+        obisValueList.forEach(obisValue => buffer.setObisValueFloat(obisValue));
         return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
     }
 }

package/dist/obis-observer/commands/uplink/ObservationReport.js.map

@@ -1 +1 @@
-{"version":3,"file":"ObservationReport.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/ObservationReport.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,cAAc,EAAkB,MAAM,8BAA8B,CAAC;AAClG,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAcrD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,qDAAqD;QAC3D,UAAU,EAAE;YACR,QAAQ,EAAE,SAAS;YACnB,aAAa,EAAE;gBACX,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAC;gBAC1B,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAC;aAC7B;SACJ;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,8CAA8C,EAAC;KAC5E;CACJ,CAAC;AA0BF,MAAM,iBAAkB,SAAQ,OAAO;IACnC,YAAqB,UAAwC;QACzD,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAA8B;QAIzD,IAAI,IAAI,GAAG,CAAC,GAAG,cAAc,CAAC;QAE9B,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YAC9C,IAAI,IAAI,mBAAmB,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,IAAI,IAAI,GAAG,MAAM,CAAC,QAAQ,EAAE,GAAG,cAAc,CAAC;QAC9C,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QACpC,MAAM,aAAa,GAAG,EAAE,CAAC;QAEzB,OAAQ,IAAI,GAAG,CAAC,EAAG;YACf,MAAM,SAAS,GAAG,MAAM,CAAC,iBAAiB,EAAE,CAAC;YAE7C,IAAI,IAAI,mBAAmB,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;YAC/D,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACjC;QAED,OAAO,IAAI,iBAAiB,CAAC,EAAC,QAAQ,EAAE,aAAa,EAAC,CAAC,CAAC;IAC5D,CAAC;IAGD,OAAO;QACH,IAAK,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAG;YACjC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;SAC9C;QAED,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,EAAC,QAAQ,EAAE,aAAa,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAGlD,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;QAC/B,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC3B,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC;QAExE,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AA1Ce,oBAAE,GAAG,UAAU,CAAC;AAEhB,+BAAa,GAAG,MAAM,CAAC;AAEvB,0BAAQ,GAAG,QAAQ,CAAC;AAEpB,+BAAa,GAAG,IAAI,CAAC;AAwCzC,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"ObservationReport.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/ObservationReport.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,cAAc,EAAkB,MAAM,8BAA8B,CAAC;AAClG,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAcrD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,iDAAiD;QACvD,UAAU,EAAE;YACR,QAAQ,EAAE,SAAS;YACnB,aAAa,EAAE;gBACX,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAC;gBAC1B,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAC;aAC7B;SACJ;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,2CAA2C,EAAC;KAC5E;CACJ,CAAC;AA0BF,MAAM,iBAAkB,SAAQ,OAAO;IACnC,YAAqB,UAAwC;QACzD,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAA8B;QAGzD,IAAI,IAAI,GAAG,cAAc,CAAC;QAE1B,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YAC9C,IAAI,IAAI,mBAAmB,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,IAAI,IAAI,GAAG,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC;QACxC,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QACpC,MAAM,aAAa,GAAG,EAAE,CAAC;QAEzB,OAAQ,IAAI,GAAG,CAAC,EAAG;YACf,MAAM,SAAS,GAAG,MAAM,CAAC,iBAAiB,EAAE,CAAC;YAE7C,IAAI,IAAI,mBAAmB,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;YAC1D,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACjC;QAED,OAAO,IAAI,iBAAiB,CAAC,EAAC,QAAQ,EAAE,aAAa,EAAC,CAAC,CAAC;IAC5D,CAAC;IAGD,OAAO;QACH,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC;QAC5D,MAAM,EAAC,QAAQ,EAAE,aAAa,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAElD,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC3B,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC;QAExE,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AApCe,oBAAE,GAAG,UAAU,CAAC;AAEhB,+BAAa,GAAG,MAAM,CAAC;AAEvB,0BAAQ,GAAG,QAAQ,CAAC;AAEpB,+BAAa,GAAG,IAAI,CAAC;AAkCzC,eAAe,iBAAiB,CAAC"}

package/dist/obis-observer/commands/uplink/ObservationReportString.d.ts

@@ -1,14 +1,14 @@
 import Command, { TCommandExampleList } from '../../Command.js';
-import { IShortNameString } from '../../CommandBinaryBuffer.js';
+import { IObisValueString } from '../../CommandBinaryBuffer.js';
 import { TTime2000 } from '../../../utils/time.js';
 interface IObservationReportStringParameters {
     time2000: TTime2000;
-    shortNameList: Array<IShortNameString>;
+    obisValueList: Array<IObisValueString>;
 }
 declare class ObservationReportString extends Command {
     parameters: IObservationReportStringParameters;
     constructor(parameters: IObservationReportStringParameters);
-    static readonly id = 27;
+    static readonly id = 82;
     static readonly directionType = 2;
     static readonly examples: TCommandExampleList;
     static readonly hasParameters = true;