Edge: Fix typo in EssFeneconCommercial40Pv2Impl (OpenEMS#2310)

* Validate, that fix actually works, via JUnit test
* Fix typo

---------

Co-authored-by: Stefan Feilmeier <[email protected]>

Author: sebastianasen

io.openems.edge.ess.fenecon.commercial40/src/io/openems/edge/ess/fenecon/commercial40/charger/EssFeneconCommercial40Pv2Impl.java

@@ -55,7 +55,7 @@ public EssFeneconCommercial40Pv2Impl() {
 	}
 
 	@Activate
-	private void activate(ComponentContext context, ConfigPv1 config) throws OpenemsException {
+	private void activate(ComponentContext context, ConfigPv2 config) throws OpenemsException {
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), this.ess.getUnitId(), this.cm,
 				"Modbus", this.ess.getModbusBridgeId())) {
 			return;

io.openems.edge.ess.fenecon.commercial40/test/io/openems/edge/ess/fenecon/commercial40/charger/EssFeneconCommercial40Pv1ImplTest.java

@@ -35,7 +35,7 @@ public void test() throws Exception {
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("ess", ess) //
 				.addReference("setModbus", new DummyModbusBridge(MODBUS_ID)) //
-				.activate(MyConfigPV1.create() //
+				.activate(MyConfigPv1.create() //
 						.setId(CHARGER_ID) //
 						.setModbusId(MODBUS_ID) //
 						.setEssId(ESS_ID) //

io.openems.edge.ess.fenecon.commercial40/test/io/openems/edge/ess/fenecon/commercial40/charger/EssFeneconCommercial40Pv2ImplTest.java

@@ -0,0 +1,46 @@
+package io.openems.edge.ess.fenecon.commercial40.charger;
+
+import org.junit.Test;
+
+import io.openems.edge.bridge.modbus.test.DummyModbusBridge;
+import io.openems.edge.common.test.ComponentTest;
+import io.openems.edge.common.test.DummyConfigurationAdmin;
+import io.openems.edge.ess.fenecon.commercial40.EssFeneconCommercial40Impl;
+import io.openems.edge.ess.test.ManagedSymmetricEssTest;
+
+public class EssFeneconCommercial40Pv2ImplTest {
+
+	private static final String CHARGER_ID = "charger1";
+	private static final String ESS_ID = "ess0";
+	private static final String MODBUS_ID = "modbus0";
+
+	@Test
+	public void test() throws Exception {
+		var ess = new EssFeneconCommercial40Impl();
+		new ManagedSymmetricEssTest(ess) //
+				.addReference("cm", new DummyConfigurationAdmin()) //
+				.addReference("setModbus", new DummyModbusBridge(MODBUS_ID)) //
+				.activate(io.openems.edge.ess.fenecon.commercial40.MyConfig.create() //
+						.setId(ESS_ID) //
+						.setModbusId(MODBUS_ID) //
+						.setSurplusFeedInSocLimit(90) //
+						.setSurplusFeedInAllowedChargePowerLimit(-8000) //
+						.setSurplusFeedInIncreasePowerFactor(1.1) //
+						.setSurplusFeedInMaxIncreasePowerFactor(2000) //
+						.setSurplusFeedInPvLimitOnPowerDecreaseCausedByOvertemperature(5000) //
+						.setSurplusFeedInOffTime("17:00:00") //
+						.build());
+
+		new ComponentTest(new EssFeneconCommercial40Pv2Impl()) //
+				.addReference("cm", new DummyConfigurationAdmin()) //
+				.addReference("ess", ess) //
+				.addReference("setModbus", new DummyModbusBridge(MODBUS_ID)) //
+				.activate(MyConfigPv2.create() //
+						.setId(CHARGER_ID) //
+						.setModbusId(MODBUS_ID) //
+						.setEssId(ESS_ID) //
+						.setMaxActualPower(0) //
+						.build()) //
+		;
+	}
+}

io.openems.edge.ess.fenecon.commercial40/test/io/openems/edge/ess/fenecon/commercial40/charger/MyConfigPV1.java io.openems.edge.ess.fenecon.commercial40/test/io/openems/edge/ess/fenecon/commercial40/charger/MyConfigPv1.java

@@ -4,7 +4,7 @@
 import io.openems.common.utils.ConfigUtils;
 
 @SuppressWarnings("all")
-public class MyConfigPV1 extends AbstractComponentConfig implements ConfigPv1 {
+public class MyConfigPv1 extends AbstractComponentConfig implements ConfigPv1 {
 
 	protected static class Builder {
 		private String id;
@@ -35,8 +35,8 @@ public Builder setEssId(String essId) {
 			return this;
 		}
 
-		public MyConfigPV1 build() {
-			return new MyConfigPV1(this);
+		public MyConfigPv1 build() {
+			return new MyConfigPv1(this);
 		}
 	}
 
@@ -51,7 +51,7 @@ public static Builder create() {
 
 	private final Builder builder;
 
-	private MyConfigPV1(Builder builder) {
+	private MyConfigPv1(Builder builder) {
 		super(ConfigPv1.class, builder.id);
 		this.builder = builder;
 	}

io.openems.edge.ess.fenecon.commercial40/test/io/openems/edge/ess/fenecon/commercial40/charger/MyConfigPv2.java

@@ -0,0 +1,74 @@
+package io.openems.edge.ess.fenecon.commercial40.charger;
+
+import io.openems.common.test.AbstractComponentConfig;
+import io.openems.common.utils.ConfigUtils;
+
+@SuppressWarnings("all")
+public class MyConfigPv2 extends AbstractComponentConfig implements ConfigPv2 {
+
+	protected static class Builder {
+		private String id;
+		private String modbusId;
+		private int maxActualPower;
+		private String essId;
+
+		private Builder() {
+		}
+
+		public Builder setId(String id) {
+			this.id = id;
+			return this;
+		}
+
+		public Builder setModbusId(String modbusId) {
+			this.modbusId = modbusId;
+			return this;
+		}
+
+		public Builder setMaxActualPower(int maxActualPower) {
+			this.maxActualPower = maxActualPower;
+			return this;
+		}
+
+		public Builder setEssId(String essId) {
+			this.essId = essId;
+			return this;
+		}
+
+		public MyConfigPv2 build() {
+			return new MyConfigPv2(this);
+		}
+	}
+
+	/**
+	 * Create a Config builder.
+	 *
+	 * @return a {@link Builder}
+	 */
+	public static Builder create() {
+		return new Builder();
+	}
+
+	private final Builder builder;
+
+	private MyConfigPv2(Builder builder) {
+		super(ConfigPv2.class, builder.id);
+		this.builder = builder;
+	}
+
+	@Override
+	public String ess_id() {
+		return this.builder.essId;
+	}
+
+	@Override
+	public String Modbus_target() {
+		return ConfigUtils.generateReferenceTargetFilter(this.id(), this.builder.modbusId);
+	}
+
+	@Override
+	public String Ess_target() {
+		return ConfigUtils.generateReferenceTargetFilter(this.id(), this.ess_id());
+	}
+
+}