Merge branch 'release/2020.17.0'

OpenEMS · Aug 13, 2020 · 6adbb71 · 6adbb71
2 parents 2beb272 + 532b40b
commit 6adbb71
Show file tree

Hide file tree

Showing 89 changed files with 9,662 additions and 626 deletions.
diff --git a/.gradle-wrapper/gradle-wrapper.jar b/.gradle-wrapper/gradle-wrapper.jar
diff --git a/.gradle-wrapper/gradle-wrapper.properties b/.gradle-wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/doc/build/package.json b/doc/build/package.json
@@ -2,8 +2,8 @@
   "name": "openems-doc",
   "version": "1.0.0",
   "dependencies": {
-    "@antora/cli": "^2.2.0",
-    "@antora/site-generator-default": "^2.2.0"
+    "@antora/cli": "^2.3.3",
+    "@antora/site-generator-default": "^2.3.3"
   },
   "devDependencies": {}
 }
diff --git a/doc/modules/ROOT/pages/edge/controller.adoc.d/_include.adoc b/doc/modules/ROOT/pages/edge/controller.adoc.d/_include.adoc
@@ -43,6 +43,8 @@ include::io.openems.edge.controller.evcs.adoc[leveloffset=+1]
 
 include::io.openems.edge.controller.evcs.fixactivepower.adoc[leveloffset=+1]
 
+include::io.openems.edge.controller.generic.jsonlogic.adoc[leveloffset=+1]
+
 include::io.openems.edge.controller.highloadtimeslot.adoc[leveloffset=+1]
 
 include::io.openems.edge.controller.io.alarm.adoc[leveloffset=+1]
