Merge branch 'release/2019.10.0'

OpenEMS · Aug 29, 2019 · 141cd4b · 141cd4b
2 parents 9438447 + 03dd284
commit 141cd4b
Show file tree

Hide file tree

Showing 113 changed files with 4,692 additions and 1,967 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,16 +1,20 @@
 sudo: false
 
-language: java
+matrix:
+  include:
+    - language: java
+      jdk:
+       - openjdk8
+      script:
+       - ./gradlew build -x test
+       - ./gradlew buildAggregatedJavadocs --continue
+       - ./gradlew buildAntoraDocs --continue
 
-jdk:
-  - openjdk8
-
-install: ./gradlew --version
-
-script:
-  - ./gradlew build -x test
-  - ./gradlew buildAggregatedJavadocs --continue
-  - ./gradlew buildAntoraDocs --continue
+    - language: node_js
+      node_js:
+       - 10
+      script:
+       - ./gradlew buildUiForEdge --continue
 
 deploy:
   provider: pages

diff --git a/cnf/pom.xml b/cnf/pom.xml
@@ -31,7 +31,7 @@
 			<!-- https://mvnrepository.com/artifact/com.github.scribejava/scribejava-core -->
 			<groupId>com.github.scribejava</groupId>
 			<artifactId>scribejava-core</artifactId>
-			<version>6.8.0</version>
+			<version>6.8.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
@@ -41,7 +41,7 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>28.0-jre</version>
+			<version>28.1-jre</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>
@@ -147,6 +147,12 @@
 			<artifactId>pax-logging-service</artifactId>
 			<version>1.11.0</version>
 		</dependency>
+		<dependency>
+			<!-- Used by io.openems.backend.metadata.odoo -->
+			<groupId>org.postgresql</groupId>
+			<artifactId>postgresql</artifactId>
+			<version>42.2.6</version>
+		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>

diff --git a/doc/modules/ROOT/assets/images/ui-mock-csv.png b/doc/modules/ROOT/assets/images/ui-mock-csv.png
diff --git a/doc/modules/ROOT/assets/images/ui-mock-history.png b/doc/modules/ROOT/assets/images/ui-mock-history.png
diff --git a/doc/modules/ROOT/nav.adoc b/doc/modules/ROOT/nav.adoc
@@ -21,7 +21,9 @@
 ** xref:backend/build.adoc[Build OpenEMS Backend]
 ** xref:backend/deploy.adoc[Deploy OpenEMS Backend]
 * xref:component-communication/index.adoc[Component Communication]
-* xref:simulation.adoc[Simulation]
+* Simulation
+** xref:simulation/realtime.adoc[Real-Time Simulation]
+** xref:simulation/ui-history.adoc[UI History Simulation]
 * xref:documentation.adoc[Documentation]
 * xref:randd.adoc[Research and Development]
 * https://openems.github.io/openems.io/javadoc/[Javadoc]
