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 4 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
30 changes: 18 additions & 12 deletions bundles/org.openhab.binding.evcc/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,20 @@ Default value for _refreshInterval_ is 60 seconds.
Those channels exist only once.
Please note that some of them are only available when evcc is properly configured.

| Channel | Type | Read/Write | Description |
|---------------------------------|----------------------|------------|--------------------------------------------------------------------------------------------------------------|
| general#batteryCapacity | Number:Energy | R | Capacity of (home) battery |
| general#batteryPower | Number:Power | R | Current power from battery |
| general#batterySoC | Number:Dimensionless | R | Current State of Charge of battery |
| general#batteryPrioritySoC | Number:Dimensionless | RW | State of State of Charge for which the battery has priority over charging the ev when charging mode is "pv" |
| general#batteryDischargeControl | Switch | RW | Battery Discharge Control switch |
| general#batteryMode | String | R | Current battery mode |
| general#gridPower | Number:Power | R | Current power from grid (negative means feed-in) |
| general#homePower | Number:Power | R | Current power taken by home |
| general#pvPower | Number:Power | R | Current power from photovoltaik |
| Channel | Type | Read/Write | Description |
florian-h05 marked this conversation as resolved.
Show resolved Hide resolved
|---------------------------------|----------------------|------------|-------------------------------------------------------------------------------------------------------------------|
| general#batteryCapacity | Number:Energy | R | Capacity of (home) battery |
| general#batteryPower | Number:Power | R | Current power from battery |
| general#batterySoC | Number:Dimensionless | R | Current State of Charge of battery |
| general#batteryDischargeControl | Switch | RW | Enable or disable battery discharge control |
| general#batteryMode | String | R | Current battery mode |
| general#prioritySoC | Number:Dimensionless | RW | State of State of Charge for which the battery has priority over charging the ev when charging mode is "pv" |
| general#bufferSoC | Number:Dimensionless | RW | Until this State of Charge the discharging of a house battery is allowed in "pv" mode, when there is insufficient solar surplus (below the minimum charging power) |
| general#bufferStartSoC | Number:Dimensionless | RW | State of Charge for which a charging session in "pv" mode is started, even if there is insufficient solar surplus |
| general#residualPower | Number:Power | RW | Target operating point of the surplus regulation at the grid connection (grid meter) |
| general#gridPower | Number:Power | R | Current power from grid (negative means feed-in) |
| general#homePower | Number:Power | R | Current power taken by home |
| general#pvPower | Number:Power | R | Current power from photovoltaik |

### Loadpoint channels

Expand Down Expand Up @@ -111,9 +114,12 @@ Thing evcc:device:demo "evcc Demo" [url="https://demo.evcc.io", refreshInterval=
Number:Energy evcc_batteryCapacity "Battery Capacity [%.0f kWh]" <energy> {channel="evcc:device:demo:general#batteryCapacity"}
Number:Power evcc_batteryPower "Battery Power [%.1f kW]" <energy> {channel="evcc:device:demo:general#batteryPower"}
Number:Dimensionless evcc_batterySoC "Battery SoC [%d %%]" <batterylevel> {channel="evcc:device:demo:general#batterySoC"}
Number:Dimensionless evcc_batteryPrioritySoC "Battery Priority SoC [%d %%]" <batterylevel> {channel="evcc:device:demo:general#batteryPrioritySoC"}
Switch evcc_batteryDischargeControl "Battery Discharge Control [%s]" <switch> {channel="evcc:device:demo:general#batteryDischargeControl"}
String evcc_batteryMode "Battery Mode [%s]" <battery> {channel="evcc:device:demo:general#batteryMode"}
Number:Dimensionless evcc_prioritySoC "Battery Priority SoC [%d %%]" <batterylevel> {channel="evcc:device:demo:general#prioritySoC"}
Number:Dimensionless evcc_bufferSoC "Battery Buffer SoC [%d %%]" <batterylevel> {channel="evcc:device:demo:general#bufferSoC"}
Number:Dimensionless evcc_bufferStartSoC "Battery Buffer Start SoC [%d %%]" <batterylevel> {channel="evcc:device:demo:general#bufferStartSoC"}
Number:Power evcc_residualPower "Grid Residual Power [%.1f kW]" <energy> {channel="evcc:device:demo:general#residualPower"}
Number:Power evcc_gridPower "Grid Power [%.1f kW]" <energy> {channel="evcc:device:demo:general#gridPower"}
Number:Power evcc_homePower "Home Power [%.1f kW]" <energy> {channel="evcc:device:demo:general#homePower"}
Number:Power evcc_pvPower "PV Power [%.1f kW]" <energy> {channel="evcc:device:demo:general#pvPower"}
Expand Down
14 changes: 11 additions & 3 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 @@ -36,9 +36,12 @@ public class EvccBindingConstants {
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";
MikeTheTux marked this conversation as resolved.
Show resolved Hide resolved
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_SOC = "residualPower";
MikeTheTux marked this conversation as resolved.
Show resolved Hide resolved
public static final String CHANNEL_GRID_POWER = "gridPower";
public static final String CHANNEL_HOME_POWER = "homePower";
public static final String CHANNEL_PV_POWER = "pvPower";
Expand Down Expand Up @@ -84,12 +87,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_SOC = new ChannelTypeUID(BINDING_ID,
CHANNEL_RESIDUAL_POWER_SOC);
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);
Expand Down