FEMS Backports 2025-03-11 (#3046)

* CI
  * App: update java version to 21 
    * Bump java dependency of capacitor to java 21

* Edge
  * ENTSO-E: fix missing data due to bad response
    - Provides a more robust and complete dataset by ensuring no timestamps are missing.
    - Previously, the min/max timestamps were derived only from the extracted response based on the preferred duration. Now, they are computed from the entire dataset, ensuring better coverage of all timestamps.
    - A new test case was introduced using an XML response that previously caused missing timestamp issues.
  * Time-of-Use-Tariffs: AppCenter: add max charge from grid setting
    * Added a property for every ToU app to set the maximale allowed charge from grid power
  * GoodWe: disable internal BatteryProtection
    - Disable internal goodwe battery protection called socProtect, that caused several problems.
    - After setting this register to 1, the maximum voltage values of the write-registers are used.
  * RabotCharge Time-of-Use-Tariff: fix price calculation
  * Home Battery: stop on critical min cell voltage
    * Battery values changed to null when there is no battery communication, because ModbusBridge invalidates all Modbus Channels then.
    * As a result the system restarted until it was in deep discharge. Use last defined value to check the minCellVoltage.
  * CleverPV: send EssDischargePower instead of EssActivePower
    * Clever-PV requires the actual battery charge/discharge power and not AC-side of hybrid inverter
  * Energy Scheduler v2: continuous improvements
    - Improve tests and logs
    - GridOptimizedCharge: fix possible NPE in EnergyScheduler
    - Improve InitialPopulation: this is crucial for v2. Because simulation is much slower, it is important to start with a good Initial Population. It is now possible for each EnergyScheduleHandler to suggest its own Initial Population (e.g. CHARGE_GRID in cheapest quarter)
    - Add index to GlobalOptimizationContext.Period, makes it easier to loop over them in a stream
    - Improve Jenetics Engine configuration: EliteSelector to make sure best Initial Populations survive; Alterers match better with the expected search task
    - Increase initial wait time to create GlobalOptimizationContext - e.g. for Home systems that require some time to read capacity
  * EVSE Edge Improvements
    - Add SURPLUS mode to EVSE Single Controller (works with only one EVSE simultaneously at the moment)
    - Add `manualEnergySessionLimit` and ENERGY_SESSION channels - only considered in EnergyScheduleHandler at the moment!
    - Add Energy Scheduler Simulation for manual modes (ZERO, MINIMUM, SURPLUS and FORCE)
    - EVSE KEBA via Modbus/TCP:
      - Add PhaseRotation
      - Calculate/distribute Power per phase
  * Home Battery: use new register for number of towers
    - New ATL versions cannot guarantee a value for TOWER_X_BMS_SOFTWARE_VERSION. This makes it impossible to calculate the number of towers based on this values.
    - The new Register was not present in the initial test version but should have been available since the first container shipment.
  * **Time-of-Use App Octopus Go**
  * Energy Scheduler v2 + EVSE: general improvements
    - Sinexcel: use static imports; drop unused EventTopics
    - Energy Scheduler v2
      - Fix unique ID per EnergyScheduleHandler
    - EVSE
      - ClusterCtrl: move logic to testable static method
      - SingleCtrl: implement SESSION_ENERGY, manualEnergySessionLimit config property and SESSION_LIMIT_REACHED
      - KEBA: separte hardware wiring from S10 configuration

* UI
  * Refactor Fixdigitaloutput modal with formGroup
    * Creating unit testable form with formGroup for modals
  * EVSE UI Improvements: add mode SURPLUS
  * fix display of dimming in grid
    * Hiding and showing of dimming in grid history was not applied right
  * Replace manual component configurator with Estimated Configuration response
  * Use fallback LIGHT_MODE for them popover selection
    * Using fallback theme `LIGHT` if popover has been closed without choosing a theme
  * Change tooltip display state for heatpump
    * Fixing tooltip displayed heatpump state
  * Change chartjs hover over pointer style
    - Improving chartjs hover mode, point out currently selected timestamps respective datasets value
    - Refactoring currentEdge observable to signal -> resolving lifecycle issue
  * fix chartjs legend display error
      Legend Labels not generated

---------

Co-authored-by: Stefan Feilmeier <[email protected]>
Co-authored-by: Sagar Venu <[email protected]>
Co-authored-by: Michael Grill <[email protected]>
Co-authored-by: Sebastian Asen <[email protected]>
Co-authored-by: Lukas Rieger <[email protected]>
Co-authored-by: Kai Jeschek <[email protected]>

Author: 6 people

io.openems.common/src/io/openems/common/oem/DummyOpenemsEdgeOem.java

@@ -72,6 +72,7 @@ public SystemUpdateParams getSystemUpdateParams() {
 			.put("App.TimeOfUseTariff.ENTSO-E", "") //
 			.put("App.TimeOfUseTariff.GroupeE", "") //
 			.put("App.TimeOfUseTariff.Hassfurt", "") //
+			.put("App.TimeOfUseTariff.OctopusGo", "") //
 			.put("App.TimeOfUseTariff.RabotCharge", "") //
 			.put("App.TimeOfUseTariff.Stromdao", "") //
 			.put("App.TimeOfUseTariff.Swisspower", "") //

io.openems.edge.application/EdgeApp.bndrun

@@ -199,6 +199,7 @@
 	bnd.identity;id='io.openems.edge.timeofusetariff.entsoe',\
 	bnd.identity;id='io.openems.edge.timeofusetariff.groupe',\
 	bnd.identity;id='io.openems.edge.timeofusetariff.hassfurt',\
+	bnd.identity;id='io.openems.edge.timeofusetariff.manual',\
 	bnd.identity;id='io.openems.edge.timeofusetariff.rabotcharge',\
 	bnd.identity;id='io.openems.edge.timeofusetariff.swisspower',\
 	bnd.identity;id='io.openems.edge.timeofusetariff.tibber',\
@@ -393,6 +394,7 @@
 	io.openems.edge.timeofusetariff.entsoe;version=snapshot,\
 	io.openems.edge.timeofusetariff.groupe;version=snapshot,\
 	io.openems.edge.timeofusetariff.hassfurt;version=snapshot,\
+	io.openems.edge.timeofusetariff.manual;version=snapshot,\
 	io.openems.edge.timeofusetariff.rabotcharge;version=snapshot,\
 	io.openems.edge.timeofusetariff.swisspower;version=snapshot,\
 	io.openems.edge.timeofusetariff.tibber;version=snapshot,\

io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/BatteryFeneconHome.java

@@ -329,7 +329,8 @@ public static enum ChannelId implements io.openems.edge.common.channel.ChannelId
 		RACK_NUMBER_OF_BATTERY_BCU(Doc.of(OpenemsType.INTEGER) //
 				.unit(Unit.NONE) //
 				.accessMode(AccessMode.READ_ONLY) //
-				.text("Count Of The Connected BCU")),
+				.text("Count Of The Connected BCU") //
+				.onChannelChange(BatteryFeneconHomeImpl::updateNumberOfTowersAndModules)),
 		RACK_NUMBER_OF_CELLS_IN_SERIES_PER_MODULE(Doc.of(OpenemsType.INTEGER) //
 				.unit(Unit.NONE) //
 				.accessMode(AccessMode.READ_ONLY) //
@@ -633,32 +634,27 @@ public static enum ChannelId implements io.openems.edge.common.channel.ChannelId
 		TOWER_4_BMS_SOFTWARE_VERSION(new IntegerDoc() //
 				.unit(Unit.NONE) //
 				.accessMode(AccessMode.READ_ONLY) //
-				.text("Bms software version of fifth tower") //
-				.onChannelChange(BatteryFeneconHomeImpl::updateNumberOfTowersAndModules)),
+				.text("Bms software version of fifth tower")),
 
 		TOWER_3_BMS_SOFTWARE_VERSION(new IntegerDoc() //
 				.unit(Unit.NONE) //
 				.accessMode(AccessMode.READ_ONLY) //
-				.text("Bms software version of fourth tower") //
-				.onChannelChange(BatteryFeneconHomeImpl::updateNumberOfTowersAndModules)),
+				.text("Bms software version of fourth tower")),
 
 		TOWER_2_BMS_SOFTWARE_VERSION(new IntegerDoc() //
 				.unit(Unit.NONE) //
 				.accessMode(AccessMode.READ_ONLY) //
-				.text("Bms software version of third tower") //
-				.onChannelChange(BatteryFeneconHomeImpl::updateNumberOfTowersAndModules)),
+				.text("Bms software version of third tower")),
 
 		TOWER_1_BMS_SOFTWARE_VERSION(new IntegerDoc() //
 				.unit(Unit.NONE) //
 				.accessMode(AccessMode.READ_ONLY) //
-				.text("Bms software version of second tower") //
-				.onChannelChange(BatteryFeneconHomeImpl::updateNumberOfTowersAndModules)),
+				.text("Bms software version of second tower")),
 
 		TOWER_0_BMS_SOFTWARE_VERSION(new IntegerDoc() //
 				.unit(Unit.NONE) //
 				.accessMode(AccessMode.READ_ONLY) //
-				.text("Bms software version of first tower") //
-				.onChannelChange(BatteryFeneconHomeImpl::updateNumberOfTowersAndModules)),
+				.text("Bms software version of first tower")),
 
 		BATTERY_HARDWARE_TYPE(Doc.of(BatteryFeneconHomeHardwareType.values()) //
 				.onChannelChange(BatteryFeneconHomeImpl::updateNumberOfTowersAndModules)),
