From 888f4388a31b38ba3214c3920484b2fc4ea97f89 Mon Sep 17 00:00:00 2001
From: Tim <tim@fruit-lab.de>
Date: Fri, 3 Nov 2023 21:29:39 +0100
Subject: [PATCH] [sonnen] Fix channel types, Energy should be Power (#15384)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also adapt the documentation and drop the batteryFeedIn in the documentation
which is not part of the binding.

Fix #15365

Signed-off-by: Tim Lochmüller <tim@fruit-lab.de>
---
 bundles/org.openhab.binding.sonnen/README.md  | 14 ++++++-------
 .../resources/OH-INF/thing/thing-types.xml    | 14 ++++++-------
 .../resources/OH-INF/update/instructions.xml  | 21 +++++++++++++++++++
 3 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/bundles/org.openhab.binding.sonnen/README.md b/bundles/org.openhab.binding.sonnen/README.md
index 90b0156f96f..0388a5cf1a5 100644
--- a/bundles/org.openhab.binding.sonnen/README.md
+++ b/bundles/org.openhab.binding.sonnen/README.md
@@ -23,15 +23,13 @@ The following channels are yet supported:
 | Channel                        | Type          | Access | Description                                                                             |
 | ------------------------------ | ------------- | ------ | --------------------------------------------------------------------------------------- |
 | batteryChargingState           | Switch        | read   | Indicates if the Battery is charging at that moment                                     |
-| batteryCharging                | Number:Energy | read   | Indicates the actual current charging the Battery. Otherwise 0.                         |
+| batteryCharging                | Number:Power  | read   | Indicates the actual current charging the Battery. Otherwise 0.                         |
 | batteryDischargingState        | Switch        | read   | Indicates if the Battery is discharging at that moment                                  |
-| batteryDischarging             | Number:Energy | read   | Indicates the actual current discharging the Battery. Otherwise 0.                      |
-| batteryFeedIn                  | Number:Energy | read   | Indicates the actual charging current of the Battery in watt                            |
-| batteryDischarging             | Number:Energy | read   | Indicates the actual current discharging the Battery in watt                            |
-| consumption                    | Number:Energy | read   | Indicates the actual consumption of the consumer in watt                                |
-| gridFeedIn                     | Number:Energy | read   | Indicates the actual current feeding to the Grid in watt.0 if nothing is feeded         |
-| gridConsumption                | Number:Energy | read   | Indicates the actual current consumption from the Grid in watt.0 if nothing is received |
-| solarProduction                | Number:Energy | read   | Indicates the actual production of the Solar system in watt                             |
+| batteryDischarging             | Number:Power  | read   | Indicates the actual current discharging the Battery. Otherwise 0.                      |
+| consumption                    | Number:Power  | read   | Indicates the actual consumption of the consumer in watt                                |
+| gridFeedIn                     | Number:Power  | read   | Indicates the actual current feeding to the Grid in watt.0 if nothing is feeded         |
+| gridConsumption                | Number:Power  | read   | Indicates the actual current consumption from the Grid in watt.0 if nothing is received |
+| solarProduction                | Number:Power  | read   | Indicates the actual production of the Solar system in watt                             |
 | batteryLevel                   | Number        | read   | Indicates the actual Battery Level in % from 0 - 100                                    |
 | flowConsumptionBatteryState    | Switch        | read   | Indicates if there is a current flow from Battery towards Consumption                   |
 | flowConsumptionGridState       | Switch        | read   | Indicates if there is a current flow from Grid towards Consumption                      |
diff --git a/bundles/org.openhab.binding.sonnen/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.sonnen/src/main/resources/OH-INF/thing/thing-types.xml
index 705804c2050..e4568359198 100644
--- a/bundles/org.openhab.binding.sonnen/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.sonnen/src/main/resources/OH-INF/thing/thing-types.xml
@@ -32,7 +32,7 @@
 		</channels>
 		<properties>
 			<property name="vendor">sonnen</property>
-			<property name="thingTypeVersion">1</property>
+			<property name="thingTypeVersion">2</property>
 		</properties>
 
 		<config-description>
@@ -71,37 +71,37 @@
 		<state readOnly="true"/>
 	</channel-type>
 	<channel-type id="batteryCharging">
-		<item-type>Number:Energy</item-type>
+		<item-type>Number:Power</item-type>
 		<label>Battery Charging</label>
 		<description>Indicates the actual current charging the Battery. Otherwise 0.</description>
 		<state readOnly="true" pattern="%.0f %unit%"/>
 	</channel-type>
 	<channel-type id="batteryDischarging">
-		<item-type>Number:Energy</item-type>
+		<item-type>Number:Power</item-type>
 		<label>Battery Discharging</label>
 		<description>Indicates the actual current discharging the Battery. Otherwise 0.</description>
 		<state readOnly="true" pattern="%.0f %unit%"/>
 	</channel-type>
 	<channel-type id="consumption">
-		<item-type>Number:Energy</item-type>
+		<item-type>Number:Power</item-type>
 		<label>Consumption</label>
 		<description>Indicates the actual consumption of the House.</description>
 		<state readOnly="true" pattern="%.0f %unit%"/>
 	</channel-type>
 	<channel-type id="gridFeedIn">
-		<item-type>Number:Energy</item-type>
+		<item-type>Number:Power</item-type>
 		<label>Grid Feed In</label>
 		<description>Indicates the actual current feeding to the Grid. Otherwise 0.</description>
 		<state readOnly="true" pattern="%.0f %unit%"/>
 	</channel-type>
 	<channel-type id="gridConsumption">
-		<item-type>Number:Energy</item-type>
+		<item-type>Number:Power</item-type>
 		<label>Grid Consumption</label>
 		<description>Indicates the actual current consumption from the the Grid. Otherwise 0.</description>
 		<state readOnly="true" pattern="%.0f %unit%"/>
 	</channel-type>
 	<channel-type id="solarProduction">
-		<item-type>Number:Energy</item-type>
+		<item-type>Number:Power</item-type>
 		<label>Solar Production</label>
 		<description>Indicates the actual production of the Solar system.</description>
 		<state readOnly="true" pattern="%.0f %unit%"/>
diff --git a/bundles/org.openhab.binding.sonnen/src/main/resources/OH-INF/update/instructions.xml b/bundles/org.openhab.binding.sonnen/src/main/resources/OH-INF/update/instructions.xml
index 61699a648f5..2412b9a02bb 100644
--- a/bundles/org.openhab.binding.sonnen/src/main/resources/OH-INF/update/instructions.xml
+++ b/bundles/org.openhab.binding.sonnen/src/main/resources/OH-INF/update/instructions.xml
@@ -19,5 +19,26 @@
 				<type>sonnen:energyExportedStateConsumption</type>
 			</add-channel>
 		</instruction-set>
+
+		<instruction-set targetVersion="2">
+			<update-channel id="batteryCharging">
+				<type>sonnen:batteryCharging</type>
+			</update-channel>
+			<update-channel id="batteryDischarging">
+				<type>sonnen:batteryDischarging</type>
+			</update-channel>
+			<update-channel id="consumption">
+				<type>sonnen:consumption</type>
+			</update-channel>
+			<update-channel id="gridFeedIn">
+				<type>sonnen:gridFeedIn</type>
+			</update-channel>
+			<update-channel id="gridConsumption">
+				<type>sonnen:gridConsumption</type>
+			</update-channel>
+			<update-channel id="solarProduction">
+				<type>sonnen:solarProduction</type>
+			</update-channel>
+		</instruction-set>
 	</thing-type>
 </update:update-descriptions>