change soc to double plus other tweaks

Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>

Author: jimtng

bundles/org.openhab.binding.fronius/README.md

@@ -202,7 +202,7 @@ var froniusInverterActions = actions.thingActions('fronius', 'fronius:powerinver
 
 ::: tab JRuby
 
-In JRuby, the action methods are attached to the the Thing object.
+In JRuby, the action methods are attached to the Thing object.
 
 ```rb
 my_inverter = things["fronius:powerinverter:mybridge:myinverter"]
@@ -278,7 +278,7 @@ froniusInverterActions.setBackupReservedBatteryCapacity(50);
 
 :::
 
-::: JRuby
+::: tab JRuby
 
 ```rb
 inverter = things["fronius:powerinverter:mybridge:myinverter"]

bundles/org.openhab.binding.fronius/src/main/java/org/openhab/binding/fronius/internal/FroniusBindingConstants.java

@@ -98,7 +98,7 @@ public class FroniusBindingConstants {
     public static final String OHMPILOT_ERROR_CODE = "errorcode";
     public static final String OHMPILOT_STATE_CODE = "statecode";
 
-    // Battery channels (map to Storage Controller fields)
+    // Battery channels
     public static final String BATTERY_CAPACITY_MAXIMUM = "maximumCapacity";
     public static final String BATTERY_DESIGNED_CAPACITY = "designedCapacity";
     public static final String BATTERY_CURRENT_DC = "currentDc";

bundles/org.openhab.binding.fronius/src/main/java/org/openhab/binding/fronius/internal/api/dto/storage/StorageController.java

@@ -12,6 +12,8 @@
  */
 package org.openhab.binding.fronius.internal.api.dto.storage;
 
+import org.eclipse.jdt.annotation.Nullable;
+
 import com.google.gson.annotations.SerializedName;
 
 /**
@@ -37,7 +39,7 @@ public class StorageController {
     private int enable;
 
     @SerializedName("StateOfCharge_Relative")
-    private int stateOfChargeRelative;
+    private double stateOfChargeRelative;
 
     @SerializedName("Status_BatteryCell")
     private int statusBatteryCell;
@@ -63,18 +65,15 @@ public double getDesignedCapacity() {
         return designedCapacity;
     }
 
-    public StorageDetails getDetails() {
-        if (details == null) {
-            details = new StorageDetails();
-        }
+    public @Nullable StorageDetails getDetails() {
         return details;
     }
 
     public int getEnable() {
         return enable;
     }
 
-    public int getStateOfChargeRelative() {
+    public double getStateOfChargeRelative() {
         return stateOfChargeRelative;
     }
 

bundles/org.openhab.binding.fronius/src/main/resources/OH-INF/thing/thing-types.xml

@@ -57,7 +57,7 @@
 		</config-description>
 	</thing-type>
 
-	<!-- Battery Thing Type (maps to Storage Controller fields) -->
+	<!-- Battery Thing Type -->
 	<thing-type id="battery">
 		<supported-bridge-type-refs>
 			<bridge-type-ref id="bridge"/>
@@ -465,11 +465,15 @@
 		<state pattern="%.1f %%" readOnly="true"></state>
 	</channel-type>
 
-	<!-- Battery specific channel-types (map to Storage Controller fields) -->
+	<!-- Battery specific channel-types -->
 	<channel-type id="batteryMaximumCapacity">
 		<item-type>Number:Energy</item-type>
 		<label>Current Maximum Battery Capacity</label>
 		<description>Current maximum battery capacity in Wh</description>
+    <tags>
+      <tag>Measurement</tag>
+      <tag>Energy</tag>
+    </tags>
 		<state pattern="%.0f Wh" readOnly="true"></state>
 	</channel-type>
 	<channel-type id="batteryDesignedCapacity">
@@ -484,14 +488,18 @@
 		<description>Current state of charge of the battery in percent</description>
 		<tags>
 			<tag>Status</tag>
-			<tag>Power</tag>
+			<tag>StateOfCharge</tag>
 		</tags>
 		<state pattern="%.1f %%" readOnly="true"></state>
 	</channel-type>
 	<channel-type id="batteryTemperature">
 		<item-type>Number:Temperature</item-type>
 		<label>Battery Cell Temperature</label>
 		<description>Temperature of the battery cell</description>
+    <tags>
+      <tag>Measurement</tag>
+      <tag>Temperature</tag>
+    </tags>
 		<state pattern="%.2f %unit%" readOnly="true"></state>
 	</channel-type>
 	<channel-type id="batteryTimestamp">
@@ -506,7 +514,6 @@
 		<description>Status code coming from Status_BatteryCell</description>
 		<state pattern="%d" readOnly="true"></state>
 	</channel-type>
-
 	<channel-type id="batteryEnable">
 		<item-type>Number</item-type>
 		<label>Battery Enabled</label>