@@ -785,4 +781,32 @@ public default Value<Boolean> getLowMinVoltageFaultBatteryStopped() {
 	public default void _setLowMinVoltageFaultBatteryStopped(boolean value) {
 		this.getLowMinVoltageFaultBatteryStoppedChannel().setNextValue(value);
 	}
+
+	/**
+	 * Gets the Channel for {@link ChannelId#RACK_NUMBER_OF_BATTERY_BCU}.
+	 *
+	 * @return the Channel
+	 */
+	public default IntegerReadChannel getRackNumberOfBatteryBcuChannel() {
+		return this.channel(ChannelId.RACK_NUMBER_OF_BATTERY_BCU);
+	}
+
+	/**
+	 * Gets the Channel for {@link ChannelId#NUMBER_OF_TOWERS}.
+	 *
+	 * @return the Channel
+	 */
+	public default IntegerReadChannel getNumberOfTowersChannel() {
+		return this.channel(ChannelId.NUMBER_OF_TOWERS);
+	}
+
+	/**
+	 * Internal method to set the 'nextValue' on {@link ChannelId#NUMBER_OF_TOWERS}
+	 * Channel.
+	 *
+	 * @param value the next value
+	 */
+	public default void _setNumberOfTowers(Integer value) {
+		this.getNumberOfTowersChannel().setNextValue(value);
+	}
 }

