Skip to content

Commit 05532db

Browse files
sfeilmeiersfeilmeier
committed
Merge branch 'release/2024.12.0'
2 parents 61eb66f + 0cf8a9b commit 05532db

File tree

290 files changed

+8880
-4048
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

290 files changed

+8880
-4048
lines changed

‎.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
run: ./gradlew jacocoTestReport
4242

4343
- name: Upload coverage reports to Codecov
44-
uses: codecov/codecov-action@v4
44+
uses: codecov/codecov-action@v5
4545
with:
4646
flags: java
4747
token: ${{ secrets.CODECOV_TOKEN }}
@@ -76,7 +76,7 @@ jobs:
7676
npm run test -- --code-coverage --no-watch --no-progress --browsers=ChromeHeadlessCI
7777
7878
- name: Upload coverage reports to Codecov
79-
uses: codecov/codecov-action@v4
79+
uses: codecov/codecov-action@v5
8080
with:
8181
flags: ui
8282
directory: ./ui/

‎.gradle-wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎cnf/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
<!-- HikariCP A solid, high-performance, JDBC connection pool at last. -->
9898
<groupId>com.zaxxer</groupId>
9999
<artifactId>HikariCP</artifactId>
100-
<version>6.0.0</version>
100+
<version>6.2.1</version>
101101
</dependency>
102102
<!-- de -->
103103
<dependency>
@@ -284,14 +284,14 @@
284284
<!-- https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk18on -->
285285
<groupId>org.bouncycastle</groupId>
286286
<artifactId>bcpkix-jdk18on</artifactId>
287-
<version>1.78.1</version>
287+
<version>1.79</version>
288288
</dependency>
289289
<dependency>
290290
<!-- Bouncycastle for Eclipse Paho MQTTv5 Client -->
291291
<!-- https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk18on -->
292292
<groupId>org.bouncycastle</groupId>
293293
<artifactId>bcprov-jdk18on</artifactId>
294-
<version>1.78.1</version>
294+
<version>1.79</version>
295295
</dependency>
296296
<dependency>
297297
<groupId>org.dhatim</groupId>

‎codecov.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
1+
codecov:
2+
require_ci_to_pass: true
3+
notify:
4+
wait_for_ci: true
5+
16
coverage:
27
round: up
38
precision: 2
49
status:
510
project:
611
default:
712
target: auto
8-
threshold: 10%
13+
threshold: 1%
14+
patch:
15+
default:
16+
target: 75%
917

1018
comment:
1119
layout: "condensed_header, diff"
@@ -42,4 +50,4 @@ component_management:
4250
- component_id: openems_ui
4351
name: "OpenEMS UI"
4452
paths:
45-
- ui/**
53+
- ui/**

‎io.openems.backend.application/BackendApp.bndrun

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
com.google.guava;version='[33.3.1,33.3.2)',\
6666
com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\
6767
com.squareup.okio;version='[3.9.1,3.9.2)',\
68-
com.zaxxer.HikariCP;version='[6.0.0,6.0.1)',\
68+
com.zaxxer.HikariCP;version='[6.2.1,6.2.2)',\
6969
io.openems.backend.alerting;version=snapshot,\
7070
io.openems.backend.application;version=snapshot,\
7171
io.openems.backend.b2brest;version=snapshot,\

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class OpenemsConstants {
2222
* <p>
2323
* This is the month of the release.
2424
*/
25-
public static final short VERSION_MINOR = 11;
25+
public static final short VERSION_MINOR = 12;
2626

2727
/**
2828
* The patch version of OpenEMS.

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

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ public enum Unit {
3838
*/
3939
THOUSANDTH("‰"),
4040

