GoodWe battery remote control improvements.

io.openems.edge.goodwe.et/bnd.bnd

@@ -13,4 +13,5 @@ Bundle-Version: 1.0.0.${tstamp}
 	io.openems.edge.timedata.api
 
 -testpath: \
-	${testpath}
+	${testpath},\
+	com.ghgande.j2mod

io.openems.edge.goodwe.et/src/io/openems/edge/goodwe/et/charger/ConfigPV1.java

@@ -31,5 +31,8 @@
 	@AttributeDefinition(name = "Modbus-ID", description = "ID of Modbus bridge.")
 	String modbus_id() default "modbus0";
 
+	@AttributeDefinition(name = "Modbus target filter", description = "This is auto-generated by 'Modbus-ID'.")
+	String Modbus_target() default "";
+
 	String webconsole_configurationFactory_nameHint() default "GoodWe ET Charger PV1 [{id}]";
 }

io.openems.edge.goodwe.et/src/io/openems/edge/goodwe/et/charger/ConfigPV2.java

@@ -31,5 +31,8 @@
 	@AttributeDefinition(name = "Modbus-ID", description = "ID of Modbus bridge.")
 	String modbus_id() default "modbus0";
 
+	@AttributeDefinition(name = "Modbus target filter", description = "This is auto-generated by 'Modbus-ID'.")
+	String Modbus_target() default "";
+
 	String webconsole_configurationFactory_nameHint() default "GoodWe ET Charger PV2 [{id}]";
 }

io.openems.edge.goodwe.et/src/io/openems/edge/goodwe/et/ess/Config.java

@@ -27,10 +27,13 @@
 
 	@AttributeDefinition(name = "Modbus-ID", description = "ID of Modbus brige.")
 	String modbus_id() default "modbus0";
-	
-	@AttributeDefinition(name = "Capacity", description = "Capacity of the battery in Wh")
+
+	@AttributeDefinition(name = "Capacity", description = "Capacity of the battery in [Wh]")
 	int capacity() default 9_000;
 
+	@AttributeDefinition(name = "Maximum power", description = "Maximum charge/discharge power in [W]")
+	int maxBatteryPower() default 5_200;
+
 	@AttributeDefinition(name = "Modbus target filter", description = "This is auto-generated by 'Modbus-ID'.")
 	String Modbus_target() default "";
 

io.openems.edge.goodwe.et/src/io/openems/edge/goodwe/et/ess/GoodWeEtBatteryInverterImpl.java

