dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed voltage and current resolution

Browse Source
This commit is contained in:
dashevchenko 2024-10-01 11:43:53 +03:00
parent 1c8018fd49
commit 5f7ce347c2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/efento/CoapEfentoTransportResource.java
View File

@ -376,10 +376,10 @@ public class CoapEfentoTransportResource extends AbstractCoapTransportResource {
values.addProperty("percentage_" + channelNumber, (double) (startPoint + sampleOffset) / 100f); values.addProperty("percentage_" + channelNumber, (double) (startPoint + sampleOffset) / 100f);
break; break;
case MEASUREMENT_TYPE_VOLTAGE: case MEASUREMENT_TYPE_VOLTAGE:
values.addProperty("voltage_" + channelNumber, (double) (startPoint + sampleOffset)); values.addProperty("voltage_" + channelNumber, (double) (startPoint + sampleOffset) / 10f);
break; break;
case MEASUREMENT_TYPE_CURRENT: case MEASUREMENT_TYPE_CURRENT:
values.addProperty("current_" + channelNumber, (double) (startPoint + sampleOffset)); values.addProperty("current_" + channelNumber, (double) (startPoint + sampleOffset) / 100f);
break; break;
case MEASUREMENT_TYPE_PULSE_CNT_ACC_MINOR: case MEASUREMENT_TYPE_PULSE_CNT_ACC_MINOR:
addPulseCounterProperties(values, "pulse_cnt_acc_minor_", channelNumber, startPoint + sampleOffset, PULSE_CNT_ACC_MINOR_METADATA_FACTOR); addPulseCounterProperties(values, "pulse_cnt_acc_minor_", channelNumber, startPoint + sampleOffset, PULSE_CNT_ACC_MINOR_METADATA_FACTOR);
@ -400,7 +400,7 @@ public class CoapEfentoTransportResource extends AbstractCoapTransportResource {
addPulseCounterProperties(values, "pulse_cnt_acc_wide_major_", channelNumber, startPoint + sampleOffset, PULSE_CNT_ACC_WIDE_MAJOR_METADATA_FACTOR); addPulseCounterProperties(values, "pulse_cnt_acc_wide_major_", channelNumber, startPoint + sampleOffset, PULSE_CNT_ACC_WIDE_MAJOR_METADATA_FACTOR);
break; break;
case MEASUREMENT_TYPE_CURRENT_PRECISE: case MEASUREMENT_TYPE_CURRENT_PRECISE:
values.addProperty("current_precise_" + channelNumber, (double) (startPoint + sampleOffset)); values.addProperty("current_precise_" + channelNumber, (double) (startPoint + sampleOffset) / 1000f);
break; break;
case MEASUREMENT_TYPE_NO_SENSOR: case MEASUREMENT_TYPE_NO_SENSOR:
case UNRECOGNIZED: case UNRECOGNIZED:

6
common/transport/coap/src/test/java/org/thingsboard/server/transport/coap/efento/CoapEfentoTransportResourceTest.java
View File

@ -163,9 +163,9 @@ class CoapEfentoTransportResourceTest {
Arguments.of(MEASUREMENT_TYPE_CO2_EQUIVALENT, List.of(450), "co2_1", 150), 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_BREATH_VOC, List.of(220), "breath_voc_1", 73),
Arguments.of(MEASUREMENT_TYPE_PERCENTAGE, List.of(80), "percentage_1", 0.8), 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_VOLTAGE, List.of(2400), "voltage_1", 240.0),
Arguments.of(MEASUREMENT_TYPE_CURRENT, List.of(550), "current_1", 550.0), Arguments.of(MEASUREMENT_TYPE_CURRENT, List.of(550), "current_1", 5.5),
Arguments.of(MEASUREMENT_TYPE_CURRENT_PRECISE, List.of(275), "current_precise_1", 275.0) Arguments.of(MEASUREMENT_TYPE_CURRENT_PRECISE, List.of(275), "current_precise_1", 0.275)
); );
} }