Merge branch 'release/2019.5.0'

cnf/pom.xml

@@ -14,12 +14,12 @@
 		<dependency>
 			<groupId>com.fazecast</groupId>
 			<artifactId>jSerialComm</artifactId>
-			<version>2.2.2</version>
+			<version>2.5.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.ghgande</groupId>
 			<artifactId>j2mod</artifactId>
-			<version>2.5.2</version>
+			<version>2.5.5</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.rzymek</groupId>
@@ -34,7 +34,7 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>27.1-jre</version>
+			<version>28.0-jre</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>
@@ -102,7 +102,7 @@
 		<dependency>
 			<groupId>org.dhatim</groupId>
 			<artifactId>fastexcel</artifactId>
-			<version>0.10.7</version>
+			<version>0.10.8</version>
 		</dependency>
 		<dependency>
 			<groupId>org.influxdb</groupId>

doc/modules/ROOT/pages/documentation.adoc

@@ -13,7 +13,7 @@
 
 The OpenEMS Documentation is built with https://antora.org/[Antora icon:external-link[]].
 
-OpenEMS https://github.com/OpenEMS/openems[Files icon:external-link[]] and https://github.com/OpenEMS/openems.io[Documentation icon:external-link[]] are seperated on two different repositories.
+OpenEMS https://github.com/OpenEMS/openems[Files icon:external-link[]] and https://github.com/OpenEMS/openems.io[Documentation icon:external-link[]] are separated on two different repositories.
 
 The https://github.com/OpenEMS/openems/blob/develop/doc/build/uibundle_openems.zip?raw=true[UI icon:external-link[]] was slightly modified to fit our needs.
 
@@ -30,7 +30,7 @@ You will see the changes you have made after our frequent Docs - Update.
 
 == Add a page
 
