[evcc] Adjust to evcc version 0.123.1 (openhab#16114)

* updated url of setTargetEnergy and setTargetSoC to match evcc version 0.123.1
* removed minSoc from Loadpoint (since evcc 0.123.0 part of vehicle)
* renamed from targetEnergy to limitEnergy to match new evcc version
* renamed from targetSoC to limitSoC to match new evcc version
* plementation of vehicle object to match new evcc version 0.123.1 -> new implementation of minSoC and plans (served by new api)

Signed-off-by: Luca Arnecke <[email protected]>
Signed-off-by: Florian Hotze <[email protected]>
Signed-off-by: Michael Weger <[email protected]>
Co-authored-by: Florian Hotze <[email protected]>
Co-authored-by: Michael Weger <[email protected]>
(cherry picked from commit b316096)

Author: 3 people

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

@@ -21,19 +21,27 @@
  * used across the whole binding.
  *
  * @author Florian Hotze - Initial contribution
+ * @author Luca Arnecke - Update to evcc version 0.123.1
  */
 @NonNullByDefault
 public class EvccBindingConstants {
 
     private static final String BINDING_ID = "evcc";
 
     public static final String CHANNEL_GROUP_ID_GENERAL = "general";
+    public static final String CHANNEL_GROUP_ID_LOADPOINT = "loadpoint";
+    public static final String CHANNEL_GROUP_ID_VEHICLE = "vehicle";
 
     // List of all Channel ids
     public static final String CHANNEL_BATTERY_CAPACITY = "batteryCapacity";
     public static final String CHANNEL_BATTERY_POWER = "batteryPower";
     public static final String CHANNEL_BATTERY_SOC = "batterySoC";
-    public static final String CHANNEL_BATTERY_PRIORITY_SOC = "batteryPrioritySoC";
+    public static final String CHANNEL_BATTERY_DISCHARGE_CONTROL = "batteryDischargeControl";
+    public static final String CHANNEL_BATTERY_MODE = "batteryMode";
+    public static final String CHANNEL_PRIORITY_SOC = "prioritySoC";
+    public static final String CHANNEL_BUFFER_SOC = "bufferSoC";
+    public static final String CHANNEL_BUFFER_START_SOC = "bufferStartSoC";
+    public static final String CHANNEL_RESIDUAL_POWER = "residualPower";
     public static final String CHANNEL_GRID_POWER = "gridPower";
     public static final String CHANNEL_HOME_POWER = "homePower";
     public static final String CHANNEL_PV_POWER = "pvPower";
@@ -47,27 +55,26 @@ public class EvccBindingConstants {
     public static final String CHANNEL_LOADPOINT_CHARGING = "charging";
     public static final String CHANNEL_LOADPOINT_CONNECTED = "vehicleConnected";
     public static final String CHANNEL_LOADPOINT_CONNECTED_DURATION = "vehicleConnectedDuration";
-    public static final String CHANNEL_LOADPOINT_HAS_VEHICLE = "hasVehicle";
     public static final String CHANNEL_LOADPOINT_ENABLED = "enabled";
     public static final String CHANNEL_LOADPOINT_MAX_CURRENT = "maxCurrent";
     public static final String CHANNEL_LOADPOINT_MIN_CURRENT = "minCurrent";
-    public static final String CHANNEL_LOADPOINT_MIN_SOC = "minSoC";
     public static final String CHANNEL_LOADPOINT_MODE = "mode";
     public static final String CHANNEL_LOADPOINT_PHASES = "phases";
-    public static final String CHANNEL_LOADPOINT_TARGET_ENERGY = "targetEnergy";
-    public static final String CHANNEL_LOADPOINT_TARGET_SOC = "targetSoC";
-    public static final String CHANNEL_LOADPOINT_TARGET_TIME = "targetTime";
-    /**
-     * Whether a target time is set on loadpoint.
-     */
-    public static final String CHANNEL_LOADPOINT_TARGET_TIME_ENABLED = "targetTimeEnabled";
+    public static final String CHANNEL_LOADPOINT_LIMIT_ENERGY = "limitEnergy";
+    public static final String CHANNEL_LOADPOINT_LIMIT_SOC = "limitSoC";
     public static final String CHANNEL_LOADPOINT_TITLE = "title";
     public static final String CHANNEL_LOADPOINT_VEHICLE_CAPACITY = "vehicleCapacity";
     public static final String CHANNEL_LOADPOINT_VEHICLE_ODOMETER = "vehicleOdometer";
     public static final String CHANNEL_LOADPOINT_VEHICLE_PRESENT = "vehiclePresent";
     public static final String CHANNEL_LOADPOINT_VEHICLE_RANGE = "vehicleRange";
     public static final String CHANNEL_LOADPOINT_VEHICLE_SOC = "vehicleSoC";
-    public static final String CHANNEL_LOADPOINT_VEHICLE_TITLE = "vehicleTitle";
+    public static final String CHANNEL_LOADPOINT_VEHICLE_NAME = "vehicleName";
+    public static final String CHANNEL_VEHICLE_TITLE = "vehicleTitle";
+    public static final String CHANNEL_VEHICLE_MIN_SOC = "vehicleMinSoC";
+    public static final String CHANNEL_VEHICLE_LIMIT_SOC = "vehicleLimitSoC";
+    public static final String CHANNEL_VEHICLE_PLAN_ENABLED = "vehiclePlanEnabled";
+    public static final String CHANNEL_VEHICLE_PLAN_SOC = "vehiclePlanSoC";
+    public static final String CHANNEL_VEHICLE_PLAN_TIME = "vehiclePlanTime";
 
     // List of all Thing Type UIDs
     public static final ThingTypeUID THING_TYPE_DEVICE = new ThingTypeUID(BINDING_ID, "device");
@@ -79,8 +86,17 @@ public class EvccBindingConstants {
             CHANNEL_BATTERY_POWER);
     public static final ChannelTypeUID CHANNEL_TYPE_UID_BATTERY_SOC = new ChannelTypeUID(BINDING_ID,
             CHANNEL_BATTERY_SOC);
-    public static final ChannelTypeUID CHANNEL_TYPE_UID_BATTERY_PRIORITY_SOC = new ChannelTypeUID(BINDING_ID,
-            CHANNEL_BATTERY_PRIORITY_SOC);
+    public static final ChannelTypeUID CHANNEL_TYPE_UID_BATTERY_DISCHARGE_CONTROL = new ChannelTypeUID(BINDING_ID,
+            CHANNEL_BATTERY_DISCHARGE_CONTROL);
+    public static final ChannelTypeUID CHANNEL_TYPE_UID_BATTERY_MODE = new ChannelTypeUID(BINDING_ID,
+            CHANNEL_BATTERY_MODE);
+    public static final ChannelTypeUID CHANNEL_TYPE_UID_PRIORITY_SOC = new ChannelTypeUID(BINDING_ID,
+            CHANNEL_PRIORITY_SOC);
+    public static final ChannelTypeUID CHANNEL_TYPE_UID_BUFFER_SOC = new ChannelTypeUID(BINDING_ID, CHANNEL_BUFFER_SOC);
+    public static final ChannelTypeUID CHANNEL_TYPE_UID_BUFFER_START_SOC = new ChannelTypeUID(BINDING_ID,
+            CHANNEL_BUFFER_START_SOC);
+    public static final ChannelTypeUID CHANNEL_TYPE_UID_RESIDUAL_POWER = new ChannelTypeUID(BINDING_ID,
+            CHANNEL_RESIDUAL_POWER);
     public static final ChannelTypeUID CHANNEL_TYPE_UID_GRID_POWER = new ChannelTypeUID(BINDING_ID, CHANNEL_GRID_POWER);
     public static final ChannelTypeUID CHANNEL_TYPE_UID_HOME_POWER = new ChannelTypeUID(BINDING_ID, CHANNEL_HOME_POWER);
     public static final ChannelTypeUID CHANNEL_TYPE_UID_PV_POWER = new ChannelTypeUID(BINDING_ID, CHANNEL_PV_POWER);
@@ -110,20 +126,14 @@ public class EvccBindingConstants {
             CHANNEL_LOADPOINT_MAX_CURRENT);
     public static final ChannelTypeUID CHANNEL_TYPE_UID_LOADPOINT_MIN_CURRENT = new ChannelTypeUID(BINDING_ID,
             CHANNEL_LOADPOINT_MIN_CURRENT);
-    public static final ChannelTypeUID CHANNEL_TYPE_UID_LOADPOINT_MIN_SOC = new ChannelTypeUID(BINDING_ID,
-            CHANNEL_LOADPOINT_MIN_SOC);
     public static final ChannelTypeUID CHANNEL_TYPE_UID_LOADPOINT_MODE = new ChannelTypeUID(BINDING_ID,
             CHANNEL_LOADPOINT_MODE);
     public static final ChannelTypeUID CHANNEL_TYPE_UID_LOADPOINT_PHASES = new ChannelTypeUID(BINDING_ID,
             CHANNEL_LOADPOINT_PHASES);
-    public static final ChannelTypeUID CHANNEL_TYPE_UID_LOADPOINT_TARGET_ENERGY = new ChannelTypeUID(BINDING_ID,
-            CHANNEL_LOADPOINT_TARGET_ENERGY);
-    public static final ChannelTypeUID CHANNEL_TYPE_UID_LOADPOINT_TARGET_SOC = new ChannelTypeUID(BINDING_ID,
-            CHANNEL_LOADPOINT_TARGET_SOC);
-    public static final ChannelTypeUID CHANNEL_TYPE_UID_LOADPOINT_TARGET_TIME = new ChannelTypeUID(BINDING_ID,
-            CHANNEL_LOADPOINT_TARGET_TIME);
-    public static final ChannelTypeUID CHANNEL_TYPE_UID_LOADPOINT_TARGET_TIME_ENABLED = new ChannelTypeUID(BINDING_ID,
-            CHANNEL_LOADPOINT_TARGET_TIME_ENABLED);
+    public static final ChannelTypeUID CHANNEL_TYPE_UID_LOADPOINT_LIMIT_ENERGY = new ChannelTypeUID(BINDING_ID,
+            CHANNEL_LOADPOINT_LIMIT_ENERGY);
+    public static final ChannelTypeUID CHANNEL_TYPE_UID_LOADPOINT_LIMIT_SOC = new ChannelTypeUID(BINDING_ID,
+            CHANNEL_LOADPOINT_LIMIT_SOC);
     public static final ChannelTypeUID CHANNEL_TYPE_UID_LOADPOINT_TITLE = new ChannelTypeUID(BINDING_ID,
             CHANNEL_LOADPOINT_TITLE);
     public static final ChannelTypeUID CHANNEL_TYPE_UID_LOADPOINT_VEHICLE_CAPACITY = new ChannelTypeUID(BINDING_ID,
@@ -136,8 +146,20 @@ public class EvccBindingConstants {
             CHANNEL_LOADPOINT_VEHICLE_RANGE);
     public static final ChannelTypeUID CHANNEL_TYPE_UID_LOADPOINT_VEHICLE_SOC = new ChannelTypeUID(BINDING_ID,
             CHANNEL_LOADPOINT_VEHICLE_SOC);
-    public static final ChannelTypeUID CHANNEL_TYPE_UID_LOADPOINT_VEHICLE_TITLE = new ChannelTypeUID(BINDING_ID,
-            CHANNEL_LOADPOINT_VEHICLE_TITLE);
+    public static final ChannelTypeUID CHANNEL_TYPE_UID_LOADPOINT_VEHICLE_NAME = new ChannelTypeUID(BINDING_ID,
+            CHANNEL_LOADPOINT_VEHICLE_NAME);
+    public static final ChannelTypeUID CHANNEL_TYPE_UID_VEHICLE_TITLE = new ChannelTypeUID(BINDING_ID,
+            CHANNEL_VEHICLE_TITLE);
+    public static final ChannelTypeUID CHANNEL_TYPE_UID_VEHICLE_MIN_SOC = new ChannelTypeUID(BINDING_ID,
+            CHANNEL_VEHICLE_MIN_SOC);
+    public static final ChannelTypeUID CHANNEL_TYPE_UID_VEHICLE_LIMIT_SOC = new ChannelTypeUID(BINDING_ID,
+            CHANNEL_VEHICLE_LIMIT_SOC);
+    public static final ChannelTypeUID CHANNEL_TYPE_UID_VEHICLE_PLAN_ENABLED = new ChannelTypeUID(BINDING_ID,
+            CHANNEL_VEHICLE_PLAN_ENABLED);
+    public static final ChannelTypeUID CHANNEL_TYPE_UID_VEHICLE_PLAN_SOC = new ChannelTypeUID(BINDING_ID,
+            CHANNEL_VEHICLE_PLAN_SOC);
+    public static final ChannelTypeUID CHANNEL_TYPE_UID_VEHICLE_PLAN_TIME = new ChannelTypeUID(BINDING_ID,
+            CHANNEL_VEHICLE_PLAN_TIME);
 
     public static final int CONNECTION_TIMEOUT_MILLISEC = 5000;
     public static final int LONG_CONNECTION_TIMEOUT_MILLISEC = 60000;