Skip to content

Commit c87722e

Browse files
lucaarnflorian-h05
authored andcommitted
[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)
1 parent 12c1be4 commit c87722e

File tree

10 files changed

+843
-330
lines changed

10 files changed

+843
-330
lines changed

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

+107-75
Large diffs are not rendered by default.

bundles/org.openhab.binding.evcc/src/main/java/org/openhab/binding/evcc/internal/EvccBindingConstants.java

+47-25
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,27 @@
2121
* used across the whole binding.
2222
*
2323
* @author Florian Hotze - Initial contribution
24+
* @author Luca Arnecke - Update to evcc version 0.123.1
2425
*/
2526
@NonNullByDefault
2627
public class EvccBindingConstants {
2728

2829
private static final String BINDING_ID = "evcc";
2930

3031
public static final String CHANNEL_GROUP_ID_GENERAL = "general";
32+
public static final String CHANNEL_GROUP_ID_LOADPOINT = "loadpoint";
33+
public static final String CHANNEL_GROUP_ID_VEHICLE = "vehicle";
3134

3235
// List of all Channel ids
3336
public static final String CHANNEL_BATTERY_CAPACITY = "batteryCapacity";
3437
public static final String CHANNEL_BATTERY_POWER = "batteryPower";
3538
public static final String CHANNEL_BATTERY_SOC = "batterySoC";
36-
public static final String CHANNEL_BATTERY_PRIORITY_SOC = "batteryPrioritySoC";
39+
public static final String CHANNEL_BATTERY_DISCHARGE_CONTROL = "batteryDischargeControl";
40+
public static final String CHANNEL_BATTERY_MODE = "batteryMode";
41+
public static final String CHANNEL_PRIORITY_SOC = "prioritySoC";
42+
public static final String CHANNEL_BUFFER_SOC = "bufferSoC";
43+
public static final String CHANNEL_BUFFER_START_SOC = "bufferStartSoC";
44+
public static final String CHANNEL_RESIDUAL_POWER = "residualPower";
3745
public static final String CHANNEL_GRID_POWER = "gridPower";
3846
public static final String CHANNEL_HOME_POWER = "homePower";
3947
public static final String CHANNEL_PV_POWER = "pvPower";
@@ -47,27 +55,26 @@ public class EvccBindingConstants {
4755
public static final String CHANNEL_LOADPOINT_CHARGING = "charging";
4856
public static final String CHANNEL_LOADPOINT_CONNECTED = "vehicleConnected";
4957
public static final String CHANNEL_LOADPOINT_CONNECTED_DURATION = "vehicleConnectedDuration";
50-
public static final String CHANNEL_LOADPOINT_HAS_VEHICLE = "hasVehicle";
5158
public static final String CHANNEL_LOADPOINT_ENABLED = "enabled";
5259
public static final String CHANNEL_LOADPOINT_MAX_CURRENT = "maxCurrent";
5360
public static final String CHANNEL_LOADPOINT_MIN_CURRENT = "minCurrent";
54-
public static final String CHANNEL_LOADPOINT_MIN_SOC = "minSoC";
5561
public static final String CHANNEL_LOADPOINT_MODE = "mode";
5662
public static final String CHANNEL_LOADPOINT_PHASES = "phases";
57-
public static final String CHANNEL_LOADPOINT_TARGET_ENERGY = "targetEnergy";
58-
public static final String CHANNEL_LOADPOINT_TARGET_SOC = "targetSoC";
59-
public static final String CHANNEL_LOADPOINT_TARGET_TIME = "targetTime";
60-
/**
61-
* Whether a target time is set on loadpoint.
62-
*/
63-
public static final String CHANNEL_LOADPOINT_TARGET_TIME_ENABLED = "targetTimeEnabled";
63+
public static final String CHANNEL_LOADPOINT_LIMIT_ENERGY = "limitEnergy";
64+
public static final String CHANNEL_LOADPOINT_LIMIT_SOC = "limitSoC";
6465
public static final String CHANNEL_LOADPOINT_TITLE = "title";
6566
public static final String CHANNEL_LOADPOINT_VEHICLE_CAPACITY = "vehicleCapacity";
6667
public static final String CHANNEL_LOADPOINT_VEHICLE_ODOMETER = "vehicleOdometer";
6768
public static final String CHANNEL_LOADPOINT_VEHICLE_PRESENT = "vehiclePresent";
6869
public static final String CHANNEL_LOADPOINT_VEHICLE_RANGE = "vehicleRange";
6970
public static final String CHANNEL_LOADPOINT_VEHICLE_SOC = "vehicleSoC";
70-
public static final String CHANNEL_LOADPOINT_VEHICLE_TITLE = "vehicleTitle";
71+
public static final String CHANNEL_LOADPOINT_VEHICLE_NAME = "vehicleName";
72+
public static final String CHANNEL_VEHICLE_TITLE = "vehicleTitle";
73+
public static final String CHANNEL_VEHICLE_MIN_SOC = "vehicleMinSoC";
74+
public static final String CHANNEL_VEHICLE_LIMIT_SOC = "vehicleLimitSoC";
75+
public static final String CHANNEL_VEHICLE_PLAN_ENABLED = "vehiclePlanEnabled";
76+
public static final String CHANNEL_VEHICLE_PLAN_SOC = "vehiclePlanSoC";
77+
public static final String CHANNEL_VEHICLE_PLAN_TIME = "vehiclePlanTime";
7178

7279
// List of all Thing Type UIDs
7380
public static final ThingTypeUID THING_TYPE_DEVICE = new ThingTypeUID(BINDING_ID, "device");
@@ -79,8 +86,17 @@ public class EvccBindingConstants {
7986
CHANNEL_BATTERY_POWER);
8087
public static final ChannelTypeUID CHANNEL_TYPE_UID_BATTERY_SOC = new ChannelTypeUID(BINDING_ID,
8188
CHANNEL_BATTERY_SOC);
82-
public static final ChannelTypeUID CHANNEL_TYPE_UID_BATTERY_PRIORITY_SOC = new ChannelTypeUID(BINDING_ID,
83-
CHANNEL_BATTERY_PRIORITY_SOC);
89+
public static final ChannelTypeUID CHANNEL_TYPE_UID_BATTERY_DISCHARGE_CONTROL = new ChannelTypeUID(BINDING_ID,
90+
CHANNEL_BATTERY_DISCHARGE_CONTROL);
91+
public static final ChannelTypeUID CHANNEL_TYPE_UID_BATTERY_MODE = new ChannelTypeUID(BINDING_ID,
92+
CHANNEL_BATTERY_MODE);
93+
public static final ChannelTypeUID CHANNEL_TYPE_UID_PRIORITY_SOC = new ChannelTypeUID(BINDING_ID,
94+
CHANNEL_PRIORITY_SOC);
95+
public static final ChannelTypeUID CHANNEL_TYPE_UID_BUFFER_SOC = new ChannelTypeUID(BINDING_ID, CHANNEL_BUFFER_SOC);
96+
public static final ChannelTypeUID CHANNEL_TYPE_UID_BUFFER_START_SOC = new ChannelTypeUID(BINDING_ID,
97+
CHANNEL_BUFFER_START_SOC);
98+
public static final ChannelTypeUID CHANNEL_TYPE_UID_RESIDUAL_POWER = new ChannelTypeUID(BINDING_ID,
99+
CHANNEL_RESIDUAL_POWER);
84100
public static final ChannelTypeUID CHANNEL_TYPE_UID_GRID_POWER = new ChannelTypeUID(BINDING_ID, CHANNEL_GRID_POWER);
85101
public static final ChannelTypeUID CHANNEL_TYPE_UID_HOME_POWER = new ChannelTypeUID(BINDING_ID, CHANNEL_HOME_POWER);
86102
public static final ChannelTypeUID CHANNEL_TYPE_UID_PV_POWER = new ChannelTypeUID(BINDING_ID, CHANNEL_PV_POWER);
@@ -110,20 +126,14 @@ public class EvccBindingConstants {
110126
CHANNEL_LOADPOINT_MAX_CURRENT);
111127
public static final ChannelTypeUID CHANNEL_TYPE_UID_LOADPOINT_MIN_CURRENT = new ChannelTypeUID(BINDING_ID,
112128
CHANNEL_LOADPOINT_MIN_CURRENT);
113-
public static final ChannelTypeUID CHANNEL_TYPE_UID_LOADPOINT_MIN_SOC = new ChannelTypeUID(BINDING_ID,
114-
CHANNEL_LOADPOINT_MIN_SOC);
115129
public static final ChannelTypeUID CHANNEL_TYPE_UID_LOADPOINT_MODE = new ChannelTypeUID(BINDING_ID,
116130
CHANNEL_LOADPOINT_MODE);
117131
public static final ChannelTypeUID CHANNEL_TYPE_UID_LOADPOINT_PHASES = new ChannelTypeUID(BINDING_ID,
118132
CHANNEL_LOADPOINT_PHASES);
119-
public static final ChannelTypeUID CHANNEL_TYPE_UID_LOADPOINT_TARGET_ENERGY = new ChannelTypeUID(BINDING_ID,
120-
CHANNEL_LOADPOINT_TARGET_ENERGY);
121-
public static final ChannelTypeUID CHANNEL_TYPE_UID_LOADPOINT_TARGET_SOC = new ChannelTypeUID(BINDING_ID,
122-
CHANNEL_LOADPOINT_TARGET_SOC);
123-
public static final ChannelTypeUID CHANNEL_TYPE_UID_LOADPOINT_TARGET_TIME = new ChannelTypeUID(BINDING_ID,
124-
CHANNEL_LOADPOINT_TARGET_TIME);
125-
public static final ChannelTypeUID CHANNEL_TYPE_UID_LOADPOINT_TARGET_TIME_ENABLED = new ChannelTypeUID(BINDING_ID,
126-
CHANNEL_LOADPOINT_TARGET_TIME_ENABLED);
133+
public static final ChannelTypeUID CHANNEL_TYPE_UID_LOADPOINT_LIMIT_ENERGY = new ChannelTypeUID(BINDING_ID,
134+
CHANNEL_LOADPOINT_LIMIT_ENERGY);
135+
public static final ChannelTypeUID CHANNEL_TYPE_UID_LOADPOINT_LIMIT_SOC = new ChannelTypeUID(BINDING_ID,
136+
CHANNEL_LOADPOINT_LIMIT_SOC);
127137
public static final ChannelTypeUID CHANNEL_TYPE_UID_LOADPOINT_TITLE = new ChannelTypeUID(BINDING_ID,
128138
CHANNEL_LOADPOINT_TITLE);
129139
public static final ChannelTypeUID CHANNEL_TYPE_UID_LOADPOINT_VEHICLE_CAPACITY = new ChannelTypeUID(BINDING_ID,
@@ -136,8 +146,20 @@ public class EvccBindingConstants {
136146
CHANNEL_LOADPOINT_VEHICLE_RANGE);
137147
public static final ChannelTypeUID CHANNEL_TYPE_UID_LOADPOINT_VEHICLE_SOC = new ChannelTypeUID(BINDING_ID,
138148
CHANNEL_LOADPOINT_VEHICLE_SOC);
139-
public static final ChannelTypeUID CHANNEL_TYPE_UID_LOADPOINT_VEHICLE_TITLE = new ChannelTypeUID(BINDING_ID,
140-
CHANNEL_LOADPOINT_VEHICLE_TITLE);
149+
public static final ChannelTypeUID CHANNEL_TYPE_UID_LOADPOINT_VEHICLE_NAME = new ChannelTypeUID(BINDING_ID,
150+
CHANNEL_LOADPOINT_VEHICLE_NAME);
151+
public static final ChannelTypeUID CHANNEL_TYPE_UID_VEHICLE_TITLE = new ChannelTypeUID(BINDING_ID,
152+
CHANNEL_VEHICLE_TITLE);
153+
public static final ChannelTypeUID CHANNEL_TYPE_UID_VEHICLE_MIN_SOC = new ChannelTypeUID(BINDING_ID,
154+
CHANNEL_VEHICLE_MIN_SOC);
155+
public static final ChannelTypeUID CHANNEL_TYPE_UID_VEHICLE_LIMIT_SOC = new ChannelTypeUID(BINDING_ID,
156+
CHANNEL_VEHICLE_LIMIT_SOC);
157+
public static final ChannelTypeUID CHANNEL_TYPE_UID_VEHICLE_PLAN_ENABLED = new ChannelTypeUID(BINDING_ID,
158+
CHANNEL_VEHICLE_PLAN_ENABLED);
159+
public static final ChannelTypeUID CHANNEL_TYPE_UID_VEHICLE_PLAN_SOC = new ChannelTypeUID(BINDING_ID,
160+
CHANNEL_VEHICLE_PLAN_SOC);
161+
public static final ChannelTypeUID CHANNEL_TYPE_UID_VEHICLE_PLAN_TIME = new ChannelTypeUID(BINDING_ID,
162+
CHANNEL_VEHICLE_PLAN_TIME);
141163

142164
public static final int CONNECTION_TIMEOUT_MILLISEC = 5000;
143165
public static final int LONG_CONNECTION_TIMEOUT_MILLISEC = 60000;

0 commit comments

Comments
 (0)