-To add a page, clone the OpenEMS Repository (preferably xref:gettingstarted.adoc#_download_the_source_code[Source Tree]) and open it with a Code Editor (prefably xref:gettingstarted.adoc#_setup_visual_studio_code_for_openems_ui[Visual Studio Code]).
+To add a page, clone the OpenEMS Repository (preferably xref:gettingstarted.adoc#_download_the_source_code[Source Tree]) and open it with a Code Editor (preferably xref:gettingstarted.adoc#_setup_visual_studio_code_for_openems_ui[Visual Studio Code]).
 
 1. Go to https://github.com/OpenEMS/openems/tree/develop/doc/modules/ROOT/pages[doc/modules/ROOT/pages icon:external-link[]] and create a .adoc file with the desired name.
 
@@ -40,28 +40,21 @@ To add a page, clone the OpenEMS Repository (preferably xref:gettingstarted.adoc
 
 == Build Docs
 
-To build the docs, clone the OpenEMS Repository (preferably xref:gettingstarted.adoc#_download_the_source_code[Source Tree]) and open it with a Code Editor (prefably xref:gettingstarted.adoc#_setup_visual_studio_code_for_openems_ui[Visual Studio Code]).
+To build the docs, clone the OpenEMS Repository (preferably xref:gettingstarted.adoc#_download_the_source_code[Source Tree]) and open it with a Code Editor (preferably xref:gettingstarted.adoc#_setup_visual_studio_code_for_openems_ui[Visual Studio Code]).
 
-NOTE: NodeJS has to be installed
-
-.Install Antora via npm
-
-Open Terminal and type:
+[NOTE]
 ====
-npm i -g @antora/cli
-
-npm i -g @antora/site-generator-default
+NodeJS has to be installed
 ====
 
-.Run Antora
 
-Go to https://github.com/OpenEMS/openems/tree/develop/doc/build[doc/build icon:external-link[]] and type
+.Build the documents:
+Open the integrated terminal, change to the https://github.com/OpenEMS/openems/tree/develop/[root directory icon:external-link[]] and type
 ====
-antora site.yml
+`gradlew buildAntoraDocs`
 ====
-Docs should be building.. the finished HTML Folder can be found in your local 'build' folder (inside your https://github.com/OpenEMS/openems/tree/develop/doc/build[repository build folder icon:external-link[]])
 
-TIP: If your data isn't updating properly or not building, try antora site.yml --pull to reset the cache
+Docs should be building.. the finished HTML Folder can be found in your local 'build' folder (inside your https://github.com/OpenEMS/openems/tree/develop/doc/build[repository build folder icon:external-link[]])
 
 NOTE: If you want to build your own docs with Antora see https://fabianfnc.github.io/bocs/[this guide icon:external-link[]] 
 

doc/modules/ROOT/pages/edge/architecture.adoc

@@ -32,7 +32,7 @@ The output phase takes the results from the process phase and applies it - e.g.
 
 == Scheduler and Controller
 
-During the 'process' phase different algorithms (Controllers) might try to access the same resources - e.g. two Controllers try to switch the same digital output. It is therefor necessary to prioritize their execution and restrict access according to priority.
+During the 'process' phase different algorithms (Controllers) might try to access the same resources - e.g. two Controllers try to switch the same digital output. It is therefore necessary to prioritize their execution and restrict access according to priority.
 
 OpenEMS Edge uses Scheduler implementations to receive a sorted list of Controllers. The Controllers are then executed in order. Later executed Controllers are not allowed to overwrite a previously written result. 
 

doc/modules/ROOT/pages/edge/device_service.adoc.d/_include.adoc

@@ -41,6 +41,8 @@ include::io.openems.edge.meter.janitza.umg96rme.adoc[leveloffset=+1]
 
 include::io.openems.edge.meter.microcare.sdm630.adoc[leveloffset=+1]
 
+include::io.openems.edge.meter.pqplus.umd97.adoc[leveloffset=+1]
+
 include::io.openems.edge.meter.socomec.adoc[leveloffset=+1]
 
 include::io.openems.edge.meter.virtual.adoc[leveloffset=+1]

doc/modules/ROOT/pages/edge/scheduler.adoc.d/_include.adoc

@@ -1,4 +1,6 @@
 
 include::io.openems.edge.scheduler.allalphabetically.adoc[leveloffset=+1]
 
+include::io.openems.edge.scheduler.dailyscheduler.adoc[leveloffset=+1]
+
 include::io.openems.edge.scheduler.fixedorder.adoc[leveloffset=+1]

doc/modules/ROOT/pages/single_document.adoc

@@ -1,7 +1,7 @@
 = OpenEMS - Open Energy Management System
 ifndef::toc[]
 (c) 2019 OpenEMS Association e.V.
-Version 2019.3.0
+Version 2019.5.0
 :sectnums:
 :sectnumlevels: 4
 :toc:

io.openems.backend.application/BackendApp.bndrun

@@ -63,9 +63,9 @@
 	org.osgi.service.event;version='[1.3.1,1.3.2)',\
 	org.osgi.service.metatype;version='[1.3.0,1.3.1)',\
 	org.jsr-305;version='[3.0.2,3.0.3)',\
-	com.google.guava;version='[27.1.0,27.1.1)',\
 	io.openems.backend.b2brest;version=snapshot,\
 	io.openems.wrapper.fastexcel;version=snapshot,\
 	io.openems.wrapper.opczip;version=snapshot,\
 	org.ops4j.pax.logging.pax-logging-api;version='[1.10.2,1.10.3)',\
-	org.ops4j.pax.logging.pax-logging-service;version='[1.10.2,1.10.3)'
+	org.ops4j.pax.logging.pax-logging-service;version='[1.10.2,1.10.3)',\
+	com.google.guava;version='[28.0.0,28.0.1)'

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

@@ -18,7 +18,7 @@ public class OpenemsConstants {
 	 * 
 	 * This is usually the number of the sprint within the year
 	 */
-	public final static short VERSION_MINOR = 4;
+	public final static short VERSION_MINOR = 5;
 
 	/**
 	 * The patch version of OpenEMS.
@@ -37,7 +37,7 @@ public class OpenemsConstants {
 	 * The complete version as a SemanticVersion.
 	 * 
 	 * <p>
-	 * Use toString()-method to get something like "2018.10.0-SNAPSHOT"
+	 * Use toString()-method to get something like "2019.5.0-SNAPSHOT"
 	 */
 	public final static SemanticVersion VERSION = new SemanticVersion(VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH,
 			VERSION_STRING);

io.openems.common/src/io/openems/common/jsonrpc/response/QueryHistoricTimeseriesExportXlsxResponse.java

@@ -32,13 +32,32 @@
  */
 public class QueryHistoricTimeseriesExportXlsxResponse extends Base64PayloadResponse {
 
-	private final static ImmutableMap<String, String> LABELS = ImmutableMap.<String, String>builder() //
-			.put("datetime", "Date/Time") //
-			.put("_sum/EssSoc", "Ladezustand [%]") //
-			.put("_sum/EssActivePower", "Speicher Be-/Entladung [W]") //
-			.put("_sum/ConsumptionActivePower", "Verbrauch [W]") //
-			.put("_sum/GridActivePower", "Netzbezug-/einspeisung [W]") //
-			.put("_sum/ProductionActivePower", "Erzeugung [W]") //
+	private static class Label {
+		protected final String title;
+		protected final String comment;
+
+		protected Label(String title, String comment) {
+			this.title = title;
+			this.comment = comment;
+		}
+	}
+
+	private final static ImmutableMap<String, Label> LABELS = ImmutableMap.<String, Label>builder() //
+			.put("datetime", //
+					new Label("Date/Time", null)) //
+			.put("_sum/EssSoc", //
+					new Label("Ladezustand [%]", null)) //
+			.put("_sum/EssActivePower", //
+					new Label("Speicher Be-/Entladung [W]",
+							"Positive Werte für Entladung, negative für Beladung. Bei DC-gekoppelten Speichersystemen wird die PV-Leistung hier ebenfalls erfasst.")) //
+			.put("_sum/ConsumptionActivePower", //
+					new Label("Verbrauch [W]",
+							"Dieser Wert wird nicht direkt gemessen, sondern errechnet sich aus Speicher Be-/Entladung, Netzbezug/-einspeisung und Erzeugung.")) //
+			.put("_sum/GridActivePower", //
+					new Label("Netzbezug-/einspeisung [W]",
+							"Positive Werte für Netzbezug, negative für Netzeinspeisung.")) //
+			.put("_sum/ProductionActivePower", //
+					new Label("Erzeugung [W]", null)) //
 			.build();
 
 	public QueryHistoricTimeseriesExportXlsxResponse(UUID id, ZonedDateTime fromDate, ZonedDateTime toDate,
@@ -124,14 +143,18 @@ public static void addData(Worksheet worksheet, int row,
 	public static void initializeDataHeader(Worksheet worksheet, int row,
 			SortedMap<ChannelAddress, JsonElement> channelsMap) {
 		int col = 0;
-		worksheet.value(row, col++, LABELS.get("datetime"));
+		worksheet.value(row, col++, LABELS.get("datetime").title);
 		for (Entry<ChannelAddress, JsonElement> entry : channelsMap.entrySet()) {
 			String key = entry.getKey().toString();
-			String label = LABELS.get(key);
+			Label label = LABELS.get(key);
 			if (label == null) {
-				label = key.toString();
+				label = new Label(key.toString(), null);
+			}
+			worksheet.value(row, col, label.title);
+			if (label.comment != null) {
+				worksheet.comment(row, col, label.comment);
 			}
-			worksheet.value(row, col++, label);
+			col++;
 		}
 //		worksheet.style(0, 0).bold().fillColor(Color.GRAY5).borderStyle("thin").wrapText(true);
 	}

io.openems.edge.application/EdgeApp.bndrun

@@ -89,10 +89,7 @@
 	bnd.identity;id='io.openems.edge.timedata.influxdb'
 
 -runbundles: \
-	com.fazecast.jSerialComm;version='[2.2.2,2.2.3)',\
-	com.ghgande.j2mod;version='[2.5.2,2.5.3)',\
 	com.google.gson;version='[2.8.5,2.8.6)',\
-	com.google.guava;version='[27.1.0,27.1.1)',\
 	com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\
 	io.openems.common;version=snapshot,\
 	io.openems.edge.application;version=snapshot,\
@@ -187,4 +184,7 @@
 	org.ops4j.pax.logging.pax-logging-service;version='[1.10.2,1.10.3)',\
 	com.sun.jna;version='[5.3.1,5.3.2)',\
 	io.openems.edge.controller.pvinverter.fixpowerlimit;version=snapshot,\
-	io.openems.edge.controller.evcs.fixactivepower;version=snapshot
+	io.openems.edge.controller.evcs.fixactivepower;version=snapshot,\
+	com.google.guava;version='[28.0.0,28.0.1)',\
+	com.fazecast.jSerialComm;version='[2.5.1,2.5.2)',\
+	com.ghgande.j2mod;version='[2.5.5,2.5.6)'

io.openems.edge.bridge.modbus/bnd.bnd

@@ -16,7 +16,7 @@ Export-Package: \
 	io.openems.edge.common;version=latest,\
 	com.google.gson,\
 	com.google.guava,\
-	com.ghgande.j2mod;version=2.5.2,\
+	com.ghgande.j2mod;version=2.5.5,\
 	slf4j.api
 
 -testpath: ${testpath}

io.openems.edge.controller.api.modbus/bnd.bnd

@@ -15,7 +15,7 @@ Private-Package: io.openems.edge.controller.api.modbus,\
 	io.openems.edge.controller.api;version=latest,\
 	io.openems.edge.controller.api.core;version=latest,\
 	io.openems.edge.timedata.api;version=latest,\
-	com.ghgande.j2mod;version=2.5,\
+	com.ghgande.j2mod;version=2.5.5,\
 	com.google.gson;version=2.8,\
 	slf4j.api,\
 	io.openems.wrapper.fastexcel;version=latest

io.openems.edge.controller.symmetric.dynamiccharge/generated/.index

@@ -1,4 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
+<<<<<<< HEAD
+<repository xmlns="http://www.osgi.org/xmlns/repository/v1.0.0" name="io.openems.edge.controller.symmetric.dynamiccharge" increment="1560241733250">
+  <resource>
+    <capability namespace="osgi.identity">
+      <attribute name="license" value="https://opensource.org/licenses/EPL-2.0"/>
+      <attribute name="osgi.identity" value="io.openems.edge.controller.symmetric.dynamiccharge"/>
+      <attribute name="type" value="osgi.bundle"/>
+      <attribute name="version" value="1.0.0.201906110828" type="Version"/>
+    </capability>
+    <capability namespace="osgi.wiring.bundle">
+      <attribute name="bundle-version" value="1.0.0.201906110828" type="Version"/>
+      <attribute name="osgi.wiring.bundle" value="io.openems.edge.controller.symmetric.dynamiccharge"/>
+    </capability>
+    <capability namespace="osgi.wiring.host">
+      <attribute name="bundle-version" value="1.0.0.201906110828" type="Version"/>
+      <attribute name="osgi.wiring.host" value="io.openems.edge.controller.symmetric.dynamiccharge"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <directive name="uses" value="io.openems.common.exceptions,io.openems.edge.common.channel,io.openems.edge.common.component"/>
+      <attribute name="version" value="1.0.0" type="Version"/>
+      <attribute name="osgi.wiring.package" value="io.openems.edge.controller.api"/>
+=======
 <repository xmlns="http://www.osgi.org/xmlns/repository/v1.0.0" name="io.openems.edge.controller.symmetric.dynamiccharge" increment="1556274703682">
   <resource>
     <capability namespace="osgi.identity">
@@ -18,15 +40,23 @@
       <attribute name="version" value="1.0.0" type="Version"/>
       <attribute name="osgi.wiring.package" value="io.openems.edge.controller.symmetric.dynamiccharge.api"/>
       <attribute name="-provide" value="true"/>
+>>>>>>> 7a24e5de8f33da7791b1052c0ae9a9b37e385d1b
     </capability>
     <capability namespace="osgi.service">
       <attribute name="objectClass" value="io.openems.edge.common.component.OpenemsComponent,io.openems.edge.controller.api.Controller" type="List&lt;String&gt;"/>
     </capability>
     <capability namespace="osgi.content">
+<<<<<<< HEAD
+      <attribute name="size" value="28453" type="Long"/>
+      <attribute name="url" value="generated/io.openems.edge.controller.symmetric.dynamiccharge.jar"/>
+      <attribute name="mime" value="application/vnd.osgi.bundle"/>
+      <attribute name="osgi.content" value="28215115D580B2EA699AEEF54E72A03FF5CA16FFD936D39E1CF52621F9C125F5"/>
+=======
       <attribute name="size" value="19074" type="Long"/>
       <attribute name="url" value="generated/io.openems.edge.controller.symmetric.dynamiccharge.jar"/>
       <attribute name="mime" value="application/vnd.osgi.bundle"/>
       <attribute name="osgi.content" value="9916325F730F86C36AB56F72240B64479E6D8CA618012AF5F34C0E0335E56714"/>
+>>>>>>> 7a24e5de8f33da7791b1052c0ae9a9b37e385d1b
     </capability>
     <capability namespace="bndtools.workspace">
       <attribute name="bndtools.workspace" value="file:/C:/Users/sagar.venu/git/new_workspace"/>
@@ -36,24 +66,48 @@
       <directive name="filter" value="(&amp;(osgi.wiring.package=com.google.gson)(&amp;(version&gt;=2.8.0)(!(version&gt;=3.0.0))))"/>
     </requirement>
     <requirement namespace="osgi.wiring.package">
+<<<<<<< HEAD
+      <directive name="filter" value="(&amp;(osgi.wiring.package=io.openems.common.channel)(&amp;(version&gt;=1.0.0)(!(version&gt;=2.0.0))))"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+=======
+>>>>>>> 7a24e5de8f33da7791b1052c0ae9a9b37e385d1b
       <directive name="filter" value="(&amp;(osgi.wiring.package=io.openems.common.exceptions)(&amp;(version&gt;=1.0.0)(!(version&gt;=2.0.0))))"/>
     </requirement>
     <requirement namespace="osgi.wiring.package">
       <directive name="filter" value="(&amp;(osgi.wiring.package=io.openems.edge.common.channel)(&amp;(version&gt;=1.0.0)(!(version&gt;=2.0.0))))"/>
     </requirement>
     <requirement namespace="osgi.wiring.package">
+<<<<<<< HEAD
+      <directive name="filter" value="(&amp;(osgi.wiring.package=io.openems.edge.common.channel.internal)(&amp;(version&gt;=1.0.0)(!(version&gt;=2.0.0))))"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+=======
+>>>>>>> 7a24e5de8f33da7791b1052c0ae9a9b37e385d1b
       <directive name="filter" value="(&amp;(osgi.wiring.package=io.openems.edge.common.channel.value)(&amp;(version&gt;=1.0.0)(!(version&gt;=2.0.0))))"/>
     </requirement>
     <requirement namespace="osgi.wiring.package">
       <directive name="filter" value="(&amp;(osgi.wiring.package=io.openems.edge.common.component)(&amp;(version&gt;=1.0.0)(!(version&gt;=2.0.0))))"/>
     </requirement>
     <requirement namespace="osgi.wiring.package">
+<<<<<<< HEAD
+      <directive name="filter" value="(&amp;(osgi.wiring.package=io.openems.edge.common.sum)(&amp;(version&gt;=1.0.0)(!(version&gt;=2.0.0))))"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+=======
+>>>>>>> 7a24e5de8f33da7791b1052c0ae9a9b37e385d1b
       <directive name="filter" value="(&amp;(osgi.wiring.package=io.openems.edge.controller.api)(&amp;(version&gt;=1.0.0)(!(version&gt;=1.1.0))))"/>
     </requirement>
     <requirement namespace="osgi.wiring.package">
       <directive name="filter" value="(&amp;(osgi.wiring.package=io.openems.edge.ess.api)(&amp;(version&gt;=1.0.0)(!(version&gt;=2.0.0))))"/>
     </requirement>
     <requirement namespace="osgi.wiring.package">
+<<<<<<< HEAD
+      <directive name="filter" value="(&amp;(osgi.wiring.package=io.openems.edge.ess.power.api)(&amp;(version&gt;=1.0.0)(!(version&gt;=2.0.0))))"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+=======
+>>>>>>> 7a24e5de8f33da7791b1052c0ae9a9b37e385d1b
       <directive name="filter" value="(&amp;(osgi.wiring.package=io.openems.edge.meter.api)(&amp;(version&gt;=1.0.0)(!(version&gt;=2.0.0))))"/>
     </requirement>
     <requirement namespace="osgi.wiring.package">

io.openems.edge.scheduler.dailyscheduler/.gitignore

@@ -1,2 +1,5 @@
+<<<<<<< HEAD
+=======
 /bin_test/
+>>>>>>> 7a24e5de8f33da7791b1052c0ae9a9b37e385d1b
 /generated/