From 98c48e595fbda0f0e0d5cf07dfe29a1769e724c0 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Fri, 15 Mar 2024 00:59:47 +0100
Subject: [PATCH] Fixed compilation issues

---
 .../hal/struct/devicedata/CostSensorData.java | 36 +++++++++++++++++++
 .../struct/devicedata/PriceSensorData.java    | 36 +++++++++++++++++++
 .../tibber/device/ElectricityCostSensor.java  |  2 +-
 .../tibber/device/ElectricityPriceSensor.java |  3 +-
 .../tibber/device/PowerConsumptionSensor.java |  4 +--
 5 files changed, 76 insertions(+), 5 deletions(-)
 create mode 100644 hal-core/src/se/hal/struct/devicedata/CostSensorData.java
 create mode 100644 hal-core/src/se/hal/struct/devicedata/PriceSensorData.java

diff --git a/hal-core/src/se/hal/struct/devicedata/CostSensorData.java b/hal-core/src/se/hal/struct/devicedata/CostSensorData.java
new file mode 100644
index 00000000..219a1806
--- /dev/null
+++ b/hal-core/src/se/hal/struct/devicedata/CostSensorData.java
@@ -0,0 +1,36 @@
+package se.hal.struct.devicedata;
+
+import se.hal.intf.HalSensorData;
+
+
+public class CostSensorData extends HalSensorData {
+
+    private double cost;
+
+
+    public CostSensorData(){}
+    public CostSensorData(double cost, long timestamp){
+        this.cost = cost;
+        super.setTimestamp(timestamp);
+    }
+
+
+    @Override
+    public String toString(){
+        return cost + "";
+    }
+
+    // ----------------------------------------
+    // Storage methods
+    // ----------------------------------------
+
+    @Override
+    public double getData() {
+        return cost;
+    }
+
+    @Override
+    public void setData(double cost) {
+        this.cost = cost;
+    }
+}
diff --git a/hal-core/src/se/hal/struct/devicedata/PriceSensorData.java b/hal-core/src/se/hal/struct/devicedata/PriceSensorData.java
new file mode 100644
index 00000000..07145686
--- /dev/null
+++ b/hal-core/src/se/hal/struct/devicedata/PriceSensorData.java
@@ -0,0 +1,36 @@
+package se.hal.struct.devicedata;
+
+import se.hal.intf.HalSensorData;
+
+
+public class PriceSensorData extends HalSensorData {
+
+    private double price;
+
+
+    public PriceSensorData(){}
+    public PriceSensorData(double price, long timestamp){
+        this.price = price;
+        super.setTimestamp(timestamp);
+    }
+
+
+    @Override
+    public String toString(){
+        return price + "";
+    }
+
+    // ----------------------------------------
+    // Storage methods
+    // ----------------------------------------
+
+    @Override
+    public double getData() {
+        return price;
+    }
+
+    @Override
+    public void setData(double price) {
+        this.price = price;
+    }
+}
diff --git a/plugins/hal-tibber/src/se/hal/plugin/tibber/device/ElectricityCostSensor.java b/plugins/hal-tibber/src/se/hal/plugin/tibber/device/ElectricityCostSensor.java
index 9a2c8381..a1013fbc 100644
--- a/plugins/hal-tibber/src/se/hal/plugin/tibber/device/ElectricityCostSensor.java
+++ b/plugins/hal-tibber/src/se/hal/plugin/tibber/device/ElectricityCostSensor.java
@@ -28,7 +28,7 @@ import se.hal.intf.HalSensorConfig;
 import se.hal.intf.HalSensorController;
 import se.hal.intf.HalSensorData;
 import se.hal.plugin.tibber.TibberController;
-import se.hal.struct.devicedata.HumiditySensorData;
+import se.hal.struct.devicedata.CostSensorData;
 
 /**
  * A sensor that calculate current electricity bil
diff --git a/plugins/hal-tibber/src/se/hal/plugin/tibber/device/ElectricityPriceSensor.java b/plugins/hal-tibber/src/se/hal/plugin/tibber/device/ElectricityPriceSensor.java
index 25ff2acd..97b47465 100644
--- a/plugins/hal-tibber/src/se/hal/plugin/tibber/device/ElectricityPriceSensor.java
+++ b/plugins/hal-tibber/src/se/hal/plugin/tibber/device/ElectricityPriceSensor.java
@@ -24,12 +24,11 @@
 
 package se.hal.plugin.tibber.device;
 
-import se.hal.intf.HalDeviceData;
 import se.hal.intf.HalSensorConfig;
 import se.hal.intf.HalSensorController;
 import se.hal.intf.HalSensorData;
-import se.hal.struct.devicedata.HumiditySensorData;
 import se.hal.plugin.tibber.TibberController;
+import se.hal.struct.devicedata.PriceSensorData;
 
 /**
  * A sensor that shows the price of electricity at a specific time
diff --git a/plugins/hal-tibber/src/se/hal/plugin/tibber/device/PowerConsumptionSensor.java b/plugins/hal-tibber/src/se/hal/plugin/tibber/device/PowerConsumptionSensor.java
index ed5dbca8..4786e357 100644
--- a/plugins/hal-tibber/src/se/hal/plugin/tibber/device/PowerConsumptionSensor.java
+++ b/plugins/hal-tibber/src/se/hal/plugin/tibber/device/PowerConsumptionSensor.java
@@ -27,7 +27,7 @@ package se.hal.plugin.tibber.device;
 import se.hal.intf.HalSensorConfig;
 import se.hal.intf.HalSensorController;
 import se.hal.intf.HalSensorData;
-import se.hal.struct.devicedata.TemperatureSensorData;
+import se.hal.struct.devicedata.PowerConsumptionSensorData;
 import se.hal.plugin.tibber.TibberController;
 
 
@@ -51,7 +51,7 @@ public class PowerConsumptionSensor implements HalSensorConfig {
 
     @Override
     public Class<? extends HalSensorData> getDeviceDataClass() {
-        return TemperatureSensorData.class;
+        return PowerConsumptionSensorData.class;
     }
 
     @Override