From: peter-schaeffer <120140346+peter-schaeffer@users.noreply.github.com>
Date: Fri, 16 Feb 2024 08:50:57 +0000 (+0100)
Subject: [solarmax] Improve binding with respect to channel Current Power Generated (#16397)
X-Git-Url: https://git.basschouten.com/?a=commitdiff_plain;h=6b532388b241827e660fba5cff0801ae83f07639;p=openhab-addons.git

[solarmax] Improve binding with respect to channel Current Power Generated (#16397)

Modified units for CHANNEL_CURRENT_POWER GENERATED to Units.WATT (was: Units.WATT_HOURS)

Signed-off-by: peter-schaeffer <120140346+peter-schaeffer@users.noreply.github.com>
---

diff --git a/bundles/org.openhab.binding.solarmax/MaxComm_Protokollbeschreibung_DE.pdf b/bundles/org.openhab.binding.solarmax/MaxComm_Protokollbeschreibung_DE.pdf
new file mode 100644
index 0000000000..dda50f3870
Binary files /dev/null and b/bundles/org.openhab.binding.solarmax/MaxComm_Protokollbeschreibung_DE.pdf differ
diff --git a/bundles/org.openhab.binding.solarmax/src/main/java/org/openhab/binding/solarmax/internal/SolarMaxChannel.java b/bundles/org.openhab.binding.solarmax/src/main/java/org/openhab/binding/solarmax/internal/SolarMaxChannel.java
index 4367cb484d..688cf2d48d 100644
--- a/bundles/org.openhab.binding.solarmax/src/main/java/org/openhab/binding/solarmax/internal/SolarMaxChannel.java
+++ b/bundles/org.openhab.binding.solarmax/src/main/java/org/openhab/binding/solarmax/internal/SolarMaxChannel.java
@@ -42,7 +42,7 @@ public enum SolarMaxChannel {
     CHANNEL_ENERGY_GENERATED_LAST_YEAR(SolarMaxCommandKey.energyGeneratedLastYear.name(), Units.WATT_HOUR),
     CHANNEL_ENERGY_GENERATED_THIS_MONTH(SolarMaxCommandKey.energyGeneratedThisMonth.name(), Units.WATT_HOUR),
     CHANNEL_ENERGY_GENERATED_THIS_YEAR(SolarMaxCommandKey.energyGeneratedThisYear.name(), Units.WATT_HOUR),
-    CHANNEL_CURRENT_POWER_GENERATED(SolarMaxCommandKey.currentPowerGenerated.name(), Units.WATT_HOUR),
+    CHANNEL_CURRENT_POWER_GENERATED(SolarMaxCommandKey.currentPowerGenerated.name(), Units.WATT),
     CHANNEL_AC_FREQUENCY(SolarMaxCommandKey.acFrequency.name(), Units.HERTZ),
     CHANNEL_AC_PHASE1_VOLTAGE(SolarMaxCommandKey.acPhase1Voltage.name(), Units.VOLT),
     CHANNEL_AC_PHASE2_VOLTAGE(SolarMaxCommandKey.acPhase2Voltage.name(), Units.VOLT),
diff --git a/bundles/org.openhab.binding.solarmax/src/main/java/org/openhab/binding/solarmax/internal/connector/SolarMaxData.java b/bundles/org.openhab.binding.solarmax/src/main/java/org/openhab/binding/solarmax/internal/connector/SolarMaxData.java
index 119127a37c..315e3a44a3 100644
--- a/bundles/org.openhab.binding.solarmax/src/main/java/org/openhab/binding/solarmax/internal/connector/SolarMaxData.java
+++ b/bundles/org.openhab.binding.solarmax/src/main/java/org/openhab/binding/solarmax/internal/connector/SolarMaxData.java
@@ -182,7 +182,7 @@ public class SolarMaxData {
     }
 
     public Number getCurrentPowerGenerated() {
-        return getIntegerValueFrom(SolarMaxCommandKey.currentPowerGenerated, 0.5);
+        return getDecimalValueFrom(SolarMaxCommandKey.currentPowerGenerated, 0.5);
     }
 
     Number getAcFrequency() {