Merge branch 'release/2024.12.0'

.github/workflows/build.yml

@@ -41,7 +41,7 @@ jobs:
         run: ./gradlew jacocoTestReport
 
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           flags: java
           token: ${{ secrets.CODECOV_TOKEN }}
@@ -76,7 +76,7 @@ jobs:
           npm run test -- --code-coverage --no-watch --no-progress --browsers=ChromeHeadlessCI
 
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           flags: ui
           directory: ./ui/

.gradle-wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

cnf/pom.xml

@@ -97,7 +97,7 @@
 			<!-- HikariCP A solid, high-performance, JDBC connection pool at last. -->
 			<groupId>com.zaxxer</groupId>
 			<artifactId>HikariCP</artifactId>
-			<version>6.0.0</version>
+			<version>6.2.1</version>
 		</dependency>
 		<!-- de -->
 		<dependency>
@@ -284,14 +284,14 @@
 			<!-- https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk18on -->
 			<groupId>org.bouncycastle</groupId>
 			<artifactId>bcpkix-jdk18on</artifactId>
-			<version>1.78.1</version>
+			<version>1.79</version>
 		</dependency>
 		<dependency>
 			<!-- Bouncycastle for Eclipse Paho MQTTv5 Client -->
 			<!-- https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk18on -->
 			<groupId>org.bouncycastle</groupId>
 			<artifactId>bcprov-jdk18on</artifactId>
-			<version>1.78.1</version>
+			<version>1.79</version>
 		</dependency>
 		<dependency>
 			<groupId>org.dhatim</groupId>

codecov.yml

@@ -1,11 +1,19 @@
+codecov:
+  require_ci_to_pass: true
+  notify:
+    wait_for_ci: true
+
 coverage:
   round: up
   precision: 2
   status:
     project:
       default:
         target: auto
-        threshold: 10%
+        threshold: 1%
+    patch:
+      default:
+        target: 75%
 
 comment:
   layout: "condensed_header, diff"
@@ -42,4 +50,4 @@ component_management:
     - component_id: openems_ui
       name: "OpenEMS UI"
       paths:
-        - ui/**
+        - ui/**

io.openems.backend.application/BackendApp.bndrun

@@ -65,7 +65,7 @@
 	com.google.guava;version='[33.3.1,33.3.2)',\
 	com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\
 	com.squareup.okio;version='[3.9.1,3.9.2)',\
-	com.zaxxer.HikariCP;version='[6.0.0,6.0.1)',\
+	com.zaxxer.HikariCP;version='[6.2.1,6.2.2)',\
 	io.openems.backend.alerting;version=snapshot,\
 	io.openems.backend.application;version=snapshot,\
 	io.openems.backend.b2brest;version=snapshot,\

io.openems.common/src/io/openems/common/OpenemsConstants.java

@@ -22,7 +22,7 @@ public class OpenemsConstants {
 	 * <p>
 	 * This is the month of the release.
 	 */
-	public static final short VERSION_MINOR = 11;
+	public static final short VERSION_MINOR = 12;
 
 	/**
 	 * The patch version of OpenEMS.

io.openems.common/src/io/openems/common/channel/Unit.java

@@ -38,6 +38,11 @@ public enum Unit {
 	 */
 	THOUSANDTH("‰"),
 
+	/**
+	 * Ten Thousandth [‰], 0-10000.
+	 */
+	TENTHOUSANDTH("0.1‰"),
+
 	/**
 	 * On or Off.
 	 */
