[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 (file)
index 0000000..dda50f3
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 4367cb484d2542ed38ccc3be64b4071f6b508327..688cf2d48d9146d5e85ce787ec8b83c4bdbccc78 100644 (file)
--- 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 119127a37c5b8e41ea3623e4c259b79bc447d7a5..315e3a44a3d541262c5e0976639b682c13defaed 100644 (file)
--- 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() {