EVCS HardyBarth: improve phase and status detection (OpenEMS#2239)

Author: sebastianasen

io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/EvcsHardyBarthImpl.java

@@ -76,6 +76,7 @@ private void activate(ComponentContext context, Config config) {
 		this._setFixedMinimumHardwarePower(config.minHwCurrent() / 1000 * 3 * 230);
 		this._setFixedMaximumHardwarePower(config.maxHwCurrent() / 1000 * 3 * 230);
 		this._setPowerPrecision(230);
+		this._setPhases(Phases.THREE_PHASE);
 
 		if (config.enabled()) {
 			this.api = new HardyBarthApi(config.ip(), this);
@@ -249,7 +250,6 @@ private boolean setTarget(int current) throws OpenemsNamedException {
 		if (current > 0) {
 			// Send stop pause request
 			resultPause = this.api.sendPutRequest("/api/secc", "salia/pausecharging", "" + 0);
-			this.debugLog("Wake up HardyBarth " + this.alias() + " from the pause");
 		} else {
 			// Send pause charging request
 			resultPause = this.api.sendPutRequest("/api/secc", "salia/pausecharging", "" + 1);

io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/HardyBarthReadWorker.java

@@ -17,6 +17,7 @@ public class HardyBarthReadWorker extends AbstractCycleWorker {
 
 	private final EvcsHardyBarthImpl parent;
 	private int chargingFinishedCounter = 0;
+	private int errorCounter = 0;
 
 	public HardyBarthReadWorker(EvcsHardyBarthImpl parent) {
 		this.parent = parent;
@@ -92,29 +93,29 @@ private void setEvcsChannelIds(JsonElement json) {
 		var powerL2 = (Long) this.getValueForChannel(EvcsHardyBarth.ChannelId.RAW_ACTIVE_POWER_L2, json);
 		var powerL3 = (Long) this.getValueForChannel(EvcsHardyBarth.ChannelId.RAW_ACTIVE_POWER_L3, json);
 
-		Integer phases = null;
+		// TODO: Handle phases, having each phase value in the Nature
+		// Keep last value if no power value was given
+		var phases = this.parent.getPhasesAsInt();
 		if (powerL1 != null && powerL2 != null && powerL3 != null) {
 
 			var sum = powerL1 + powerL2 + powerL3;
 
-			if (sum > 900) {
+			if (sum > 300) {
 				phases = 0;
 
-				if (powerL1 >= 300) {
+				if (powerL1 >= 100) {
 					phases += 1;
 				}
-				if (powerL2 >= 300) {
+				if (powerL2 >= 100) {
 					phases += 1;
 				}
-				if (powerL3 >= 300) {
+				if (powerL3 >= 100) {
 					phases += 1;
 				}
 			}
 		}
 		this.parent._setPhases(phases);
-		if (phases != null) {
-			this.parent.debugLog("Used phases: " + phases);
-		}
+		this.parent.debugLog("Used phases: " + phases);
 
 		// CHARGE_POWER
 		var chargePowerLong = (Long) this.getValueFromJson(Evcs.ChannelId.CHARGE_POWER, json, value -> {
@@ -129,32 +130,34 @@ private void setEvcsChannelIds(JsonElement json) {
 			return activePower < 100 ? 0 : activePower;
 		}, "secc", "port0", "metering", "power", "active_total", "actual");
 
-		//
 		this.parent._setChargePower(chargePowerLong == null ? null : chargePowerLong.intValue());
 
 		// STATUS
 		var status = (Status) this.getValueFromJson(EvcsHardyBarth.ChannelId.RAW_CHARGE_STATUS_CHARGEPOINT, json,
 				value -> {
+
 					String stringValue = TypeUtils.getAsType(OpenemsType.STRING, value);
 					if (stringValue == null) {
-						return Status.UNDEFINED;
+						this.errorCounter++;
+						this.parent.debugLog("Hardy Barth RAW_STATUS would be null! Raw value: " + value);
+						if (this.errorCounter > 3) {
+							return Status.ERROR;
+						}
+						return this.parent.getStatus();
 					}
 
-					Status rawStatus = Status.UNDEFINED;
-					switch (stringValue) {
-					case "A":
-						rawStatus = Status.NOT_READY_FOR_CHARGING;
-						break;
-					case "B":
-						rawStatus = Status.READY_FOR_CHARGING;
+					Status rawStatus = switch (stringValue) {
+					case "A" -> Status.NOT_READY_FOR_CHARGING;
+					case "B" -> {
+						var tmpStatus = Status.READY_FOR_CHARGING;
 
 						// Detect if the car is full
 						int chargePower = chargePowerLong == null ? 0 : chargePowerLong.intValue();
 						if (this.parent.getSetChargePowerLimit().orElse(0) >= this.parent.getMinimumHardwarePower()
 								.orElse(0) && chargePower <= 0) {
 
 							if (this.chargingFinishedCounter >= 90) {
-								rawStatus = Status.CHARGING_FINISHED;
+								tmpStatus = Status.CHARGING_FINISHED;
 							} else {
 								this.chargingFinishedCounter++;
 							}
@@ -163,25 +166,34 @@ private void setEvcsChannelIds(JsonElement json) {
 
 							// Charging rejected because we are forcing to pause charging
 							if (this.parent.getSetChargePowerLimit().orElse(0) == 0) {
-								rawStatus = Status.CHARGING_REJECTED;
+								tmpStatus = Status.CHARGING_REJECTED;
 							}
 						}
-						break;
-					case "C":
-					case "D":
-						rawStatus = Status.CHARGING;
-						break;
-					case "E":
-					case "F":
-						rawStatus = Status.ERROR;
-						break;
-					default:
-						rawStatus = Status.UNDEFINED;
-						break;
+						yield tmpStatus;
+					}
+					case "C", "D" -> Status.CHARGING;
+					case "E", "F" -> {
+						this.errorCounter++;
+						this.parent.debugLog("Hardy Barth RAW_STATUS would be an error! Raw value: " + stringValue
+								+ " - Error counter: " + this.errorCounter);
+						if (this.errorCounter > 3) {
+							yield Status.ERROR;
+						}
+						yield this.parent.getStatus();
 					}
-					if (stringValue.equals("B")) {
+					default -> {
+						this.parent.debugLog("State " + stringValue + " is not a valid state");
+						yield Status.UNDEFINED;
+					}
+					};
+
+					if (!stringValue.equals("B")) {
 						this.chargingFinishedCounter = 0;
 					}
+					if (!stringValue.equals("E") || !stringValue.equals("F")) {
+						this.errorCounter = 0;
+					}
+
 					return rawStatus;
 				}, "secc", "port0", "ci", "charge", "cp", "status");
 

io.openems.edge.evcs.hardybarth/test/io/openems/edge/evcs/hardybarth/EvcsHardyBarthImplTest.java

@@ -15,8 +15,8 @@ public void test() throws Exception {
 				.activate(MyConfig.create() //
 						.setId(COMPONENT_ID) //
 						.setIp("192.168.8.101") //
-						.setMaxHwCurrent(32) //
-						.setMinHwCurrent(6) //
+						.setMaxHwCurrent(32_000) //
+						.setMinHwCurrent(6_000) //
 						.build())
 				.next(new TestCase());
 	}