Renamed devices to have Config at the end
This commit is contained in:
parent
ac97ca8068
commit
c26c769108
8 changed files with 28 additions and 21 deletions
|
|
@ -27,7 +27,7 @@ package se.hal.plugin.vendor.ecosense;
|
|||
import se.hal.HalContext;
|
||||
import se.hal.HalServer;
|
||||
import se.hal.intf.*;
|
||||
import se.hal.plugin.vendor.ecosense.device.EccoCubeRadonSensor;
|
||||
import se.hal.plugin.vendor.ecosense.device.EccoCubeRadonSensorConfig;
|
||||
import se.hal.struct.devicedata.RadonSensorData;
|
||||
import zutil.ObjectUtil;
|
||||
import zutil.log.LogUtil;
|
||||
|
|
@ -83,7 +83,7 @@ public class EcoSenseController implements HalSensorController, Runnable, HalDae
|
|||
return;
|
||||
}
|
||||
|
||||
EccoCubeRadonSensor radonSensor = new EccoCubeRadonSensor();
|
||||
EccoCubeRadonSensorConfig radonSensor = new EccoCubeRadonSensorConfig();
|
||||
radonSensor.setSerialNumber(apiResponse.serialNumber);
|
||||
|
||||
RadonSensorData radonSensorData = new RadonSensorData(apiResponse.radonLevel, apiResponse.lastRadonUpdateTime);
|
||||
|
|
|
|||
|
|
@ -29,14 +29,16 @@ import se.hal.intf.HalSensorController;
|
|||
import se.hal.intf.HalSensorData;
|
||||
import se.hal.plugin.vendor.ecosense.EcoSenseController;
|
||||
import se.hal.struct.devicedata.RadonSensorData;
|
||||
import zutil.ui.conf.Configurator;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* A sensor that calculate current radon level
|
||||
*/
|
||||
public class EccoCubeRadonSensor implements HalSensorConfig {
|
||||
public class EccoCubeRadonSensorConfig implements HalSensorConfig {
|
||||
|
||||
@Configurator.Configurable(value = "Device serial number")
|
||||
private String serialNumber;
|
||||
|
||||
|
||||
|
|
@ -66,9 +68,9 @@ public class EccoCubeRadonSensor implements HalSensorConfig {
|
|||
|
||||
@Override
|
||||
public final boolean equals(Object o) {
|
||||
if (!(o instanceof EccoCubeRadonSensor)) return false;
|
||||
if (!(o instanceof EccoCubeRadonSensorConfig)) return false;
|
||||
|
||||
EccoCubeRadonSensor that = (EccoCubeRadonSensor) o;
|
||||
EccoCubeRadonSensorConfig that = (EccoCubeRadonSensorConfig) o;
|
||||
return Objects.equals(serialNumber, that.serialNumber);
|
||||
}
|
||||
|
||||
|
|
@ -76,4 +78,9 @@ public class EccoCubeRadonSensor implements HalSensorConfig {
|
|||
public int hashCode() {
|
||||
return Objects.hashCode(serialNumber);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "Serial number: " + serialNumber;
|
||||
}
|
||||
}
|
||||
|
|
@ -5,6 +5,6 @@
|
|||
"interfaces": [
|
||||
{"se.hal.intf.HalAutostartController": "se.hal.plugin.vendor.ecosense.EcoSenseController"},
|
||||
|
||||
{"se.hal.intf.HalSensorConfig": "se.hal.plugin.vendor.ecosense.device.EccoCubeRadonSensor"}
|
||||
{"se.hal.intf.HalSensorConfig": "se.hal.plugin.vendor.ecosense.device.EccoCubeRadonSensorConfig"}
|
||||
]
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue