From 1c8018fd49374d99d18f4515d4e638457be30d69 Mon Sep 17 00:00:00 2001 From: dashevchenko Date: Tue, 1 Oct 2024 11:31:29 +0300 Subject: [PATCH] fixed percentage sensor --- .../transport/coap/efento/CoapEfentoTransportResource.java | 2 +- .../transport/coap/efento/CoapEfentoTransportResourceTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/efento/CoapEfentoTransportResource.java b/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/efento/CoapEfentoTransportResource.java index cd08897c7c..6324845fb6 100644 --- a/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/efento/CoapEfentoTransportResource.java +++ b/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/efento/CoapEfentoTransportResource.java @@ -373,7 +373,7 @@ public class CoapEfentoTransportResource extends AbstractCoapTransportResource { addPulseCounterProperties(values, "breath_voc_", channelNumber, startPoint + sampleOffset, BREATH_VOC_METADATA_FACTOR); break; case MEASUREMENT_TYPE_PERCENTAGE: - values.addProperty("percentage_" + channelNumber, startPoint + sampleOffset); + values.addProperty("percentage_" + channelNumber, (double) (startPoint + sampleOffset) / 100f); break; case MEASUREMENT_TYPE_VOLTAGE: values.addProperty("voltage_" + channelNumber, (double) (startPoint + sampleOffset)); diff --git a/common/transport/coap/src/test/java/org/thingsboard/server/transport/coap/efento/CoapEfentoTransportResourceTest.java b/common/transport/coap/src/test/java/org/thingsboard/server/transport/coap/efento/CoapEfentoTransportResourceTest.java index 29d144a78f..1c6e567b73 100644 --- a/common/transport/coap/src/test/java/org/thingsboard/server/transport/coap/efento/CoapEfentoTransportResourceTest.java +++ b/common/transport/coap/src/test/java/org/thingsboard/server/transport/coap/efento/CoapEfentoTransportResourceTest.java @@ -162,7 +162,7 @@ class CoapEfentoTransportResourceTest { Arguments.of(MEASUREMENT_TYPE_STATIC_IAQ, List.of(110), "static_iaq_1", 36), Arguments.of(MEASUREMENT_TYPE_CO2_EQUIVALENT, List.of(450), "co2_1", 150), Arguments.of(MEASUREMENT_TYPE_BREATH_VOC, List.of(220), "breath_voc_1", 73), - Arguments.of(MEASUREMENT_TYPE_PERCENTAGE, List.of(80), "percentage_1", 80), + Arguments.of(MEASUREMENT_TYPE_PERCENTAGE, List.of(80), "percentage_1", 0.8), Arguments.of(MEASUREMENT_TYPE_VOLTAGE, List.of(2400), "voltage_1", 2400.0), Arguments.of(MEASUREMENT_TYPE_CURRENT, List.of(550), "current_1", 550.0), Arguments.of(MEASUREMENT_TYPE_CURRENT_PRECISE, List.of(275), "current_precise_1", 275.0)