Browse Source

add WATER_METER proto type to CoapEfentoTransportResource

pull/5477/head
Mariesnlk 5 years ago
committed by ShvaykaD
parent
commit
7ce5b53ac0
  1. 6
      common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/efento/CoapEfentoTransportResource.java

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

@ -168,6 +168,12 @@ public class CoapEfentoTransportResource extends AbstractCoapTransportResource {
values.addProperty("temperature_" + channel, ((double) (startPoint + sampleOffset)) / 10f); values.addProperty("temperature_" + channel, ((double) (startPoint + sampleOffset)) / 10f);
startTimestampMillis = startTimestampMillis + measurementPeriodMillis; startTimestampMillis = startTimestampMillis + measurementPeriodMillis;
break; break;
case WATER_METER:
values = valuesMap.computeIfAbsent(startTimestampMillis, k ->
CoapEfentoUtils.setDefaultMeasurements(serialNumber, batteryStatus, measurementPeriod, nextTransmissionAtMillis, signal, k));
values.addProperty("pulse_counter_" + channel, ((double) (startPoint + sampleOffset)));
startTimestampMillis = startTimestampMillis + measurementPeriodMillis;
break;
case HUMIDITY: case HUMIDITY:
values = valuesMap.computeIfAbsent(startTimestampMillis, k -> values = valuesMap.computeIfAbsent(startTimestampMillis, k ->
CoapEfentoUtils.setDefaultMeasurements(serialNumber, batteryStatus, measurementPeriod, nextTransmissionAtMillis, signal, k)); CoapEfentoUtils.setDefaultMeasurements(serialNumber, batteryStatus, measurementPeriod, nextTransmissionAtMillis, signal, k));

Loading…
Cancel
Save