From a0b078989d830e295cce5f5a94bdc2f7f5499e08 Mon Sep 17 00:00:00 2001 From: cpoder Date: Thu, 6 Jun 2024 10:11:48 +0200 Subject: [PATCH] harmonizing pulse measurement in Adeunis codec --- nodejs/lora-codec-adeunis/src/AdeunisCodec.spec.ts | 6 +++--- nodejs/lora-codec-adeunis/src/AdeunisCodec.ts | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/nodejs/lora-codec-adeunis/src/AdeunisCodec.spec.ts b/nodejs/lora-codec-adeunis/src/AdeunisCodec.spec.ts index e0eb5c38d..b3b69e4c0 100644 --- a/nodejs/lora-codec-adeunis/src/AdeunisCodec.spec.ts +++ b/nodejs/lora-codec-adeunis/src/AdeunisCodec.spec.ts @@ -29,13 +29,13 @@ describe("Test Adeunis Codec", () => { "4820000000010000000200000100020003000400050006000700080009000A000B000C000D000E000F00100011001200130014" ); console.dir(c8yData, { depth: null }); - expect(c8yData.measurements.length).toBe(20); + expect(c8yData.measurements).toHaveLength(20); }); test("Test analog", () => { let codec: TestCodec = new TestCodec(null); let c8yData: C8YData = codec.testDecode("analog", "42500110000002100000"); console.dir(c8yData, { depth: null }); - expect(c8yData.measurements.length).toBe(2); + expect(c8yData.measurements).toHaveLength(2); }); test("Test Pulse 4 with historic data", () => { let codec: TestCodec = new TestCodec(null); @@ -50,7 +50,7 @@ describe("Test Adeunis Codec", () => { let codec: TestCodec = new TestCodec(null); let c8yData: C8YData = codec.testDecode("pulse", "46000000000000026C9B"); console.dir(c8yData, { depth: null }); - expect(c8yData.measurements.length).toBe(2); + expect(c8yData.measurements).toHaveLength(2); expect(c8yData.measurements[0].type).toBe("Channel A"); expect(c8yData.measurements[1].type).toBe("Channel B"); }); diff --git a/nodejs/lora-codec-adeunis/src/AdeunisCodec.ts b/nodejs/lora-codec-adeunis/src/AdeunisCodec.ts index 6386e48fc..19dab5584 100644 --- a/nodejs/lora-codec-adeunis/src/AdeunisCodec.ts +++ b/nodejs/lora-codec-adeunis/src/AdeunisCodec.ts @@ -116,7 +116,7 @@ export class AdeunisCodec extends DeviceCodec { mo, "Pulse", channel, - "", + "count", c, new Date(time.getTime() - samplingPeriod * i * 1000) ); @@ -166,9 +166,9 @@ export class AdeunisCodec extends DeviceCodec { channel.deltaValues.forEach((value, i) => { c8yData.addMeasurement( mo, + "Pulse", channel.name, - channel.name, - "count", + "", channel.index + value, new Date(time.getTime() + result.baseTime * i * 60000) ); @@ -180,9 +180,9 @@ export class AdeunisCodec extends DeviceCodec { result.counterValues.forEach((value, i) => { c8yData.addMeasurement( mo, + "Pulse", "Channel " + String.fromCharCode(65 + i), - "Channel " + String.fromCharCode(65 + i), - "count", + "", value, time );