Merge branch 'release/2018.9'

OpenEMS · Jul 20, 2018 · 64fdb39 · 64fdb39
2 parents 12b22db + d9331b6
commit 64fdb39
Show file tree

Hide file tree

Showing 452 changed files with 34,044 additions and 23,744 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-
 # Created by https://www.gitignore.io/api/java,maven,gradle,angular,eclipse,node
 
 ### Angular ###
@@ -89,7 +88,7 @@ local.properties
 .project
 
 # JDT-specific (Eclipse Java Development Tools)
-.classpath
+#.classpath
 
 # Annotation Processing
 .apt_generated

diff --git a/cnf/central.xml b/cnf/central.xml
@@ -64,6 +64,11 @@
 			<version>1.1</version>
 		</dependency>
 		<!-- org.* -->
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-math3</artifactId>
+			<version>3.6</version>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.felix</groupId>
 			<artifactId>org.apache.felix.gogo.shell</artifactId>

diff --git a/doc/OpenEMS_EN.adoc b/doc/OpenEMS_EN.adoc
diff --git a/doc/OpenEMS_EN.html b/doc/OpenEMS_EN.html
diff --git a/doc/_include/header.adoc b/doc/_include/header.adoc
diff --git a/doc/_include/nature/Ess.adoc b/doc/_include/nature/Ess.adoc
@@ -0,0 +1,6 @@
+4+|*link:../io.openems.edge.ess.api/src/io/openems/edge/ess/api/Ess.java[Ess icon:code[]]*
+// tag::channels[]
+|Soc                       |% |0..100 | State of Charge
+|GridMode                  |  |0=Undefined, 1=On-Grid, 2=Off-Grid |
+|MaxActivePower            |W | | Maximum possible Active Power
+// end::channels[]
diff --git a/doc/img/device-nature-channel-scheduler-controller.png b/doc/img/device-nature-channel-scheduler-controller.png
diff --git a/doc/img/eclipse-bnd-file-build.png b/doc/img/eclipse-bnd-file-build.png
diff --git a/doc/img/eclipse-bndtools-osgi-project.png b/doc/img/eclipse-bndtools-osgi-project.png
diff --git a/doc/img/eclipse-channels-switch-case.png b/doc/img/eclipse-channels-switch-case.png
diff --git a/doc/img/eclipse-edgeapp-bndrun.png b/doc/img/eclipse-edgeapp-bndrun.png
diff --git a/doc/img/eclipse-file-new-other.png b/doc/img/eclipse-file-new-other.png
diff --git a/doc/img/eclipse-new-annotation.png b/doc/img/eclipse-new-annotation.png
diff --git a/doc/img/eclipse-new-class.png b/doc/img/eclipse-new-class.png
diff --git a/doc/img/eclipse-new-config-annotation.png b/doc/img/eclipse-new-config-annotation.png
diff --git a/doc/img/eclipse-new-osgi-provider-bundle.png b/doc/img/eclipse-new-osgi-provider-bundle.png
diff --git a/doc/img/eclipse-new-osgi-provider-socomec-final.png b/doc/img/eclipse-new-osgi-provider-socomec-final.png
diff --git a/doc/img/eclipse-new-osgi-provider-socomec.png b/doc/img/eclipse-new-osgi-provider-socomec.png
diff --git a/doc/img/eclipse-new-socomec-bundle.png b/doc/img/eclipse-new-socomec-bundle.png
diff --git a/doc/img/eclipse-osgi-build-path.png b/doc/img/eclipse-osgi-build-path.png
diff --git a/doc/img/eclipse-rename.png b/doc/img/eclipse-rename.png
diff --git a/doc/img/eclipse-resolve-osgi.png b/doc/img/eclipse-resolve-osgi.png
diff --git a/doc/img/ui-config.png b/doc/img/ui-config.png
diff --git a/edge/README.md b/edge/README.md
diff --git a/edge/etc/openems.d/.gitignore b/edge/etc/openems.d/.gitignore
diff --git a/edge/pom.xml b/edge/pom.xml
diff --git a/edge/resources/logback.xml b/edge/resources/logback.xml
diff --git a/edge/src/io/openems/impl/controller/symmetric/fixvalue/Ess.java b/edge/src/io/openems/impl/controller/symmetric/fixvalue/Ess.java