[Edge] Add Hardy Barth cPH1 EVCS support (ECB1 REST API)

io.openems.common/src/io/openems/common/utils/JsonUtils.java

@@ -971,6 +971,18 @@ public static String getAsStringOrElse(JsonElement jElement, String memberName,
 		return getAsOptionalString(jElement, memberName).orElse(alternative);
 	}
 
+	/**
+	 * Gets the member of the {@link JsonElement} as {@link String} if it exists; or
+	 * `null` otherwise.
+	 *
+	 * @param jElement   the {@link JsonElement}
+	 * @param memberName the name of the member
+	 * @return the {@link String} value; or null
+	 */
+	public static String getAsStringOrNull(JsonElement jElement, String memberName) {
+		return toString(toPrimitive(toSubElement(jElement, memberName)));
+	}
+
 	/**
 	 * Converts a {@link JsonArray} to a String Array.
 	 *
@@ -1044,6 +1056,18 @@ public static Optional<Boolean> getAsOptionalBoolean(JsonElement jElement, Strin
 		return Optional.ofNullable(toBoolean(toPrimitive(toSubElement(jElement, memberName))));
 	}
 
+	/**
+	 * Gets the member of the {@link JsonElement} as {@link Boolean} if it exists;
+	 * or `null` otherwise.
+	 *
+	 * @param jElement   the {@link JsonElement}
+	 * @param memberName the name of the member
+	 * @return the {@link Boolean} value; or null
+	 */
+	public static Boolean getAsBooleanOrNull(JsonElement jElement, String memberName) {
+		return toBoolean(toPrimitive(toSubElement(jElement, memberName)));
+	}
+
 	/**
 	 * Gets the {@link JsonElement} as short.
 	 *
@@ -1165,6 +1189,18 @@ public static Optional<Integer> getAsOptionalInt(JsonElement jElement, String me
 		return Optional.ofNullable(toInt(toPrimitive(toSubElement(jElement, memberName))));
 	}
 
+	/**
+	 * Gets the member of the {@link JsonElement} as {@link Integer} if it exists;
+	 * or `null` otherwise.
+	 *
+	 * @param jElement   the {@link JsonElement}
+	 * @param memberName the name of the member
+	 * @return the {@link Integer} value; or null
+	 */
+	public static Integer getAsIntOrNull(JsonElement jElement, String memberName) {
+		return toInt(toPrimitive(toSubElement(jElement, memberName)));
+	}
+
 	/**
 	 * Gets the {@link JsonElement} as long.
 	 *
@@ -1322,6 +1358,18 @@ public static Optional<Double> getAsOptionalDouble(JsonElement jElement, String
 		return Optional.ofNullable(toDouble(toPrimitive(toSubElement(jElement, memberName))));
 	}
 
+	/**
+	 * Gets the member of the {@link JsonElement} as {@link Double} if it exists; or
+	 * `null` otherwise.
+	 *
+	 * @param jElement   the {@link JsonElement}
+	 * @param memberName the name of the member
+	 * @return the {@link Double} value; or null
+	 */
+	public static Double getAsDoubleOrNull(JsonElement jElement, String memberName) {
+		return toDouble(toPrimitive(toSubElement(jElement, memberName)));
+	}
+
 	/**
 	 * Gets the {@link JsonElement} as {@link Enum}.
 	 *

io.openems.edge.common/src/io/openems/edge/common/type/TypeUtils.java

@@ -505,17 +505,19 @@ public static Float multiply(Float... factors) {
 	}
 
 	/**
-	 * Safely multiply Doubles.
+	 * Safely multiply {@link Double}s.
 	 *
-	 * @param factors the factors of the multiplication
-	 * @return the result, possibly null if all factors are null
+	 * @param firstFactor    first factor of the multiplication
+	 * @param furtherFactors further factors of the multiplication
+	 * @return the result, possibly null if the first factor is null
 	 */
