GoodWe battery remote control improvements.

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

@@ -31,6 +31,9 @@
 	@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

@@ -211,6 +211,10 @@ protected ModbusProtocol defineModbusProtocol() {
 						m(EssChannelId.P_BATTERY1, new SignedWordElement(35183)), //
 						m(EssChannelId.BATTERY_MODE, new UnsignedWordElement(35184))), //
 
+//				new FC3ReadRegistersTask(37102, Priority.HIGH, //
+//						m(EssChannelId.BMS_ALLOWED_CHARGE, new UnsignedWordElement(37102)), //
+//						m(EssChannelId.BMS_ALLOWED_DISCHARGE, new SignedWordElement(37104))), //
+
 				new FC3ReadRegistersTask(35185, Priority.LOW, //
 						m(EssChannelId.WARNING_CODE, new UnsignedWordElement(35185)), //
 						m(EssChannelId.SAFETY_COUNTRY, new UnsignedWordElement(35186)), //
@@ -393,34 +397,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 +478,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 +505,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 +569,7 @@ public Constraint[] getStaticConstraints() throws OpenemsNamedException {
 					this.createPowerConstraint("Read-Only-Mode", Phase.ALL, Pwr.REACTIVE, Relationship.EQUALS, 0) //
 			};
 		}
+
 		return Power.NO_CONSTRAINTS;
 	}