From: Martin H <14805121+martin-hu@users.noreply.github.com>
Date: Sat, 5 Jun 2021 12:45:00 +0000 (+0200)
Subject: [kostalinverter] Added new channels frequency and cosphi (#10779)
X-Git-Url: https://git.basschouten.com/?a=commitdiff_plain;h=7c5f60dae28429d83efd74eae700d0d35b2c795a;p=openhab-addons.git

[kostalinverter] Added new channels frequency and cosphi (#10779)

new channels frequency and power factor.

Signed-off-by: Martin Hubert <github@martin-hubert.de>

Co-authored-by: Martin Hubert <github@martin-hubert.de>
---

diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationBindingConstants.java b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationBindingConstants.java
index d279b706d1..48137200d2 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationBindingConstants.java
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationBindingConstants.java
@@ -80,6 +80,8 @@ public class ThirdGenerationBindingConstants {
     public static final String CHANNEL_DEVICE_LOCAL_LIMIT_EVU_ABSOLUTE = "deviceLocalLimitEVUAbsolute";
     public static final String CHANNEL_DEVICE_LOCAL_LIMIT_EVU_RELATIV = "deviceLocalLimitEVURelativ";
     public static final String CHANNEL_DEVICE_LOCAL_WORKTIME = "deviceLocalWorktime";
+    public static final String CHANNEL_DEVICE_LOCAL_AC_COS_PHI = "deviceLocalACCosPhi";
+    public static final String CHANNEL_DEVICE_LOCAL_AC_FREQUENCY = "deviceLocalACFrequency";
     public static final String CHANNEL_DEVICE_LOCAL_AC_PHASE_1_CURRENT_AMPERAGE = "deviceLocalACPhase1CurrentAmperage";
     public static final String CHANNEL_DEVICE_LOCAL_AC_PHASE_1_CURRENT_POWER = "deviceLocalACPhase1CurrentPower";
     public static final String CHANNEL_DEVICE_LOCAL_AC_PHASE_1_CURRENT_VOLTAGE = "deviceLocalACPhase1CurrentVoltage";
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationChannelDatatypes.java b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationChannelDatatypes.java
index 75b4e023d1..4d426db8cf 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationChannelDatatypes.java
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationChannelDatatypes.java
@@ -26,5 +26,6 @@ enum ThirdGenerationChannelDatatypes {
     WATT,
     AMPERE,
     AMPERE_HOUR,
-    VOLT
+    VOLT,
+    HERTZ
 }
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationHandler.java b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationHandler.java
index b4c16e004f..6104cdd6f5 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationHandler.java
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationHandler.java
@@ -252,6 +252,10 @@ public class ThirdGenerationHandler extends BaseThingHandler {
                 updateState(channeluid, new QuantityType<>(value, Units.VOLT));
                 break;
             }
+            case HERTZ: {
+                updateState(channeluid, new QuantityType<>(value, Units.HERTZ));
+                break;
+            }
             default: {
                 // unknown datatype
                 logger.debug("{} not known!", dataType);
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationMappingInverterToChannel.java b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationMappingInverterToChannel.java
index 3d61b8a39a..715a0855f9 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationMappingInverterToChannel.java
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationMappingInverterToChannel.java
@@ -69,6 +69,10 @@ class ThirdGenerationMappingInverterToChannel {
                 ThirdGenerationChannelDatatypes.PERCEMTAGE);
         addInverterChannel(allInvertersList, CHANNEL_DEVICE_LOCAL_WORKTIME, "devices:local", "WorkTime",
                 ThirdGenerationChannelDatatypes.SECONDS);
+        addInverterChannel(allInvertersList, CHANNEL_DEVICE_LOCAL_AC_COS_PHI, "devices:local:ac", "CosPhi",
+                ThirdGenerationChannelDatatypes.INTEGER);
+        addInverterChannel(allInvertersList, CHANNEL_DEVICE_LOCAL_AC_FREQUENCY, "devices:local:ac", "Frequency",
+                ThirdGenerationChannelDatatypes.HERTZ);
         addInverterChannel(allInvertersList, CHANNEL_DEVICE_LOCAL_AC_PHASE_1_CURRENT_AMPERAGE, "devices:local:ac",
                 "L1_I", ThirdGenerationChannelDatatypes.AMPERE);
         addInverterChannel(allInvertersList, CHANNEL_DEVICE_LOCAL_AC_PHASE_1_CURRENT_POWER, "devices:local:ac", "L1_P",
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/Channels.xml b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/Channels.xml
index 304aa0ebc6..1ab775cb73 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/Channels.xml
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/Channels.xml
@@ -70,6 +70,18 @@
 		<category>Time</category>
 		<state readOnly="true" pattern="%.2f %unit%"/>
 	</channel-type>
+	<channel-type id="device-local-ac-cos-phi">
+		<item-type>Number:Dimensionless</item-type>
+		<label>Cos Phi</label>
+		<description>AC Power Factor</description>
+		<state readOnly="true" pattern="%.2f"/>
+	</channel-type>
+	<channel-type id="device-local-ac-frequency">
+		<item-type>Number:Frequency</item-type>
+		<label>AC Frequency</label>
+		<description>AC Frequency</description>
+		<state readOnly="true" pattern="%.2f %unit%"/>
+	</channel-type>
 	<channel-type id="device-local-ac-phase-1-current-amperage">
 		<item-type>Number:ElectricCurrent</item-type>
 		<label>P1 Amperage</label>
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS100WITHBATTERY.xml b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS100WITHBATTERY.xml
index 7cf7c17ce5..c5c3e7c2ca 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS100WITHBATTERY.xml
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS100WITHBATTERY.xml
@@ -17,6 +17,8 @@
 			<channel id="deviceLocalLimitEVUAbsolute" typeId="device-local-limit-evu-absolute"/>
 			<channel id="deviceLocalLimitEVURelativ" typeId="device-local-limit-evu-relativ"/>
 			<channel id="deviceLocalWorktime" typeId="device-local-worktime"/>
+			<channel id="deviceLocalACCosPhi" typeId="device-local-ac-cos-phi"/>
+			<channel id="deviceLocalACFrequency" typeId="device-local-ac-frequency"/>
 			<channel id="deviceLocalACPhase1CurrentAmperage" typeId="device-local-ac-phase-1-current-amperage"/>
 			<channel id="deviceLocalACPhase1CurrentPower" typeId="device-local-ac-phase-1-current-power"/>
 			<channel id="deviceLocalACPhase1CurrentVoltage" typeId="device-local-ac-phase-1-current-voltage"/>
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS100WITHOUTBATTERY.xml b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS100WITHOUTBATTERY.xml
index 8db1d98e5b..0a322e48ce 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS100WITHOUTBATTERY.xml
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS100WITHOUTBATTERY.xml
@@ -16,6 +16,8 @@
 			<channel id="deviceLocalLimitEVUAbsolute" typeId="device-local-limit-evu-absolute"/>
 			<channel id="deviceLocalLimitEVURelativ" typeId="device-local-limit-evu-relativ"/>
 			<channel id="deviceLocalWorktime" typeId="device-local-worktime"/>
+			<channel id="deviceLocalACCosPhi" typeId="device-local-ac-cos-phi"/>
+			<channel id="deviceLocalACFrequency" typeId="device-local-ac-frequency"/>
 			<channel id="deviceLocalACPhase1CurrentAmperage" typeId="device-local-ac-phase-1-current-amperage"/>
 			<channel id="deviceLocalACPhase1CurrentPower" typeId="device-local-ac-phase-1-current-power"/>
 			<channel id="deviceLocalACPhase1CurrentVoltage" typeId="device-local-ac-phase-1-current-voltage"/>
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS42WITHBATTERY.xml b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS42WITHBATTERY.xml
index 1f100e851a..0f1cea8ad7 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS42WITHBATTERY.xml
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS42WITHBATTERY.xml
@@ -17,6 +17,8 @@
 			<channel id="deviceLocalLimitEVUAbsolute" typeId="device-local-limit-evu-absolute"/>
 			<channel id="deviceLocalLimitEVURelativ" typeId="device-local-limit-evu-relativ"/>
 			<channel id="deviceLocalWorktime" typeId="device-local-worktime"/>
+			<channel id="deviceLocalACCosPhi" typeId="device-local-ac-cos-phi"/>
+			<channel id="deviceLocalACFrequency" typeId="device-local-ac-frequency"/>
 			<channel id="deviceLocalACPhase1CurrentAmperage" typeId="device-local-ac-phase-1-current-amperage"/>
 			<channel id="deviceLocalACPhase1CurrentPower" typeId="device-local-ac-phase-1-current-power"/>
 			<channel id="deviceLocalACPhase1CurrentVoltage" typeId="device-local-ac-phase-1-current-voltage"/>
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS42WITHOUTBATTERY.xml b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS42WITHOUTBATTERY.xml
index dfcd4d0da6..728d51974a 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS42WITHOUTBATTERY.xml
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS42WITHOUTBATTERY.xml
@@ -16,6 +16,8 @@
 			<channel id="deviceLocalLimitEVUAbsolute" typeId="device-local-limit-evu-absolute"/>
 			<channel id="deviceLocalLimitEVURelativ" typeId="device-local-limit-evu-relativ"/>
 			<channel id="deviceLocalWorktime" typeId="device-local-worktime"/>
+			<channel id="deviceLocalACCosPhi" typeId="device-local-ac-cos-phi"/>
+			<channel id="deviceLocalACFrequency" typeId="device-local-ac-frequency"/>
 			<channel id="deviceLocalACPhase1CurrentAmperage" typeId="device-local-ac-phase-1-current-amperage"/>
 			<channel id="deviceLocalACPhase1CurrentPower" typeId="device-local-ac-phase-1-current-power"/>
 			<channel id="deviceLocalACPhase1CurrentVoltage" typeId="device-local-ac-phase-1-current-voltage"/>
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS55WITHBATTERY.xml b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS55WITHBATTERY.xml
index 2860434b59..964caeb673 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS55WITHBATTERY.xml
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS55WITHBATTERY.xml
@@ -17,6 +17,8 @@
 			<channel id="deviceLocalLimitEVUAbsolute" typeId="device-local-limit-evu-absolute"/>
 			<channel id="deviceLocalLimitEVURelativ" typeId="device-local-limit-evu-relativ"/>
 			<channel id="deviceLocalWorktime" typeId="device-local-worktime"/>
+			<channel id="deviceLocalACCosPhi" typeId="device-local-ac-cos-phi"/>
+			<channel id="deviceLocalACFrequency" typeId="device-local-ac-frequency"/>
 			<channel id="deviceLocalACPhase1CurrentAmperage" typeId="device-local-ac-phase-1-current-amperage"/>
 			<channel id="deviceLocalACPhase1CurrentPower" typeId="device-local-ac-phase-1-current-power"/>
 			<channel id="deviceLocalACPhase1CurrentVoltage" typeId="device-local-ac-phase-1-current-voltage"/>
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS55WITHOUTBATTERY.xml b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS55WITHOUTBATTERY.xml
index e9208610be..fe52d83a54 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS55WITHOUTBATTERY.xml
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS55WITHOUTBATTERY.xml
@@ -16,6 +16,8 @@
 			<channel id="deviceLocalLimitEVUAbsolute" typeId="device-local-limit-evu-absolute"/>
 			<channel id="deviceLocalLimitEVURelativ" typeId="device-local-limit-evu-relativ"/>
 			<channel id="deviceLocalWorktime" typeId="device-local-worktime"/>
+			<channel id="deviceLocalACCosPhi" typeId="device-local-ac-cos-phi"/>
+			<channel id="deviceLocalACFrequency" typeId="device-local-ac-frequency"/>
 			<channel id="deviceLocalACPhase1CurrentAmperage" typeId="device-local-ac-phase-1-current-amperage"/>
 			<channel id="deviceLocalACPhase1CurrentPower" typeId="device-local-ac-phase-1-current-power"/>
 			<channel id="deviceLocalACPhase1CurrentVoltage" typeId="device-local-ac-phase-1-current-voltage"/>
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS70WITHBATTERY.xml b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS70WITHBATTERY.xml
index 4e99f23016..0772a5741b 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS70WITHBATTERY.xml
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS70WITHBATTERY.xml
@@ -17,6 +17,8 @@
 			<channel id="deviceLocalLimitEVUAbsolute" typeId="device-local-limit-evu-absolute"/>
 			<channel id="deviceLocalLimitEVURelativ" typeId="device-local-limit-evu-relativ"/>
 			<channel id="deviceLocalWorktime" typeId="device-local-worktime"/>
+			<channel id="deviceLocalACCosPhi" typeId="device-local-ac-cos-phi"/>
+			<channel id="deviceLocalACFrequency" typeId="device-local-ac-frequency"/>
 			<channel id="deviceLocalACPhase1CurrentAmperage" typeId="device-local-ac-phase-1-current-amperage"/>
 			<channel id="deviceLocalACPhase1CurrentPower" typeId="device-local-ac-phase-1-current-power"/>
 			<channel id="deviceLocalACPhase1CurrentVoltage" typeId="device-local-ac-phase-1-current-voltage"/>
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS70WITHOUTBATTERY.xml b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS70WITHOUTBATTERY.xml
index 524cb7d385..5b72df2952 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS70WITHOUTBATTERY.xml
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS70WITHOUTBATTERY.xml
@@ -16,6 +16,8 @@
 			<channel id="deviceLocalLimitEVUAbsolute" typeId="device-local-limit-evu-absolute"/>
 			<channel id="deviceLocalLimitEVURelativ" typeId="device-local-limit-evu-relativ"/>
 			<channel id="deviceLocalWorktime" typeId="device-local-worktime"/>
+			<channel id="deviceLocalACCosPhi" typeId="device-local-ac-cos-phi"/>
+			<channel id="deviceLocalACFrequency" typeId="device-local-ac-frequency"/>
 			<channel id="deviceLocalACPhase1CurrentAmperage" typeId="device-local-ac-phase-1-current-amperage"/>
 			<channel id="deviceLocalACPhase1CurrentPower" typeId="device-local-ac-phase-1-current-power"/>
 			<channel id="deviceLocalACPhase1CurrentVoltage" typeId="device-local-ac-phase-1-current-voltage"/>
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS85WITHBATTERY.xml b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS85WITHBATTERY.xml
index c7050564bc..66945893b2 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS85WITHBATTERY.xml
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS85WITHBATTERY.xml
@@ -17,6 +17,8 @@
 			<channel id="deviceLocalLimitEVUAbsolute" typeId="device-local-limit-evu-absolute"/>
 			<channel id="deviceLocalLimitEVURelativ" typeId="device-local-limit-evu-relativ"/>
 			<channel id="deviceLocalWorktime" typeId="device-local-worktime"/>
+			<channel id="deviceLocalACCosPhi" typeId="device-local-ac-cos-phi"/>
+			<channel id="deviceLocalACFrequency" typeId="device-local-ac-frequency"/>
 			<channel id="deviceLocalACPhase1CurrentAmperage" typeId="device-local-ac-phase-1-current-amperage"/>
 			<channel id="deviceLocalACPhase1CurrentPower" typeId="device-local-ac-phase-1-current-power"/>
 			<channel id="deviceLocalACPhase1CurrentVoltage" typeId="device-local-ac-phase-1-current-voltage"/>
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS85WITHOUTBATTERY.xml b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS85WITHOUTBATTERY.xml
index 9df186e33b..1139334ac2 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS85WITHOUTBATTERY.xml
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/thing/PLENTICOREPLUS85WITHOUTBATTERY.xml
@@ -16,6 +16,8 @@
 			<channel id="deviceLocalLimitEVUAbsolute" typeId="device-local-limit-evu-absolute"/>
 			<channel id="deviceLocalLimitEVURelativ" typeId="device-local-limit-evu-relativ"/>
 			<channel id="deviceLocalWorktime" typeId="device-local-worktime"/>
+			<channel id="deviceLocalACCosPhi" typeId="device-local-ac-cos-phi"/>
+			<channel id="deviceLocalACFrequency" typeId="device-local-ac-frequency"/>
 			<channel id="deviceLocalACPhase1CurrentAmperage" typeId="device-local-ac-phase-1-current-amperage"/>
 			<channel id="deviceLocalACPhase1CurrentPower" typeId="device-local-ac-phase-1-current-power"/>
 			<channel id="deviceLocalACPhase1CurrentVoltage" typeId="device-local-ac-phase-1-current-voltage"/>