io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/BatteryFeneconHomeImpl.java

@@ -6,7 +6,6 @@
 import static io.openems.edge.bridge.modbus.api.ModbusUtils.FunctionCode.FC3;
 
 import java.time.Instant;
-import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 
@@ -59,7 +58,6 @@
 import io.openems.edge.common.channel.ChannelId.ChannelIdImpl;
 import io.openems.edge.common.channel.ChannelUtils;
 import io.openems.edge.common.channel.Doc;
-import io.openems.edge.common.channel.IntegerReadChannel;
 import io.openems.edge.common.channel.internal.OpenemsTypeDoc;
 import io.openems.edge.common.component.ComponentManager;
 import io.openems.edge.common.component.OpenemsComponent;
@@ -88,6 +86,7 @@ public class BatteryFeneconHomeImpl extends AbstractOpenemsModbusComponent imple
 	public static final int DEFAULT_CRITICAL_MIN_VOLTAGE = 2800;
 	protected static final int TIMEOUT = 600; // [10 minutes in seconds]
 	private Instant timeCriticalMinVoltage;
+	private Integer lastKnownMinVoltage;
 
 	protected final StateMachine stateMachine = new StateMachine(State.UNDEFINED);
 
@@ -149,8 +148,8 @@ public void handleEvent(Event event) {
 			this.batteryProtection.apply();
 			break;
 		case EdgeEventConstants.TOPIC_CYCLE_AFTER_PROCESS_IMAGE:
-			this.checkCriticalMinVoltage();
 			this.handleStateMachine();
+			this.checkCriticalMinVoltage();
 			break;
 		}
 	}