@@ -393,34 +393,26 @@ protected ModbusProtocol defineModbusProtocol() {
 	public void applyPower(int activePower, int reactivePower) throws OpenemsNamedException {
 		final PowerModeEms nextPowerMode;
 
+		System.out.println("Active power:" + activePower);
+
 		if (this.config.readOnlyMode()) {
 			// Read-Only-Mode: fall-back to internal self-consumption optimization
 			nextPowerMode = PowerModeEms.AUTO;
 			activePower = 0;
 		} else {
-			if (activePower <= 0) {
-				// ActivePower is negative or zero -> CHARGE
+			if (activePower < 0) {
+				// ActivePower is negative -> CHARGE
+				System.out.println(" Setting Charging");
 				nextPowerMode = PowerModeEms.CHARGE_BAT;
 
 			} else {
-				// ActivePower is positive -> DISCHARGE
-
-				/*
-				 * Check if PV is available. Discharge mode changes according to availability of
-				 * PV
-				 * 
-				 * TODO PV mode is not working, need an update from GoodWe for this.
-				 */
-				Integer productionPower = null;
-				for (AbstractGoodWeEtCharger charger : this.chargers) {
-					productionPower = TypeUtils.sum(productionPower, charger.getActualPower().get());
-				}
-				if (productionPower == null) {
-					// No PV-Power -> required to put on SELL_POWER
-					nextPowerMode = PowerModeEms.SELL_POWER;
+				// ActivePower is positive or zero -> DISCHARGE
+				System.out.println(" Setting Discharging");
+				Integer soc = this.getSoc().get();
+				if (soc == 100 || activePower == 0) {
+					nextPowerMode = PowerModeEms.EXPORT_AC;
 				} else {
-					// PV-Power exists -> set DISCHARGE_BAT
-					nextPowerMode = PowerModeEms.DISCHARGE_BAT;
+					nextPowerMode = PowerModeEms.DISCHARGE_PV;
 				}
 			}
 		}
@@ -482,7 +474,9 @@ private void updatechannels() {
 		 */
 		final Channel<Integer> batteryPower = this.channel(EssChannelId.P_BATTERY1);
 		Integer activePower = batteryPower.getNextValue().get();
+		Integer productionPower = null;
 		for (AbstractGoodWeEtCharger charger : this.chargers) {
+			productionPower = TypeUtils.sum(productionPower, charger.getActualPower().get());
 			activePower = TypeUtils.sum(activePower, charger.getActualPowerChannel().getNextValue().get());
 		}
 		this._setActivePower(activePower);
@@ -507,19 +501,49 @@ private void updatechannels() {
 		/*
 		 * Update Allowed charge and Allowed discharge
 		 */
+
+//		System.out.println(
+//				"Allowed Charge power: " + allowedChargePower + " Allowed Discharge Power: " + allowedDischargePower);
+
 		Integer soc = this.getSoc().get();
-		Integer maxApparentPower = this.getMaxApparentPower().get();
+		Integer maxBatteryPower = this.config.maxBatteryPower();
 
-		if (soc == null || soc >= 99) {
-			this._setAllowedChargePower(0);
-		} else {
-			this._setAllowedChargePower(TypeUtils.multiply(maxApparentPower, -1));
+		Integer allowedCharge = null;
+		Integer allowedDischarge = null;
+
+		if (productionPower == null) {
+			productionPower = 0;
 		}
-		if (soc == null || soc <= 0) {
-			this._setAllowedDischargePower(0);
-		} else {
-			this._setAllowedDischargePower(maxApparentPower);
+
+		if (soc == null) {
+
+			allowedCharge = 0;
+			allowedDischarge = 0;
+
+		} else if (soc == 100) {
+
+			allowedDischarge = maxBatteryPower + productionPower;
+			allowedCharge = 0;
+
+		} else if (soc > 0) {
+
+			allowedDischarge = maxBatteryPower + productionPower;
+			allowedCharge = maxBatteryPower;
+
+		} else if (soc == 0) {
+
+			allowedDischarge = productionPower;
+			allowedCharge = maxBatteryPower;
+
+		}
+
+		// to avoid charging when production is greater than maximum battery power.
+		if (allowedCharge < 0) {
+			allowedCharge = 0;
 		}
+
+		this._setAllowedChargePower(TypeUtils.multiply(allowedCharge * -1));
+		this._setAllowedDischargePower(allowedDischarge);
 	}
 
 	@Override
@@ -541,6 +565,7 @@ public Constraint[] getStaticConstraints() throws OpenemsNamedException {
 					this.createPowerConstraint("Read-Only-Mode", Phase.ALL, Pwr.REACTIVE, Relationship.EQUALS, 0) //
 			};
 		}
+
 		return Power.NO_CONSTRAINTS;
 	}
 

io.openems.edge.goodwe.et/test/io/openems/edge/goodwe/et/charger/MyConfig.java

@@ -0,0 +1,85 @@
+package io.openems.edge.goodwe.et.charger;
+
+import io.openems.common.utils.ConfigUtils;
+import io.openems.edge.common.test.AbstractComponentConfig;
+
+@SuppressWarnings("all")
+public class MyConfig extends AbstractComponentConfig implements ConfigPV1 {
+
+	public static class Builder {
+		private String id = null;
+		public String essId;
+		public int unitId;
+		public String modbusId;
+
+		private Builder() {
+
+		}
+
+		public Builder setId(String id) {
+			this.id = id;
+			return this;
+		}
+
+		public Builder setEssId(String essId) {
+			this.essId = essId;
+			return this;
+		}
+
+		public Builder setModbusId(String modbusId) {
+			this.modbusId = modbusId;
+			return this;
+		}
+
+		public Builder setUnitId(int unitId) {
+			this.unitId = unitId;
+			return this;
+		}
+
+		public MyConfig build() {
+			return new MyConfig(this);
+		}
+	}
+
+	/**
+	 * Create a Config builder.
+	 * 
+	 * @return a {@link Builder}
+	 */
+	public static Builder create() {
+		return new Builder();
+	}
+
+	private final Builder builder;
+
+	private MyConfig(Builder builder) {
+		super(ConfigPV1.class, builder.id);
+		this.builder = builder;
+	}
+
+	@Override
+	public int unit_id() {
+		return this.builder.unitId;
+	}
+
+	@Override
+	public String modbus_id() {
+		return this.builder.modbusId;
+	}
+
+	@Override
+	public String Modbus_target() {
+		return ConfigUtils.generateReferenceTargetFilter(this.id(), this.modbus_id());
+	}
+
+	@Override
+	public String ess_id() {
+		return this.builder.essId;
+	}
+
+	@Override
+	public String Ess_target() {
+		return ConfigUtils.generateReferenceTargetFilter(this.id(), this.ess_id());
+	}
+
+}

io.openems.edge.goodwe.et/test/io/openems/edge/goodwe/et/ess/GoodWeEtBatteryInverterImplTest.java

@@ -0,0 +1,98 @@
+package io.openems.edge.goodwe.et.ess;
+
+import org.junit.Test;
+
+import io.openems.common.types.ChannelAddress;
+import io.openems.edge.bridge.modbus.test.DummyModbusBridge;
+import io.openems.edge.common.test.AbstractComponentTest.TestCase;
+import io.openems.edge.common.test.ComponentTest;
+import io.openems.edge.common.test.DummyConfigurationAdmin;
+import io.openems.edge.ess.test.DummyPower;
+import io.openems.edge.ess.test.ManagedSymmetricEssTest;
+import io.openems.edge.goodwe.et.GoodWeEtConstants;
+import io.openems.edge.goodwe.et.charger.GoodWeEtChargerPv1;
+
+public class GoodWeEtBatteryInverterImplTest {
+
+	private static final String MODBUS_ID = "modbus0";
+
+	private static final String ESS_ID = "ess0";
+	private static final ChannelAddress ESS_SET_ACTIVE_POWER_EQUALS = new ChannelAddress(ESS_ID,
+			"SetActivePowerEquals");
+	private static final ChannelAddress ESS_SOC = new ChannelAddress(ESS_ID, "Soc");
+	private static final ChannelAddress ESS_EMS_POWER_MODE = new ChannelAddress(ESS_ID, "EmsPowerMode");
+	private static final ChannelAddress ESS_EMS_POWER_SET = new ChannelAddress(ESS_ID, "EmsPowerSet");
+
+	private static final String CHARGER_ID = "charger0";
+	private static final ChannelAddress CHARGER_ACTUAL_POWER = new ChannelAddress(CHARGER_ID, "ActualPower");
+
+	@Test
+	public void test() throws Exception {
+		GoodWeEtChargerPv1 charger = new GoodWeEtChargerPv1();
+		new ComponentTest(charger) //
+				.addReference("cm", new DummyConfigurationAdmin()) //
+				.addReference("setModbus", new DummyModbusBridge(MODBUS_ID)) //
+				.activate(io.openems.edge.goodwe.et.charger.MyConfig.create() //
+						.setId(CHARGER_ID) //
+						.setEssId(ESS_ID) //
+						.setModbusId(MODBUS_ID) //
+						.setUnitId(GoodWeEtConstants.DEFAULT_UNIT_ID) //
+						.build());
+
+		GoodWeEtBatteryInverterImpl ess = new GoodWeEtBatteryInverterImpl();
+		ess.addCharger(charger);
+		new ManagedSymmetricEssTest(ess) //
+				.addReference("power", new DummyPower()) //
+				.addReference("cm", new DummyConfigurationAdmin()) //
+				.addReference("setModbus", new DummyModbusBridge(MODBUS_ID)) //
+				.addComponent(charger) //
+				.activate(MyConfig.create() //
+						.setId(ESS_ID) //
+						.setModbusId(MODBUS_ID) //
+						.setUnitId(GoodWeEtConstants.DEFAULT_UNIT_ID) //
+						.setCapacity(9_000) //
+						.setMaxBatteryPower(5_200) //
+						.setReadOnlyMode(false) //
+						.build()) //
+				.next(new TestCase("Scenario 1: (set-point is positive && set-point is lower than pv production)") //
+						.input(CHARGER_ACTUAL_POWER, 5_000) //
+						.input(ESS_SOC, 50) //
+						.input(ESS_SET_ACTIVE_POWER_EQUALS, 3_000) //
+						.output(ESS_EMS_POWER_MODE, PowerModeEms.CHARGE_BAT) //
+						.output(ESS_EMS_POWER_SET, 2000)) //
+				.next(new TestCase("Scenario 2: (set-point is positive && set-Point is bigger than pv production)") //
+						.input(CHARGER_ACTUAL_POWER, 5_000) //
+						.input(ESS_SOC, 50) //
+						.input(ESS_SET_ACTIVE_POWER_EQUALS, 8_000) //
+						.output(ESS_EMS_POWER_MODE, PowerModeEms.DISCHARGE_PV) //
+						.output(ESS_EMS_POWER_SET, 3000)) //
+				.next(new TestCase(
+						"Scenario 3: (set-point is negative && PV-Power is smaller than max charge power of the battery)") //
+								.input(CHARGER_ACTUAL_POWER, 3_000) //
+								.input(ESS_SOC, 50) //
+								.input(ESS_SET_ACTIVE_POWER_EQUALS, -2_000) //
+								.output(ESS_EMS_POWER_MODE, PowerModeEms.CHARGE_BAT) //
+								.output(ESS_EMS_POWER_SET, 5_000)) //
+				.next(new TestCase(
+						"Scenario 4: (set-point is negative && PV-Power equals max charge power of the battery)") //
+								.input(CHARGER_ACTUAL_POWER, 3_000) //
+								.input(ESS_SOC, 50) //
+								.input(ESS_SET_ACTIVE_POWER_EQUALS, -4_000)) //
+				// TODO .output(ESS_EMS_POWER_MODE, PowerModeEms.DISCHARGE_PV) //
+				// TODO .output(ESS_EMS_POWER_SET, 3000)) //
+				.next(new TestCase("Scenario 5: (set-point is positive && set-point is higher than pv production)") //
+						.input(CHARGER_ACTUAL_POWER, 3_000) //
+						.input(ESS_SOC, 100) //
+						.input(ESS_SET_ACTIVE_POWER_EQUALS, 8_000) //
+						.output(ESS_EMS_POWER_MODE, PowerModeEms.DISCHARGE_BAT) //
+						.output(ESS_EMS_POWER_SET, 5_000)) //
+				.next(new TestCase("Scenario 6: (set-point is positive && set-point is lower than pv production)") //
+						.input(CHARGER_ACTUAL_POWER, 5_000) //
+						.input(ESS_SOC, 100) //
+						.input(ESS_SET_ACTIVE_POWER_EQUALS, 3_000)) //
+		// TODO .output(ESS_EMS_POWER_MODE, PowerModeEms.DISCHARGE_BAT) //
+		// TODO .output(ESS_EMS_POWER_SET, 5_000)) //
+		;
+	}
+
+}