From 940016f44a62bc3dbe01c9d2f7680fb0fc84d81b Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Thu, 16 Sep 2021 21:58:48 +0200 Subject: [PATCH] Added default aggregation intervall. --- hal-core/src/se/hal/intf/HalSensorConfig.java | 4 +++- .../se/hal/plugin/zigbee/device/ZigbeeHumidityConfig.java | 5 ----- .../se/hal/plugin/zigbee/device/ZigbeePressureConfig.java | 5 ----- .../se/hal/plugin/zigbee/device/ZigbeeTemperatureConfig.java | 5 ----- 4 files changed, 3 insertions(+), 16 deletions(-) diff --git a/hal-core/src/se/hal/intf/HalSensorConfig.java b/hal-core/src/se/hal/intf/HalSensorConfig.java index d02dae0b..0ba9f8c4 100644 --- a/hal-core/src/se/hal/intf/HalSensorConfig.java +++ b/hal-core/src/se/hal/intf/HalSensorConfig.java @@ -13,7 +13,9 @@ public interface HalSensorConfig extends HalDeviceConfig { /** * @return the intended data reporting interval in milliseconds. */ - long getDataInterval(); + default long getDataInterval() { + return 60 * 60 * 1000; // 1 hour + } /** * @return which aggregation method that should be used to aggregate the reported data. diff --git a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/device/ZigbeeHumidityConfig.java b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/device/ZigbeeHumidityConfig.java index fc9ace3a..0e1fb1eb 100644 --- a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/device/ZigbeeHumidityConfig.java +++ b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/device/ZigbeeHumidityConfig.java @@ -35,11 +35,6 @@ public class ZigbeeHumidityConfig extends ZigbeeHalDeviceConfig implements HalSe // Hal Methods // -------------------------- - @Override - public long getDataInterval() { - return 0; - } - @Override public AggregationMethod getAggregationMethod() { return AggregationMethod.AVERAGE; diff --git a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/device/ZigbeePressureConfig.java b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/device/ZigbeePressureConfig.java index b375b2ed..93c77b1b 100644 --- a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/device/ZigbeePressureConfig.java +++ b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/device/ZigbeePressureConfig.java @@ -36,11 +36,6 @@ public class ZigbeePressureConfig extends ZigbeeHalDeviceConfig implements HalSe // Hal Methods // -------------------------- - @Override - public long getDataInterval() { - return 0; - } - @Override public AggregationMethod getAggregationMethod() { return AggregationMethod.AVERAGE; diff --git a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/device/ZigbeeTemperatureConfig.java b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/device/ZigbeeTemperatureConfig.java index a093e4f7..c66a05c8 100644 --- a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/device/ZigbeeTemperatureConfig.java +++ b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/device/ZigbeeTemperatureConfig.java @@ -35,11 +35,6 @@ public class ZigbeeTemperatureConfig extends ZigbeeHalDeviceConfig implements Ha // Hal Methods // -------------------------- - @Override - public long getDataInterval() { - return 0; - } - @Override public AggregationMethod getAggregationMethod() { return AggregationMethod.AVERAGE;