ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Renamed devices to have Config at the end

Browse source
This commit is contained in:
Ziver Koc 2025-10-24 01:47:19 +02:00
parent ac97ca8068
commit c26c769108
8 changed files with 28 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/TibberController.java vendored
View file

@ -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.TibberElectricityPriceSensor;
import se.hal.plugin.vendor.tibber.device.TibberPowerConsumptionSensor;
import se.hal.plugin.vendor.tibber.device.TibberElectricityCostSensorConfig;
import se.hal.plugin.vendor.tibber.device.TibberElectricityPriceSensorConfig;
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) {

4
plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/device/TibberElectricityCostSensor.java → plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/device/TibberElectricityCostSensorConfig.java vendored
View file

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

4
plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/device/TibberElectricityPriceSensor.java → plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/device/TibberElectricityPriceSensorConfig.java vendored
View file

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

4
plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/device/TibberPowerConsumptionSensor.java → plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/device/TibberPowerConsumptionSensorConfig.java vendored
View file

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

6
plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/plugin.json vendored
View file

@ -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.TibberElectricityPriceSensor"},
{"se.hal.intf.HalSensorConfig": "se.hal.plugin.vendor.tibber.device.TibberPowerConsumptionSensor"}
{"se.hal.intf.HalSensorConfig": "se.hal.plugin.vendor.tibber.device.TibberElectricityCostSensorConfig"},
{"se.hal.intf.HalSensorConfig": "se.hal.plugin.vendor.tibber.device.TibberElectricityPriceSensorConfig"},
{"se.hal.intf.HalSensorConfig": "se.hal.plugin.vendor.tibber.device.TibberPowerConsumptionSensorConfig"}
]
}