@@ -91,6 +96,11 @@ public enum Unit {
 	 */
 	VOLT("V"),
 
+	/**
+	 * Unit of Voltage [dV].
+	 */
+	DEZIVOLT("dV", VOLT, -1),
+
 	/**
 	 * Unit of Voltage [mV].
 	 */
@@ -110,6 +120,11 @@ public enum Unit {
 	 */
 	AMPERE("A"),
 
+	/**
+	 * Unit of Current [dA].
+	 */
+	DEZIAMPERE("dA", AMPERE, -1),
+
 	/**
 	 * Unit of Current [mA].
 	 */
@@ -368,7 +383,8 @@ public String format(Object value, OpenemsType type) {
 				MILLIWATT, WATT_HOURS, OHM, KILOOHM, SECONDS, AMPERE_HOURS, HOUR, CUMULATED_SECONDS, KILOAMPERE_HOURS,
 				KILOVOLT_AMPERE, KILOVOLT_AMPERE_REACTIVE, KILOVOLT_AMPERE_REACTIVE_HOURS, KILOWATT_HOURS, MICROOHM,
 				MILLIAMPERE_HOURS, MILLIOHM, MILLISECONDS, MINUTE, THOUSANDTH, VOLT_AMPERE_HOURS,
-				VOLT_AMPERE_REACTIVE_HOURS, WATT_HOURS_BY_WATT_PEAK, CUMULATED_WATT_HOURS, BAR, MILLIBAR -> //
+				VOLT_AMPERE_REACTIVE_HOURS, WATT_HOURS_BY_WATT_PEAK, CUMULATED_WATT_HOURS, BAR, MILLIBAR, TENTHOUSANDTH,
+				DEZIAMPERE, DEZIVOLT -> //
 			value + " " + this.symbol;
 
 		case ON_OFF -> //

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

@@ -60,7 +60,10 @@ public SystemUpdateParams getSystemUpdateParams() {
 			.put("App.FENECON.Home", "https://fenecon.de/fenecon-home-10/") //
 			.put("App.FENECON.Home.20", "https://fenecon.de/fenecon-home-20-30/") //
 			.put("App.FENECON.Home.30", "https://fenecon.de/fenecon-home-20-30/") //
-			.put("App.FENECON.Commercial.92", "https://fenecon.de/fenecon-commercial/") //
+			.put("App.FENECON.Home6", "https://fenecon.de/fenecon-home-6-10-15/") //
+			.put("App.FENECON.Home10.Gen2", "https://fenecon.de/fenecon-home-6-10-15/") //
+			.put("App.FENECON.Home15", "https://fenecon.de/fenecon-home-6-10-15/") //
+			.put("App.FENECON.Commercial.92", "https://fenecon.de/fenecon-commercial-92/") //
 			.put("App.FENECON.Industrial.L.ILK710", "https://fenecon.de/fenecon-industrial-l/") //
 			.put("App.FENECON.Industrial.S.ISK010", "https://fenecon.de/fenecon-industrial-s/") //
 			.put("App.FENECON.Industrial.S.ISK110", "https://fenecon.de/fenecon-industrial-s/") //

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

@@ -1,5 +1,7 @@
 package io.openems.common.oem;
 
+import io.openems.common.types.Tuple;
+
 public interface OpenemsEdgeOem {
 
 	// NOTE: Following values are adopted from SunSpec "Common Model"
@@ -133,4 +135,20 @@ public default String getEntsoeToken() {
 		return null;
 	}
 
+	public record OAuthClientRegistration(String clientId, String clientSecret) {
+	}
+
+	public default OAuthClientRegistration getRabotChargeCredentials() {
+		return null;
+	}
+
+	/**
+	 * Gets the OEM authorization for Battery.BMW.
+	 * 
+	 * @return the value
+	 */
+	public default Tuple<String, String> getBmwBatteryAuth() {
+		return null;
+	}
+
 }

io.openems.common/src/io/openems/common/types/Tuple.java

@@ -0,0 +1,18 @@
+package io.openems.common.types;
+
+public record Tuple<A, B>(A a, B b) {
+
+	/**
+	 * Factory for a {@link Tuple}.
+	 * 
+	 * @param <A> Type of a
+	 * @param <B> Type of b
+	 * @param a   value a
+	 * @param b   value b
+	 * @return a new Tuple
+	 */
+	public static <A, B> Tuple<A, B> of(A a, B b) {
+		return new Tuple<>(a, b);
+	}
+
+}

io.openems.edge.application/EdgeApp.bndrun

@@ -195,9 +195,9 @@
 
 -runbundles: \
 	Java-WebSocket;version='[1.5.4,1.5.5)',\
-	bcpkix;version='[1.78.1,1.78.2)',\
-	bcprov;version='[1.78.1,1.78.2)',\
-	bcutil;version='[1.78.1,1.78.2)',\
+	bcpkix;version='[1.79.0,1.79.1)',\
+	bcprov;version='[1.79.0,1.79.1)',\
+	bcutil;version='[1.79.0,1.79.1)',\
 	com.fasterxml.aalto-xml;version='[1.3.3,1.3.4)',\
 	com.fazecast.jSerialComm;version='[2.10.4,2.10.5)',\
 	com.ghgande.j2mod;version='[3.2.1,3.2.2)',\

io.openems.edge.battery.bmw/bnd.bnd

@@ -8,8 +8,10 @@ Bundle-Version: 1.0.0.${tstamp}
 	com.ghgande.j2mod,\
 	io.openems.common,\
 	io.openems.edge.battery.api,\
+	io.openems.edge.bridge.http,\
 	io.openems.edge.bridge.modbus,\
-	io.openems.edge.common
+	io.openems.edge.common,\
+	io.openems.edge.io.api,\
 
 -testpath: \
 	${testpath}