Renamed devices to have Config at the end

plugins/hal-vendor-ecosense/src/se/hal/plugin/vendor/ecosense/EcoSenseController.java

@@ -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);

plugins/hal-vendor-ecosense/src/se/hal/plugin/vendor/ecosense/device/EccoCubeRadonSensorConfig.java

@@ -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;
+    }
 }

plugins/hal-vendor-ecosense/src/se/hal/plugin/vendor/ecosense/plugin.json

@@ -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"}
   ]
 }

plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/TibberController.java

@@ -27,9 +27,9 @@ package se.hal.plugin.vendor.tibber;
 import se.hal.HalContext;
 import se.hal.HalServer;
 import se.hal.intf.*;
-import se.hal.plugin.vendor.tibber.device.TibberElectricityCostSensor;
+import se.hal.plugin.vendor.tibber.device.TibberElectricityCostSensorConfig;
-import se.hal.plugin.vendor.tibber.device.TibberElectricityPriceSensor;
+import se.hal.plugin.vendor.tibber.device.TibberElectricityPriceSensorConfig;
-import se.hal.plugin.vendor.tibber.device.TibberPowerConsumptionSensor;
+import se.hal.plugin.vendor.tibber.device.TibberPowerConsumptionSensorConfig;
 import se.hal.struct.devicedata.PriceSensorData;
 import se.hal.util.ListenerUtil;
 import zutil.log.LogUtil;
@@ -92,13 +92,13 @@ public class TibberController implements HalSensorController, Runnable, HalDaemo
             }
 
             if (consumption.cost > 0) {
-                ListenerUtil.callReportReceived(deviceListeners, new TibberElectricityCostSensor(), new PriceSensorData(consumption.cost, consumption.timestamp));
+                ListenerUtil.callReportReceived(deviceListeners, new TibberElectricityCostSensorConfig(), new PriceSensorData(consumption.cost, consumption.timestamp));
             }
             if (consumption.unitPriceVAT > 0) {
-                ListenerUtil.callReportReceived(deviceListeners, new TibberElectricityPriceSensor(), new PriceSensorData(consumption.unitPriceVAT, consumption.timestamp));
+                ListenerUtil.callReportReceived(deviceListeners, new TibberElectricityPriceSensorConfig(), new PriceSensorData(consumption.unitPriceVAT, consumption.timestamp));
             }
             if (consumption.consumption > 0) {
-                ListenerUtil.callReportReceived(deviceListeners, new TibberPowerConsumptionSensor(), new PriceSensorData(consumption.consumption, consumption.timestamp));
+                ListenerUtil.callReportReceived(deviceListeners, new TibberPowerConsumptionSensorConfig(), new PriceSensorData(consumption.consumption, consumption.timestamp));
             }
 
         } catch (Exception e) {

plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/device/TibberElectricityCostSensorConfig.java

@@ -33,7 +33,7 @@ import se.hal.struct.devicedata.CostSensorData;
 /**
  * A sensor that calculate current electricity bil
  */
-public class TibberElectricityCostSensor implements HalSensorConfig {
+public class TibberElectricityCostSensorConfig implements HalSensorConfig {
 
 
 
@@ -59,6 +59,6 @@ public class TibberElectricityCostSensor implements HalSensorConfig {
 
     @Override
     public boolean equals(Object obj) {
-        return obj instanceof TibberElectricityCostSensor;
+        return obj instanceof TibberElectricityCostSensorConfig;
     }
 }

plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/device/TibberElectricityPriceSensorConfig.java

@@ -33,7 +33,7 @@ import se.hal.struct.devicedata.PriceSensorData;
 /**
  * A sensor that shows the price of electricity at a specific time
  */
-public class TibberElectricityPriceSensor implements HalSensorConfig {
+public class TibberElectricityPriceSensorConfig implements HalSensorConfig {
 
 
 
@@ -59,6 +59,6 @@ public class TibberElectricityPriceSensor implements HalSensorConfig {
 
     @Override
     public boolean equals(Object obj) {
-        return obj instanceof TibberElectricityPriceSensor;
+        return obj instanceof TibberElectricityPriceSensorConfig;
     }
 }

plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/device/TibberPowerConsumptionSensorConfig.java

@@ -31,7 +31,7 @@ import se.hal.struct.devicedata.PowerConsumptionSensorData;
 import se.hal.plugin.vendor.tibber.TibberController;
 
 
-public class TibberPowerConsumptionSensor implements HalSensorConfig {
+public class TibberPowerConsumptionSensorConfig implements HalSensorConfig {
 
 
     @Override
@@ -56,6 +56,6 @@ public class TibberPowerConsumptionSensor implements HalSensorConfig {
 
     @Override
     public boolean equals(Object obj) {
-        return obj instanceof TibberPowerConsumptionSensor;
+        return obj instanceof TibberPowerConsumptionSensorConfig;
     }
 }

plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/plugin.json

@@ -5,8 +5,8 @@
     "interfaces": [
         {"se.hal.intf.HalAutostartController": "se.hal.plugin.vendor.tibber.TibberController"},
 
-        {"se.hal.intf.HalSensorConfig": "se.hal.plugin.vendor.tibber.device.TibberElectricityCostSensor"},
+        {"se.hal.intf.HalSensorConfig": "se.hal.plugin.vendor.tibber.device.TibberElectricityCostSensorConfig"},
-        {"se.hal.intf.HalSensorConfig": "se.hal.plugin.vendor.tibber.device.TibberElectricityPriceSensor"},
+        {"se.hal.intf.HalSensorConfig": "se.hal.plugin.vendor.tibber.device.TibberElectricityPriceSensorConfig"},
-        {"se.hal.intf.HalSensorConfig": "se.hal.plugin.vendor.tibber.device.TibberPowerConsumptionSensor"}
+        {"se.hal.intf.HalSensorConfig": "se.hal.plugin.vendor.tibber.device.TibberPowerConsumptionSensorConfig"}
     ]
 }