Skip to content

GoodWe: Fix battery charging with PV when constraint is active #3509

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

Draft
iseeberg79 wants to merge 1 commit into
base: develop
Choose a base branch
from
+60 −4
Draft

GoodWe: Fix battery charging with PV when constraint is active #3509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/ApplyPowerHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,12 @@ private static Result handleSmartMode(int activePowerSetPoint, int pvProduction,
private static Result handleRemoteMode(int activePowerSetPoint, int pvProduction) {
// TODO PV curtail: (surplus power == setpoint && battery soc == 100% => PV
// curtail)

// Constraint case: keep battery neutral (e.g., external controller constraint)
if (activePowerSetPoint == 0) {
return new Result(EmsPowerMode.DISCHARGE_BAT, 0);
}

if (activePowerSetPoint < 0) {
return new Result(EmsPowerMode.CHARGE_BAT, activePowerSetPoint * -1 + pvProduction);
}
Expand Down
58 changes: 54 additions & 4 deletions io.openems.edge.goodwe/test/io/openems/edge/goodwe/common/ApplyPowerHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,9 @@ public void testCalculate() throws OpenemsNamedException {
/* maxAcExport */ 5000, //
/* surplusPower */ 105));

// SMART - CHARGE_BAT
assertResult(EmsPowerMode.CHARGE_BAT, 300, ApplyPowerHandler.calculate(//
/* activePowerSetPoint */ 0, //
// SMART - Surplus: activePowerSetPoint == surplusPower → AUTO (balanced)
assertResult(EmsPowerMode.AUTO, 0, ApplyPowerHandler.calculate(//
/* activePowerSetPoint */ 105,
/* pvProduction */ 300, //
ControlMode.SMART, //
/* gridActivePower */ 250, //
Expand All @@ -107,7 +107,29 @@ public void testCalculate() throws OpenemsNamedException {
/* maxAcExport */ 5000, //
/* surplusPower */ 105));

// SMART - null
// SMART - CHARGE_BAT: Battery charges with PV surplus
assertResult(EmsPowerMode.CHARGE_BAT, 2000, ApplyPowerHandler.calculate(//
/* activePowerSetPoint */ 1000,
/* pvProduction */ 3000,
ControlMode.SMART, //
/* gridActivePower */ 500,
/* essActivePower */ 300, //
/* maxAcImport */ 5000, //
/* maxAcExport */ 5000, //
/* surplusPower */ 0));

// SMART - Constraint: activePowerSetPoint == 0 → battery neutral
assertResult(EmsPowerMode.DISCHARGE_BAT, 0, ApplyPowerHandler.calculate(//
/* activePowerSetPoint */ 0,
/* pvProduction */ 300, //
ControlMode.SMART, //
/* gridActivePower */ 350, //
/* essActivePower */ 420, //
/* maxAcImport */ 5000, //
/* maxAcExport */ 5000, //
/* surplusPower */ 0));

// SMART - Missing data falls back to AUTO
assertResult(EmsPowerMode.AUTO, 0, ApplyPowerHandler.calculate(//
/* activePowerSetPoint */ 1000, //
/* pvProduction */ 300, //
Expand Down Expand Up @@ -237,4 +259,32 @@ public void testApplyWithEmsPowerSet() throws OpenemsNamedException {
assertEquals(5300, emsPowerSet.get());
assertEquals(EmsPowerMode.CHARGE_BAT, emsPowerMode.get());
}

@Test
public void testConstraintedRealWorldScenario() throws OpenemsNamedException {
// Real-world scenario: evcc storage lock with EV charging (GitHub evcc-io/evcc #22827)
// PV: 5000W, Consumption: 12200W, Loadpoint-Consumption: 7200, Constraint: battery not discharging

// REMOTE mode: battery stays neutral
assertResult(EmsPowerMode.DISCHARGE_BAT, 0, ApplyPowerHandler.calculate(//
/* activePowerSetPoint */ 0,
/* pvProduction */ 5000, //
ControlMode.REMOTE, //
/* gridActivePower */ 12200, //
/* essActivePower */ -5000, //
/* maxAcImport */ 20000, //
/* maxAcExport */ 20000, //
/* surplusPower */ 0));

// SMART mode: falls through to REMOTE, same result
assertResult(EmsPowerMode.DISCHARGE_BAT, 0, ApplyPowerHandler.calculate(//
/* activePowerSetPoint */ 0,
/* pvProduction */ 5000, //
ControlMode.SMART, //
/* gridActivePower */ 12200, //
/* essActivePower */ -5000, //
/* maxAcImport */ 20000, //
/* maxAcExport */ 20000, //
/* surplusPower */ 0));
}
}