@@ -51,6 +53,8 @@ include::io.openems.edge.controller.io.channelsinglethreshold.adoc[leveloffset=+
 
 include::io.openems.edge.controller.io.fixdigitaloutput.adoc[leveloffset=+1]
 
+include::io.openems.edge.controller.io.heatingelement.adoc[leveloffset=+1]
+
 include::io.openems.edge.controller.pvinverter.fixpowerlimit.adoc[leveloffset=+1]
 
 include::io.openems.edge.controller.pvinverter.selltogridlimit.adoc[leveloffset=+1]

diff --git a/doc/modules/ROOT/pages/edge/device_service.adoc.d/_include.adoc b/doc/modules/ROOT/pages/edge/device_service.adoc.d/_include.adoc
@@ -1,6 +1,12 @@
 
+include::io.openems.edge.battery.bydcommercial.adoc[leveloffset=+1]
+
 include::io.openems.edge.battery.soltaro.adoc[leveloffset=+1]
 
+include::io.openems.edge.batteryinverter.kaco.blueplanetgridsave.adoc[leveloffset=+1]
+
+include::io.openems.edge.batteryinverter.sunspec.adoc[leveloffset=+1]
+
 include::io.openems.edge.core.adoc[leveloffset=+1]
 
 include::io.openems.edge.ess.byd.container.adoc[leveloffset=+1]
@@ -9,12 +15,16 @@ include::io.openems.edge.ess.cluster.adoc[leveloffset=+1]
 
 include::io.openems.edge.ess.fenecon.commercial40.adoc[leveloffset=+1]
 
+include::io.openems.edge.ess.generic.adoc[leveloffset=+1]
+
 include::io.openems.edge.ess.kaco.blueplanet.gridsave50.adoc[leveloffset=+1]
 
 include::io.openems.edge.ess.mr.gridcon.adoc[leveloffset=+1]
 
 include::io.openems.edge.ess.refu.adoc[leveloffset=+1]
 
+include::io.openems.edge.ess.refu88k.adoc[leveloffset=+1]
+
 include::io.openems.edge.ess.sinexcel.adoc[leveloffset=+1]
 
 include::io.openems.edge.ess.sma.adoc[leveloffset=+1]
@@ -23,6 +33,14 @@ include::io.openems.edge.evcs.cluster.adoc[leveloffset=+1]
 
 include::io.openems.edge.evcs.keba.kecontact.adoc[leveloffset=+1]
 
+include::io.openems.edge.evcs.ocpp.abl.adoc[leveloffset=+1]
+
+include::io.openems.edge.evcs.ocpp.common.adoc[leveloffset=+1]
+
+include::io.openems.edge.evcs.ocpp.ies.keywatt.singleccs.adoc[leveloffset=+1]
+
+include::io.openems.edge.evcs.ocpp.server.adoc[leveloffset=+1]
+
 include::io.openems.edge.fenecon.dess.adoc[leveloffset=+1]
 
 include::io.openems.edge.fenecon.mini.adoc[leveloffset=+1]
@@ -35,6 +53,8 @@ include::io.openems.edge.io.kmtronic.adoc[leveloffset=+1]
 
 include::io.openems.edge.io.revpi.adoc[leveloffset=+1]
 
+include::io.openems.edge.io.shelly.adoc[leveloffset=+1]
+
 include::io.openems.edge.io.wago.adoc[leveloffset=+1]
 
 include::io.openems.edge.kostal.piko.adoc[leveloffset=+1]
@@ -49,7 +69,7 @@ include::io.openems.edge.meter.carlo.gavazzi.em300.adoc[leveloffset=+1]
 
 include::io.openems.edge.meter.discovergy.adoc[leveloffset=+1]
 
-include::io.openems.edge.meter.janitza.umg96rme.adoc[leveloffset=+1]
+include::io.openems.edge.meter.janitza.adoc[leveloffset=+1]
 
 include::io.openems.edge.meter.microcare.sdm630.adoc[leveloffset=+1]
 
@@ -73,6 +93,8 @@ include::io.openems.edge.pvinverter.cluster.adoc[leveloffset=+1]
 
 include::io.openems.edge.pvinverter.kaco.blueplanet.adoc[leveloffset=+1]
 
+include::io.openems.edge.pvinverter.sma.adoc[leveloffset=+1]
+
 include::io.openems.edge.pvinverter.solarlog.adoc[leveloffset=+1]
 
 include::io.openems.edge.pvinverter.sunspec.adoc[leveloffset=+1]

diff --git a/doc/modules/ROOT/pages/edge/nature.adoc.d/_include.adoc b/doc/modules/ROOT/pages/edge/nature.adoc.d/_include.adoc
@@ -1,6 +1,8 @@
 
 include::io.openems.edge.battery.api.adoc[leveloffset=+1]
 
+include::io.openems.edge.batteryinverter.api.adoc[leveloffset=+1]
+
 include::io.openems.edge.controller.api.adoc[leveloffset=+1]
 
 include::io.openems.edge.ess.api.adoc[leveloffset=+1]

diff --git a/doc/modules/ROOT/pages/single_document.adoc b/doc/modules/ROOT/pages/single_document.adoc
@@ -1,7 +1,7 @@
 = OpenEMS - Open Energy Management System
 ifndef::toc[]
 (c) 2020 OpenEMS Association e.V.
-Version 2020.16.0
+Version 2020.17.0
 :sectnums:
 :sectnumlevels: 4
 :toc:

diff --git a/doc/package-lock.json b/doc/package-lock.json
diff --git a/gradlew b/gradlew
@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

diff --git a/gradlew.bat b/gradlew.bat
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,29 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\.gradle-wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

diff --git a/io.openems.backend.application/BackendApp.bndrun b/io.openems.backend.application/BackendApp.bndrun
@@ -62,7 +62,7 @@
 	org.apache.commons.commons-fileupload;version='[1.4.0,1.4.1)',\
 	org.apache.commons.io;version='[2.6.0,2.6.1)',\
 	org.apache.felix.configadmin;version='[1.9.18,1.9.19)',\
-	org.apache.felix.http.jetty;version='[4.0.18,4.0.19)',\
+	org.apache.felix.http.jetty;version='[4.0.20,4.0.21)',\
 	org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
 	org.apache.felix.inventory;version='[1.0.6,1.0.7)',\
 	org.apache.felix.metatype;version='[1.2.2,1.2.3)',\

diff --git a/io.openems.common/src/io/openems/common/OpenemsConstants.java b/io.openems.common/src/io/openems/common/OpenemsConstants.java
@@ -20,7 +20,7 @@ public class OpenemsConstants {
 	 * 
 	 * This is usually the number of the sprint within the year
 	 */
-	public final static short VERSION_MINOR = 16;
+	public final static short VERSION_MINOR = 17;
 
 	/**
 	 * The patch version of OpenEMS.

diff --git a/io.openems.edge.application/EdgeApp.bndrun b/io.openems.edge.application/EdgeApp.bndrun
@@ -8,6 +8,7 @@
 	org.osgi.service.http.port=8080,\
 	felix.cm.dir=c:/openems/config,\
 	openems.data.dir=c:/openems/data,\
+	org.apache.felix.eventadmin.Timeout=0,\
 	org.ops4j.pax.logging.DefaultServiceLog.level=INFO
 
 -runsystempackages:\
@@ -27,6 +28,7 @@
 	bnd.identity;id='org.apache.felix.webconsole.plugins.ds',\
 	bnd.identity;id='org.apache.felix.inventory',\
 	bnd.identity;id='io.openems.edge.application',\
+	bnd.identity;id='io.openems.edge.battery.bmw',\
 	bnd.identity;id='io.openems.edge.battery.bydcommercial',\
 	bnd.identity;id='io.openems.edge.batteryinverter.kaco.blueplanetgridsave',\
 	bnd.identity;id='io.openems.edge.batteryinverter.sunspec',\
@@ -144,6 +146,7 @@
 	io.openems.common;version=snapshot,\
 	io.openems.edge.application;version=snapshot,\
 	io.openems.edge.battery.api;version=snapshot,\
+	io.openems.edge.battery.bmw;version=snapshot,\
 	io.openems.edge.battery.bydcommercial;version=snapshot,\
 	io.openems.edge.battery.soltaro;version=snapshot,\
 	io.openems.edge.batteryinverter.api;version=snapshot,\

diff --git a/io.openems.edge.battery.bmw/.classpath b/io.openems.edge.battery.bmw/.classpath
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="src" output="bin" path="src"/>
+	<classpathentry kind="src" output="bin_test" path="test">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/io.openems.edge.battery.bmw/.gitignore b/io.openems.edge.battery.bmw/.gitignore
@@ -0,0 +1,2 @@
+/generated/
+/bin_test/
diff --git a/io.openems.edge.battery.bmw/.project b/io.openems.edge.battery.bmw/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>io.openems.edge.battery.bmw</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>bndtools.core.bndbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>bndtools.core.bndnature</nature>
+	</natures>
+</projectDescription>
diff --git a/io.openems.edge.battery.bmw/bnd.bnd b/io.openems.edge.battery.bmw/bnd.bnd
@@ -0,0 +1,14 @@
+Bundle-Name: OpenEMS Edge BMW Battery  
+Bundle-Vendor: FENECON GmbH
+Bundle-License: https://opensource.org/licenses/EPL-2.0
+Bundle-Version: 1.0.0.${tstamp}
+
+-buildpath: \
+	${buildpath},\
+	io.openems.common,\
+	io.openems.edge.battery.api,\
+	io.openems.edge.bridge.modbus,\
+	io.openems.edge.common
+
+-testpath: \
+	${testpath}
diff --git a/io.openems.edge.battery.bmw/doc/BMW_Storage_Protocol_SMA_(standard).docx b/io.openems.edge.battery.bmw/doc/BMW_Storage_Protocol_SMA_(standard).docx
diff --git a/io.openems.edge.battery.bmw/doc/~$W_Storage_Protocol_SMA_(standard).docx b/io.openems.edge.battery.bmw/doc/~$W_Storage_Protocol_SMA_(standard).docx