@@ -465,44 +464,21 @@ public StartStop getStartStopTarget() {
 	 * associated channel value could be read with the aid of
 	 * {@link ChannelUtils#getValues}. However, startup time is once again involved
 	 * in this process. This indicates that the last callback will have been made
-	 * before the record is set. Furthermore, there is no certainty that the
-	 * "software version channel value change" will occur, making it unlikely for
-	 * this to trigger a callback.
+	 * before the record is set.
 	 */
 	protected synchronized void updateNumberOfTowersAndModules() {
 		Channel<Integer> numberOfModulesPerTowerChannel = this
 				.channel(BatteryFeneconHome.ChannelId.NUMBER_OF_MODULES_PER_TOWER);
 		var numberOfModulesPerTowerOpt = numberOfModulesPerTowerChannel.value();
 
-		// Were all required registers read?
 		if (!numberOfModulesPerTowerOpt.isDefined()) {
 			return;
 		}
 
-		// Evaluate the total number of towers by reading the software versions of
-		// towers 2 and 3: they are '0' when the respective tower is not available.
-		final var softwareVersionlist = List.of(//
-				BatteryFeneconHome.ChannelId.TOWER_0_BMS_SOFTWARE_VERSION, //
-				BatteryFeneconHome.ChannelId.TOWER_1_BMS_SOFTWARE_VERSION, //
-				BatteryFeneconHome.ChannelId.TOWER_2_BMS_SOFTWARE_VERSION, //
-				BatteryFeneconHome.ChannelId.TOWER_3_BMS_SOFTWARE_VERSION, //
-				BatteryFeneconHome.ChannelId.TOWER_4_BMS_SOFTWARE_VERSION//
-		) //
-				.stream() //
-				.map(c -> {
-					IntegerReadChannel channel = this.channel(c);
-					return channel.value().get();
-				}) //
-				.toList();
-
-		final var numberOfTowers = calculateTowerNumberFromSoftwareVersion(softwareVersionlist);
-
-		// Write 'TOWER_NUMBER' Debug Channel
-		Channel<?> numberOfTowersChannel = this.channel(BatteryFeneconHome.ChannelId.NUMBER_OF_TOWERS);
-		numberOfTowersChannel.setNextValue(numberOfTowers);
-		if (numberOfTowers == null) {
-			return;
-		}
+		// Register for NumberOfBatteryBcu was not existing in the very first firmware -
+		// at least one tower is used.
+		final var numberOfTowers = this.getRackNumberOfBatteryBcuChannel().getNextValue().orElse(1);
+		this._setNumberOfTowers(numberOfTowers);
 
 		final var moduleMaxVoltage = this.getBatteryHardwareType().moduleMaxVoltage;
 		final var moduleMinVoltage = this.getBatteryHardwareType().moduleMinVoltage;
@@ -523,21 +499,6 @@ protected synchronized void updateNumberOfTowersAndModules() {
 		}
 	}
 
-	protected static Integer calculateTowerNumberFromSoftwareVersion(List<Integer> versionList) {
-		var numberOfTowers = 0;
-		for (var version : versionList) {
-			if (version == null) {
-				return null;
-			}
-			if (version == 0 || version == 256) {
-				// Ensure number of towers is never '0' if registers are not null.
-				return Math.max(1, numberOfTowers);
-			}
-			numberOfTowers++;
-		}
-		return numberOfTowers;
-	}
-
 	private int lastNumberOfTowers = 0;
 	private int lastNumberOfModulesPerTower = 0;
 
@@ -1064,55 +1025,54 @@ public ModbusProtocol getDefinedModbusProtocol() {
 	}
 
 	private void checkCriticalMinVoltage() {
-
-		final var subState = getMinVoltageSubState(DEFAULT_CRITICAL_MIN_VOLTAGE,
-				this.getMinCellVoltage().orElse(Integer.MAX_VALUE), this.getCurrent().orElse(0));
+		final Integer currentMinVoltage;
+		if (this.getMinCellVoltage().isDefined()) {
+			currentMinVoltage = this.getMinCellVoltage().get();
+			this.lastKnownMinVoltage = currentMinVoltage;
+		} else {
+			currentMinVoltage = this.lastKnownMinVoltage;
+		}
+		final var subState = getMinVoltageSubState(DEFAULT_CRITICAL_MIN_VOLTAGE, currentMinVoltage,
+				this.getCurrent().get());
 		var now = Instant.now(this.componentManager.getClock());
 
+		boolean batWillStoppWarning = false;
+		boolean batIsStoppingFault = false;
+		boolean batStoppedFault = false;
+
 		switch (subState) {
-		case ABOVE_LIMIT -> {
-			this._setLowMinVoltageFault(false);
-			this._setLowMinVoltageWarning(false);
-			this._setLowMinVoltageFaultBatteryStopped(false);
-			this.timeCriticalMinVoltage = null;
-		}
+		case ABOVE_LIMIT -> this.timeCriticalMinVoltage = null;
 		case BELOW_LIMIT -> {
-
 			if (this.stateMachine.getCurrentState() == StateMachine.State.STOPPED) {
-				this._setLowMinVoltageFaultBatteryStopped(true);
-				this._setLowMinVoltageFault(false);
-				this._setLowMinVoltageWarning(false);
-				return;
-			}
-
-			this._setLowMinVoltageFaultBatteryStopped(false);
-
-			if (this.timeCriticalMinVoltage == null) {
-				this.timeCriticalMinVoltage = now;
-			}
-
-			if (this.timeCriticalMinVoltage.isBefore(now.minusSeconds(TIMEOUT))) {
-				this._setLowMinVoltageFault(true);
-				this._setLowMinVoltageWarning(false);
-				return;
+				batStoppedFault = true;
+			} else {
+				if (this.timeCriticalMinVoltage == null) {
+					this.timeCriticalMinVoltage = now;
+				}
+				batIsStoppingFault = this.timeCriticalMinVoltage.isBefore(now.minusSeconds(TIMEOUT));
+				batWillStoppWarning = !batIsStoppingFault;
 			}
-			this._setLowMinVoltageWarning(true);
-			this._setLowMinVoltageFault(false);
 		}
 		case BELOW_LIMIT_CHARGING -> {
-			this._setLowMinVoltageFaultBatteryStopped(false);
-			this._setLowMinVoltageWarning(true);
-			this._setLowMinVoltageFault(false);
+			batWillStoppWarning = true;
 			this.timeCriticalMinVoltage = null;
 		}
 		}
+
+		this._setLowMinVoltageWarning(batWillStoppWarning);
+		this._setLowMinVoltageFault(batIsStoppingFault);
+		this._setLowMinVoltageFaultBatteryStopped(batStoppedFault);
 	}
 
-	protected static MinVoltageSubState getMinVoltageSubState(int minVoltageLimit, int currentMinVoltage, int current) {
+	protected static MinVoltageSubState getMinVoltageSubState(int minVoltageLimit, Integer currentMinVoltage,
+			Integer current) {
+		if (currentMinVoltage == null) {
+			return MinVoltageSubState.ABOVE_LIMIT;
+		}
 		if (currentMinVoltage > minVoltageLimit) {
 			return MinVoltageSubState.ABOVE_LIMIT;
 		}
-		if (current < 0) {
+		if (current != null && current < 0) {
 			return MinVoltageSubState.BELOW_LIMIT_CHARGING;
 		}
 		return MinVoltageSubState.BELOW_LIMIT;
@@ -1123,4 +1083,4 @@ protected static enum MinVoltageSubState {
 		BELOW_LIMIT, //
 		BELOW_LIMIT_CHARGING; //
 	}
-}
+}

io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/statemachine/StoppedHandler.java

@@ -1,6 +1,5 @@
 package io.openems.edge.battery.fenecon.home.statemachine;
 
-import io.openems.edge.battery.fenecon.home.BatteryFeneconHomeImpl;
 import io.openems.edge.battery.fenecon.home.statemachine.StateMachine.State;
 import io.openems.edge.common.startstop.StartStop;
 import io.openems.edge.common.statemachine.StateHandler;
@@ -11,23 +10,7 @@ public class StoppedHandler extends StateHandler<State, Context> {
 	public State runAndGetNextState(Context context) {
 		final var battery = context.getParent();
 
-		final int currentMinVoltage;
-		if (battery.getMinCellVoltage().isDefined()) {
-			currentMinVoltage = battery.getMinCellVoltage().get();
-		} else {
-			currentMinVoltage = battery.getMinCellVoltageChannel().getPastValues().lastEntry().getValue()
-					.orElse(Integer.MAX_VALUE);
-		}
-
-		if (currentMinVoltage < BatteryFeneconHomeImpl.DEFAULT_CRITICAL_MIN_VOLTAGE) {
-			battery._setLowMinVoltageFaultBatteryStopped(true);
-		} else {
-			battery._setLowMinVoltageFaultBatteryStopped(false);
-		}
-
-		// Mark as started
 		battery._setStartStop(StartStop.STOP);
 		return State.STOPPED;
 	}
-
 }