diff --git a/doc/modules/ROOT/pages/edge/controller.adoc.d/_include.adoc b/doc/modules/ROOT/pages/edge/controller.adoc.d/_include.adoc
@@ -27,6 +27,8 @@ include::io.openems.edge.controller.dischargelimitconsideringcellvoltage.adoc[le
 
 include::io.openems.edge.controller.ess.acisland.adoc[leveloffset=+1]
 
+include::io.openems.edge.controller.ess.delaycharge.adoc[leveloffset=+1]
+
 include::io.openems.edge.controller.ess.limittotaldischarge.adoc[leveloffset=+1]
 
 include::io.openems.edge.controller.ess.onefullcycle.adoc[leveloffset=+1]
@@ -43,6 +45,8 @@ include::io.openems.edge.controller.io.fixdigitaloutput.adoc[leveloffset=+1]
 
 include::io.openems.edge.controller.pvinverter.fixpowerlimit.adoc[leveloffset=+1]
 
+include::io.openems.edge.controller.selltogridlimit.adoc[leveloffset=+1]
+
 include::io.openems.edge.controller.symmetric.balancing.adoc[leveloffset=+1]
 
 include::io.openems.edge.controller.symmetric.balancingschedule.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
@@ -17,6 +17,8 @@ include::io.openems.edge.ess.sinexcel.adoc[leveloffset=+1]
 
 include::io.openems.edge.ess.sma.adoc[leveloffset=+1]
 
+include::io.openems.edge.evcs.cluster.adoc[leveloffset=+1]
+
 include::io.openems.edge.evcs.keba.kecontact.adoc[leveloffset=+1]
 
 include::io.openems.edge.fenecon.dess.adoc[leveloffset=+1]
@@ -37,6 +39,8 @@ include::io.openems.edge.meter.bcontrol.em300.adoc[leveloffset=+1]
 
 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.microcare.sdm630.adoc[leveloffset=+1]
@@ -45,10 +49,24 @@ include::io.openems.edge.meter.pqplus.umd97.adoc[leveloffset=+1]
 
 include::io.openems.edge.meter.socomec.adoc[leveloffset=+1]
 
+include::io.openems.edge.meter.sunspec.adoc[leveloffset=+1]
+
 include::io.openems.edge.meter.virtual.adoc[leveloffset=+1]
 
 include::io.openems.edge.meter.weidmueller.adoc[leveloffset=+1]
 
+include::io.openems.edge.predictor.persistencemodel.adoc[leveloffset=+1]
+
+include::io.openems.edge.pvinverter.cluster.adoc[leveloffset=+1]
+
+include::io.openems.edge.pvinverter.kaco.blueplanet.adoc[leveloffset=+1]
+
 include::io.openems.edge.pvinverter.solarlog.adoc[leveloffset=+1]
 
+include::io.openems.edge.pvinverter.sunspec.adoc[leveloffset=+1]
+
+include::io.openems.edge.solaredge.adoc[leveloffset=+1]
+
+include::io.openems.edge.tesla.powerwall2.adoc[leveloffset=+1]
+
 include::io.openems.edge.timedata.influxdb.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
@@ -11,6 +11,8 @@ include::io.openems.edge.io.api.adoc[leveloffset=+1]
 
 include::io.openems.edge.meter.api.adoc[leveloffset=+1]
 
+include::io.openems.edge.predictor.api.adoc[leveloffset=+1]
+
 include::io.openems.edge.scheduler.api.adoc[leveloffset=+1]
 
 include::io.openems.edge.timedata.api.adoc[leveloffset=+1]
diff --git a/doc/modules/ROOT/pages/edge/scheduler.adoc.d/_include.adoc b/doc/modules/ROOT/pages/edge/scheduler.adoc.d/_include.adoc
@@ -1,6 +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.daily.adoc[leveloffset=+1]
 
 include::io.openems.edge.scheduler.fixedorder.adoc[leveloffset=+1]
diff --git a/doc/modules/ROOT/pages/simulation.adoc → ...dules/ROOT/pages/simulation/realtime.adoc b/doc/modules/ROOT/pages/simulation.adoc → ...dules/ROOT/pages/simulation/realtime.adoc
@@ -1,5 +1,5 @@
-= Simulation
-:imagesdir: ../assets/images
+= Real-Time Simulation
+:imagesdir: ../../assets/images
 :sectnumlevels: 0
 :toc:
 :toclevels: 0

diff --git a/doc/modules/ROOT/pages/simulation/ui-history.adoc b/doc/modules/ROOT/pages/simulation/ui-history.adoc
@@ -0,0 +1,31 @@
+= UI History Simulation
+:imagesdir: ../../assets/images
+:sectnumlevels: 0
+:toc:
+:toclevels: 0
+
+Sometimes it can be useful to mock historic data in OpenEMS UI in order to take consistent screenshots or to visualize how a certain Controller would have behaved during a day.
+
+Prepare the mock for the historic view:
+
+. first copy the example https://github.com/OpenEMS/openems/tree/develop/io.openems.edge.simulator/src/io/openems/edge/simulator/timedata/timedata.csv[CSV file icon:github[]] to your home directory, e.g. `C:\Users\username\` on windows.
+
+. adjust the file to mock all required channel values.
++
+NOTE: The CSV file is read on every data query by the UI. So in order to update the values, just save the CSV file and click again on 'Today' or 'Yesterday' in the history view to refresh.
++
+NOTE: To provide data for one day, that file should have 288 lines with values.
++
+.The mocked data in the CSV file
+image::ui-mock-csv.png[The mocked data in the CSV file]
+
+OpenEMS UI creates charts dynamically according to which OpenEMS Components are enabled. To mock the historic view, it is required to activate OpenEMS Component via Apache Felix (see xref:gettingstarted.adoc[Getting Started]) or directly in the UI OpenEMS Settings screen.
+
+. configure the OpenEMS Components that should be simulated, e.g. a meter, PV inverter,...
+
+. configure the `Simulator Timedata` service.
+
+. open the OpenEMS UI (see xref:gettingstarted.adoc[Getting Started]), login and open the 'History' view. You should be presented the mocked data.
+
+.The mocked data in the UI 'History' view
+image::ui-mock-history.png[The mocked data in the UI 'History' view]
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) 2019 OpenEMS Association e.V.
-Version 2019.9.0
+Version 2019.10.0
 :sectnums:
 :sectnumlevels: 4
 :toc:

diff --git a/io.openems.backend.application/BackendApp.bndrun b/io.openems.backend.application/BackendApp.bndrun
@@ -66,6 +66,7 @@
 	io.openems.backend.b2brest;version=snapshot,\
 	io.openems.wrapper.fastexcel;version=snapshot,\
 	io.openems.wrapper.opczip;version=snapshot,\
-	com.google.guava;version='[28.0.0,28.0.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[1.11.0,1.11.1)',\
-	org.ops4j.pax.logging.pax-logging-service;version='[1.11.0,1.11.1)'
+	org.ops4j.pax.logging.pax-logging-service;version='[1.11.0,1.11.1)',\
+	org.postgresql.jdbc42;version='[42.2.6,42.2.7)',\
+	com.google.guava;version='[28.1.0,28.1.1)'