41+
/**
42+
* Ten Thousandth [‰], 0-10000.
43+
*/
44+
TENTHOUSANDTH("0.1‰"),
45+
4146
/**
4247
* On or Off.
4348
*/
@@ -91,6 +96,11 @@ public enum Unit {
9196
*/
9297
VOLT("V"),
9398

99+
/**
100+
* Unit of Voltage [dV].
101+
*/
102+
DEZIVOLT("dV", VOLT, -1),
103+
94104
/**
95105
* Unit of Voltage [mV].
96106
*/
@@ -110,6 +120,11 @@ public enum Unit {
110120
*/
111121
AMPERE("A"),
112122

123+
/**
124+
* Unit of Current [dA].
125+
*/
126+
DEZIAMPERE("dA", AMPERE, -1),
127+
113128
/**
114129
* Unit of Current [mA].
115130
*/
@@ -368,7 +383,8 @@ public String format(Object value, OpenemsType type) {
368383
MILLIWATT, WATT_HOURS, OHM, KILOOHM, SECONDS, AMPERE_HOURS, HOUR, CUMULATED_SECONDS, KILOAMPERE_HOURS,
369384
KILOVOLT_AMPERE, KILOVOLT_AMPERE_REACTIVE, KILOVOLT_AMPERE_REACTIVE_HOURS, KILOWATT_HOURS, MICROOHM,
370385
MILLIAMPERE_HOURS, MILLIOHM, MILLISECONDS, MINUTE, THOUSANDTH, VOLT_AMPERE_HOURS,
371-
VOLT_AMPERE_REACTIVE_HOURS, WATT_HOURS_BY_WATT_PEAK, CUMULATED_WATT_HOURS, BAR, MILLIBAR -> //
386+
VOLT_AMPERE_REACTIVE_HOURS, WATT_HOURS_BY_WATT_PEAK, CUMULATED_WATT_HOURS, BAR, MILLIBAR, TENTHOUSANDTH,
387+
DEZIAMPERE, DEZIVOLT -> //
372388
value + " " + this.symbol;
373389

374390
case ON_OFF -> //

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,10 @@ public SystemUpdateParams getSystemUpdateParams() {
6060
.put("App.FENECON.Home", "https://fenecon.de/fenecon-home-10/") //
6161
.put("App.FENECON.Home.20", "https://fenecon.de/fenecon-home-20-30/") //
6262
.put("App.FENECON.Home.30", "https://fenecon.de/fenecon-home-20-30/") //
63-
.put("App.FENECON.Commercial.92", "https://fenecon.de/fenecon-commercial/") //
63+
.put("App.FENECON.Home6", "https://fenecon.de/fenecon-home-6-10-15/") //
64+
.put("App.FENECON.Home10.Gen2", "https://fenecon.de/fenecon-home-6-10-15/") //
65+
.put("App.FENECON.Home15", "https://fenecon.de/fenecon-home-6-10-15/") //
66+
.put("App.FENECON.Commercial.92", "https://fenecon.de/fenecon-commercial-92/") //
6467
.put("App.FENECON.Industrial.L.ILK710", "https://fenecon.de/fenecon-industrial-l/") //
6568
.put("App.FENECON.Industrial.S.ISK010", "https://fenecon.de/fenecon-industrial-s/") //
6669
.put("App.FENECON.Industrial.S.ISK110", "https://fenecon.de/fenecon-industrial-s/") //

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package io.openems.common.oem;
22

3+
import io.openems.common.types.Tuple;
4+
35
public interface OpenemsEdgeOem {
46

57
// NOTE: Following values are adopted from SunSpec "Common Model"
@@ -133,4 +135,20 @@ public default String getEntsoeToken() {
133135
return null;
134136
}
135137

138+
public record OAuthClientRegistration(String clientId, String clientSecret) {
139+
}
140+
141+
public default OAuthClientRegistration getRabotChargeCredentials() {
142+
return null;
143+
}
144+
145+
/**
146+
* Gets the OEM authorization for Battery.BMW.
147+
*
148+
* @return the value
149+
*/
150+
public default Tuple<String, String> getBmwBatteryAuth() {
151+
return null;
152+
}
153+
136154
}

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package io.openems.common.types;
2+
3+
public record Tuple<A, B>(A a, B b) {
4+
5+
/**
6+
* Factory for a {@link Tuple}.
7+
*
8+
* @param <A> Type of a
9+
* @param <B> Type of b
10+
* @param a value a
11+
* @param b value b
12+
* @return a new Tuple
13+
*/
14+
public static <A, B> Tuple<A, B> of(A a, B b) {
15+
return new Tuple<>(a, b);
16+
}
17+
18+
}

‎io.openems.edge.application/EdgeApp.bndrun

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,9 @@
195195

196196
-runbundles: \
197197
Java-WebSocket;version='[1.5.4,1.5.5)',\
198-
bcpkix;version='[1.78.1,1.78.2)',\
199-
bcprov;version='[1.78.1,1.78.2)',\
200-
bcutil;version='[1.78.1,1.78.2)',\
198+
bcpkix;version='[1.79.0,1.79.1)',\
199+
bcprov;version='[1.79.0,1.79.1)',\
200+
bcutil;version='[1.79.0,1.79.1)',\
201201
com.fasterxml.aalto-xml;version='[1.3.3,1.3.4)',\
202202
com.fazecast.jSerialComm;version='[2.10.4,2.10.5)',\
203203
com.ghgande.j2mod;version='[3.2.1,3.2.2)',\

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ Bundle-Version: 1.0.0.${tstamp}
88
com.ghgande.j2mod,\
99
io.openems.common,\
1010
io.openems.edge.battery.api,\
11+
io.openems.edge.bridge.http,\
1112
io.openems.edge.bridge.modbus,\
12-
io.openems.edge.common
13+
io.openems.edge.common,\
14+
io.openems.edge.io.api,\
1315

1416
-testpath: \
1517
${testpath}

0 commit comments

Comments
 (0)