Merge branch 'release/2019.6.0'

OpenEMS · Jul 4, 2019 · 006dba6 · 006dba6
2 parents 7bec617 + c0b8e71
commit 006dba6
Show file tree

Hide file tree

Showing 225 changed files with 3,282 additions and 8,950 deletions.
diff --git a/cnf/pom.xml b/cnf/pom.xml
@@ -26,6 +26,11 @@
 			<artifactId>opczip</artifactId>
 			<version>1.0.2</version>
 		</dependency>
+		<dependency>
+			<groupId>com.github.scribejava</groupId>
+			<artifactId>scribejava-core</artifactId>
+			<version>6.6.3</version>
+		</dependency>
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>

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.5.0
+Version 2019.6.0-SNAPSHOT
 :sectnums:
 :sectnumlevels: 4
 :toc:

diff --git a/...rc/io/openems/impl/controller/asymmetric/balancingcurrent/BalancingCurrentController.java b/...rc/io/openems/impl/controller/asymmetric/balancingcurrent/BalancingCurrentController.java
diff --git a/edge/src/io/openems/impl/controller/asymmetric/balancingcurrent/Ess.java b/edge/src/io/openems/impl/controller/asymmetric/balancingcurrent/Ess.java
diff --git a/edge/src/io/openems/impl/controller/asymmetric/balancingcurrent/Meter.java b/edge/src/io/openems/impl/controller/asymmetric/balancingcurrent/Meter.java