Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[evcc] Adjust to evcc version 0.123.1 #16114

Merged
merged 24 commits into from
Feb 5, 2024
Merged

[evcc] Adjust to evcc version 0.123.1 #16114

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
d68f47b
updated url of setTargetEnergy and setTargetSoC to match evcc version…
lucaarn Dec 25, 2023
151cec0
removed minSoc from Loadpoint (since evcc 0.123.0 part of vehicle)
lucaarn Dec 25, 2023
07696f2
renamed from targetEnergy to limitEnergy to match new evcc version
lucaarn Dec 25, 2023
7d4f5a0
renamed from targetSoC to limitSoC to match new evcc version
lucaarn Dec 25, 2023
bf332a4
implementation of vehicle object to match new evcc version 0.123.1 ->…
lucaarn Dec 25, 2023
bf39488
updated readme
lucaarn Dec 25, 2023
99855b5
fixed typo and resolved comments
lucaarn Dec 27, 2023
df71b37
resolved suggested fixes
lucaarn Dec 28, 2023
c387a5e
remove of channels used in previous version
lucaarn Dec 28, 2023
6f7c58b
thing-types cleanup, removed redundant code
lucaarn Dec 28, 2023
8162830
Reorder comments in thing-types.xml
florian-h05 Dec 28, 2023
5635393
fix loadpoint vehicleName channel
MikeTheTux Jan 31, 2024
199f5df
2023 -> 2024
MikeTheTux Jan 31, 2024
a985c8b
kWH -> kWh
MikeTheTux Jan 31, 2024
9c5c609
added batteryDischargeControl and batteryMode
MikeTheTux Feb 1, 2024
777e974
added bufferSoC bufferStartSoC residualPower channels
MikeTheTux Feb 1, 2024
ad6f7f7
review finding
MikeTheTux Feb 1, 2024
ee24819
review finding
MikeTheTux Feb 1, 2024
fcd2ccc
added new channels to README.md
MikeTheTux Feb 1, 2024
8d403c8
review findings
MikeTheTux Feb 2, 2024
d0401c5
improved some categories
MikeTheTux Feb 2, 2024
c9da7d6
implemented review findings
MikeTheTux Feb 2, 2024
2a0ac93
removed unused parameter
MikeTheTux Feb 3, 2024
ba2da7e
reverted changes in evcc_de.properties
MikeTheTux Feb 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
154 changes: 88 additions & 66 deletions bundles/org.openhab.binding.evcc/README.md
View file
Open in desktop

Large diffs are not rendered by default.

48 changes: 29 additions & 19 deletions ...ab.binding.evcc/src/main/java/org/openhab/binding/evcc/internal/EvccBindingConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
* used across the whole binding.
*
* @author Florian Hotze - Initial contribution
* @author Luca Arnecke - update to evcc version 0.123.1
lucaarn marked this conversation as resolved.
Show resolved Hide resolved
*/
@NonNullByDefault
public class EvccBindingConstants {
Expand All @@ -29,6 +30,9 @@ public class EvccBindingConstants {

public static final String CHANNEL_GROUP_ID_GENERAL = "general";

// regex to check if group id is a loadpoint
public static final String CHANNEL_GROUP_ID_LOADPOINT = "^loadpoint.+";
lucaarn marked this conversation as resolved.
Show resolved Hide resolved

// List of all Channel ids
public static final String CHANNEL_BATTERY_CAPACITY = "batteryCapacity";
public static final String CHANNEL_BATTERY_POWER = "batteryPower";
Expand All @@ -51,23 +55,23 @@ public class EvccBindingConstants {
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_TITLE = "loadpointVehicleTitle";
florian-h05 marked this conversation as resolved.
Show resolved Hide resolved
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");
Expand Down Expand Up @@ -110,20 +114,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);
florian-h05 marked this conversation as resolved.
Show resolved Hide resolved
public static final ChannelTypeUID CHANNEL_TYPE_UID_LOADPOINT_VEHICLE_CAPACITY = new ChannelTypeUID(BINDING_ID,
Expand All @@ -138,6 +136,18 @@ public class EvccBindingConstants {
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_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;
Expand Down