-	public static Double multiply(Double... factors) {
-		Double result = null;
-		for (Double factor : factors) {
-			if (result == null) {
-				result = factor;
-			} else if (factor != null) {
+	public static Double multiply(Double firstFactor, Double... furtherFactors) {
+		if (firstFactor == null) {
+			return null;
+		}
+		double result = firstFactor;
+		for (Double factor : furtherFactors) {
+			if (factor != null) {
 				result *= factor;
 			}
 		}

io.openems.edge.common/test/io/openems/edge/common/type/TextProviderTest.java

@@ -2,11 +2,12 @@
 
 import static org.junit.Assert.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.openems.common.session.Language;
 
 public class TextProviderTest {
+
 	@Test
 	public void testTextProvider() {
 		var translationProvider = TextProvider.byTranslation(TextProviderTest.class, "Testing");

io.openems.edge.common/test/io/openems/edge/common/type/TypeUtilsTest.java

@@ -10,8 +10,8 @@
 import static io.openems.common.types.OpenemsType.STRING;
 import static io.openems.edge.common.type.TypeUtils.getAsJson;
 import static io.openems.edge.common.type.TypeUtils.sum;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.util.Optional;
 
@@ -308,7 +308,7 @@ public void sumDouble() {
 	private static void assertException(ThrowingRunnable<Exception> runnable) {
 		try {
 			runnable.run();
-			assertEquals("Expecting an Exception!", true, false);
+			assertEquals(true, false, "Expecting an Exception!");
 		} catch (Exception e) {
 			// ok
 		}

io.openems.edge.evse.chargepoint.hardybarth/.settings/org.eclipse.core.resources.prefs

@@ -1,6 +1,6 @@
 eclipse.preferences.version=1
-encoding//test/io/openems/edge/evse/chargepoint/hardybarth/EvseChargePointHardyImplTest.java=UTF-8
-encoding//test/io/openems/edge/evse/chargepoint/hardybarth/MyConfig.java=UTF-8
+encoding//test/io/openems/edge/evse/chargepoint/hardybarth/cph2/EvseChargePointHardyImplTest.java=UTF-8
+encoding//test/io/openems/edge/evse/chargepoint/hardybarth/cph2/MyConfig.java=UTF-8
 encoding/<project>=UTF-8
 encoding/bnd.bnd=UTF-8
 encoding/readme.adoc=UTF-8

io.openems.edge.evse.chargepoint.hardybarth/readme.adoc

@@ -1,12 +1,13 @@
-= Hardy Barth Salia Charging Station
+= Hardy Barth Charging Stations
 
-Three-phase AC charging station with REST API integration.
+Three-phase AC charging stations with REST API integration.
 
 == Overview
 
-This bundle provides integration with the Salia charging station by Hardy Barth, a three-phase AC electric vehicle charging station designed for commercial and residential charging applications. The station communicates via REST API over IP for flexible integration with energy management systems.
+This bundle provides integration with Hardy Barth charging stations. Two device families are supported, each using a different REST API:
 
-Hardy Barth Salia is suitable for commercial charging networks, workplace charging, and site energy management requiring three-phase charging integration.
+* **Hardy Barth Salia** (`Evcs.HardyBarth`, `Evse.ChargePoint.HardyBarth`) – Salia controller API (`/api/secc`)
+* **Hardy Barth cPH1 (ECB1)** (`Evse.ChargePoint.HardyBarth.cPH1`) – eCharge ECB1 REST API (`/api/v1/chargecontrols/`, `/api/v1/meters/`)
 
 == Supported Devices
 
@@ -83,4 +84,64 @@ This bundle implements the following OpenEMS Components:
 
 [[_evcs_hardy]]
 
+=== <<_evse_cph1,EVSE Charge-Point Hardy Barth cPH1>>
+
+*Name*: EVSE Charge-Point Hardy Barth cPH1
+
+*Factory-PID*: `Evse.ChargePoint.HardyBarth.cPH1`
+
+.Implemented Natures/Interfaces
+* EvseChargePointHardyBarthEcb1
+* OpenemsComponent
+* EvseChargePoint
+* ElectricityMeter
+
+*Description*: EVSE interface for the Hardy Barth eCharge cPH1 wallbox (EVCC Basic controller, ECB1 REST API).
+Reads charge-control status and meter data from `/api/v1/chargecontrols/{id}` and `/api/v1/meters/{id}`.
+Write operations (start, stop, set current) are dispatched as HTTP POST requests.
+
+.*Configuration*:
+
+* `id` (String): Component ID for unique identification (default: "evseChargePoint0")
+* `alias` (String): Human-readable alias for the component
+* `enabled` (Boolean): Enable/disable this component
+* `ip` (String): IP address of the cPH1 wallbox (required, e.g. "192.168.2.8")
+* `chargeControlId` (Integer): Charge-control unit ID (default: 1)
+* `meterId` (Integer): Energy-meter ID (default: 1)
+* `minHwCurrent` (Integer): Minimum hardware current in mA (default: 6000)
+* `maxHwCurrent` (Integer): Maximum hardware current in mA (default: 32000)
+* `phaseRotation` (PhaseRotation): Phase wiring configuration (default: L1_L2_L3)
+* `readOnly` (Boolean): Read-only mode (monitoring only) vs managed control (default: false)
+
+.ECB1 API Endpoints Used
+|===
+| Operation | Method | Endpoint
+
+| Read charge-control status
+| GET
+| `/api/v1/chargecontrols/{id}`
+
+| Read meter data
+| GET
+| `/api/v1/meters/{id}`
+
+| Set manual mode
+| POST
+| `/api/v1/chargecontrols/{id}/mode` (`mode=manual`)
+
+| Start charging
+| POST
+| `/api/v1/chargecontrols/{id}/start`
+
+| Stop charging
+| POST
+| `/api/v1/chargecontrols/{id}/stop`
+
+| Set current
+| POST
+| `/api/v1/chargecontrols/{id}/mode/manual/ampere` (`manualmodeamp={A}`)
+|===
+
+[[_evse_cph1]]
+
 https://github.com/OpenEMS/openems/tree/develop/io.openems.edge.evse.chargepoint.hardybarth[Source Code icon:github[]]

io.openems.edge.evse.chargepoint.hardybarth/src/io/openems/edge/evse/chargepoint/hardybarth/common/DeviceRole.java

@@ -31,7 +31,7 @@ public enum DeviceRole {
 	 * {@link #UNKNOWN}.
 	 *
 	 * @param modelName salia device model name
-	 * @param product raw device product
+	 * @param product   raw device product
 	 * @return device role
 	 */
 	public static DeviceRole fromModelNameAndProduct(String modelName, String product) {
@@ -41,11 +41,13 @@ public static DeviceRole fromModelNameAndProduct(String modelName, String produc
 			return result;
 		}
 
-		if (modelName.toUpperCase().contains(DeviceRole.MASTER.name()) && product.trim().equals(DeviceRole.MASTER.product)) {
+		if (modelName.toUpperCase().contains(DeviceRole.MASTER.name())
+				&& product.trim().equals(DeviceRole.MASTER.product)) {
 			result = MASTER;
 		}
 
-		if (modelName.toUpperCase().contains(DeviceRole.SLAVE.name()) && product.trim().equals(DeviceRole.SLAVE.product)) {
+		if (modelName.toUpperCase().contains(DeviceRole.SLAVE.name())
+				&& product.trim().equals(DeviceRole.SLAVE.product)) {
 			result = SLAVE;
 		}
 

io.openems.edge.evse.chargepoint.hardybarth/src/io/openems/edge/evse/chargepoint/hardybarth/common/HardyBarth.java

@@ -27,8 +27,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId, PathP
 				"secc", "port0", "ci", "evse", "basic", "grid_current_limit", "actual"), //
 		RAW_PHASE_COUNT(Doc.of(INTEGER), //
 				"secc", "port0", "ci", "evse", "basic", "phase_count"), //
-		RAW_PHYSICAL_CURRENT_LIMIT(Doc.of(STRING),
-				"secc", "port0", "ci", "evse", "basic", "physical_current_limit"), //
+		RAW_PHYSICAL_CURRENT_LIMIT(Doc.of(STRING), "secc", "port0", "ci", "evse", "basic", "physical_current_limit"), //
 
 		// CHARGE
 		RAW_CHARGE_STATUS_PLUG(Doc.of(STRING), //
@@ -68,10 +67,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId, PathP
 				"secc", "port0", "salia", "firmwareprogress"), //
 		RAW_SALIA_PUBLISH(Doc.of(STRING), //
 				"secc", "port0", "salia", "publish"), //
-		RAW_SALIA_SOCKET_MAX_AMP(Doc.of(STRING),
-				"secc", "port0", "salia", "socketmaxamp"), //
-		RAW_SALIA_INTCTRL_LIMIT(Doc.of(STRING),
-				"secc", "port0", "salia", "intctrl_limit"), //
+		RAW_SALIA_SOCKET_MAX_AMP(Doc.of(STRING), "secc", "port0", "salia", "socketmaxamp"), //
+		RAW_SALIA_INTCTRL_LIMIT(Doc.of(STRING), "secc", "port0", "salia", "intctrl_limit"), //
 		RAW_SALIA_PHASE_SWITCHING_STATUS(Doc.of(STRING), //
 				"secc", "port0", "salia", "phase_switching", "status"), //
 
@@ -255,6 +252,7 @@ public default StringReadChannel getRawDeviceModelNameChannel() {
 
 	/**
 	 * get Salia Device Model Name.
+	 * 
 	 * @return channel value
 	 */
 	public default String getSaliaDeviceModelName() {
@@ -263,6 +261,7 @@ public default String getSaliaDeviceModelName() {
 
 	/**
 	 * get Raw Device Product Channel.
+	 * 
 	 * @return the channel
 	 */
 	public default StringReadChannel getRawDeviceProductChannel() {
@@ -271,6 +270,7 @@ public default StringReadChannel getRawDeviceProductChannel() {
 
 	/**
 	 * get raw device product.
+	 * 
 	 * @return channel value
 	 */
 	public default String getRawDeviceProduct() {
@@ -281,8 +281,8 @@ public default String getRawDeviceProduct() {
 	 * Reports whether the phase-switching API is available.
 	 *
 	 * <p>
-	 * Detection is based on the raw
-	 * {@code secc/port0/salia/phase_switching/status} value:
+	 * Detection is based on the raw {@code secc/port0/salia/phase_switching/status}
+	 * value:
 	 * <ul>
 	 * <li>{@code "idle"} and {@code "progress"} indicate support.
 	 * <li>A missing, null, undefined or any unknown value indicates no support.
@@ -310,16 +310,15 @@ public default boolean hasPhaseSwitchingApi() {
 	 * Reports whether the phase-switching API is currently idle.
 	 *
 	 * <p>
-	 * This is true only if the raw
-	 * {@code secc/port0/salia/phase_switching/status} value is exactly
-	 * {@code "idle"}. A value of {@code "progress"} means a switch is already
-	 * ongoing, so a new one must not be started; missing, null, undefined or
-	 * unknown values return false.
+	 * This is true only if the raw {@code secc/port0/salia/phase_switching/status}
+	 * value is exactly {@code "idle"}. A value of {@code "progress"} means a switch
+	 * is already ongoing, so a new one must not be started; missing, null,
+	 * undefined or unknown values return false.
 	 *
 	 * <p>
-	 * This method evaluates only the API status. It does not verify the device
-	 * role or communication freshness and does not guarantee that a subsequent
-	 * write succeeds. Before controlling phase switching, callers must additionally
+	 * This method evaluates only the API status. It does not verify the device role
+	 * or communication freshness and does not guarantee that a subsequent write
+	 * succeeds. Before controlling phase switching, callers must additionally
 	 * verify that {@link #deviceRole()} is {@link DeviceRole#SLAVE}.
 	 *
 	 * @return true if the last mapped status is exactly {@code "idle"}

io.openems.edge.evse.chargepoint.hardybarth/src/io/openems/edge/evse/chargepoint/hardybarth/ChargePointStatus.java → io.openems.edge.evse.chargepoint.hardybarth/src/io/openems/edge/evse/chargepoint/hardybarth/cph2/ChargePointStatus.java

@@ -1,4 +1,4 @@
-package io.openems.edge.evse.chargepoint.hardybarth;
+package io.openems.edge.evse.chargepoint.hardybarth.cph2;
 
 import io.openems.common.types.OptionsEnum;
 

io.openems.edge.evse.chargepoint.hardybarth/src/io/openems/edge/evse/chargepoint/hardybarth/Config.java → io.openems.edge.evse.chargepoint.hardybarth/src/io/openems/edge/evse/chargepoint/hardybarth/cph2/Config.java

@@ -1,13 +1,13 @@
-package io.openems.edge.evse.chargepoint.hardybarth;
+package io.openems.edge.evse.chargepoint.hardybarth.cph2;
 
 import org.osgi.service.metatype.annotations.AttributeDefinition;
 import org.osgi.service.metatype.annotations.ObjectClassDefinition;
 
 import io.openems.edge.evse.chargepoint.hardybarth.common.LogVerbosity;
 import io.openems.edge.meter.api.PhaseRotation;
 
-@ObjectClassDefinition(name = "EVSE Charge-Point Hardy Barth", //
-		description = "The Hardy Barth P electric vehicle charging station")
+@ObjectClassDefinition(name = "EVSE Charge-Point Hardy Barth cPH2", //
+		description = "The Hardy Barth cPH2 electric vehicle charging station with Salia")
 @interface Config {
 
 	@AttributeDefinition(name = "Component-ID", description = "Unique ID of this Component")
@@ -31,5 +31,5 @@
 	@AttributeDefinition(name = "Log-Verbosity", description = "The log verbosity.")
 	LogVerbosity logVerbosity() default LogVerbosity.NONE;
 
-	String webconsole_configurationFactory_nameHint() default "EVSE Charge-Point Hardy Barth [{id}]";
+	String webconsole_configurationFactory_nameHint() default "EVSE Charge-Point Hardy Barth cPH2 [{id}]";
 }

io.openems.edge.evse.chargepoint.hardybarth/src/io/openems/edge/evse/chargepoint/hardybarth/EvseChargePointHardyBarth.java → io.openems.edge.evse.chargepoint.hardybarth/src/io/openems/edge/evse/chargepoint/hardybarth/cph2/EvseChargePointHardyBarth.java

@@ -1,4 +1,4 @@
-package io.openems.edge.evse.chargepoint.hardybarth;
+package io.openems.edge.evse.chargepoint.hardybarth.cph2;
 
 import io.openems.edge.common.channel.Channel;
 import io.openems.edge.common.channel.Doc;

io.openems.edge.evse.chargepoint.hardybarth/src/io/openems/edge/evse/chargepoint/hardybarth/EvseChargePointHardyBarthImpl.java → io.openems.edge.evse.chargepoint.hardybarth/src/io/openems/edge/evse/chargepoint/hardybarth/cph2/EvseChargePointHardyBarthImpl.java

@@ -1,4 +1,4 @@
-package io.openems.edge.evse.chargepoint.hardybarth;
+package io.openems.edge.evse.chargepoint.hardybarth.cph2;
 
 import static io.openems.common.utils.FunctionUtils.doNothing;
 import static io.openems.edge.common.event.EdgeEventConstants.TOPIC_CYCLE_AFTER_PROCESS_IMAGE;

io.openems.edge.evse.chargepoint.hardybarth/src/io/openems/edge/evse/chargepoint/hardybarth/EvseHandler.java → io.openems.edge.evse.chargepoint.hardybarth/src/io/openems/edge/evse/chargepoint/hardybarth/cph2/EvseHandler.java

@@ -1,4 +1,4 @@
-package io.openems.edge.evse.chargepoint.hardybarth;
+package io.openems.edge.evse.chargepoint.hardybarth.cph2;
 
 import static io.openems.common.types.OpenemsType.STRING;
 import static io.openems.edge.common.channel.ChannelUtils.setValue;