Merge branch 'release/2021.19.0'

OpenEMS · Nov 4, 2021 · dfabd25 · dfabd25
2 parents 17c5e12 + 4b41bc2
commit dfabd25
Show file tree

Hide file tree

Showing 16 changed files with 52 additions and 48 deletions.
diff --git a/cnf/build.bnd b/cnf/build.bnd
@@ -62,7 +62,7 @@ buildpath: \
 	osgi.cmpn;version='7.0.0',\
 	slf4j.api;version='1.7.32',\
 	com.google.guava;version='31.0.1',\
-	com.google.gson;version='2.8.8'
+	com.google.gson;version='2.8.9'
 
 testpath: \
 	slf4j.simple,\

diff --git a/cnf/pom.xml b/cnf/pom.xml
@@ -29,7 +29,7 @@
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.8.8</version>
+			<version>2.8.9</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>
@@ -217,7 +217,7 @@
 		<dependency>
 			<groupId>org.influxdb</groupId>
 			<artifactId>influxdb-java</artifactId>
-			<version>2.17</version>
+			<version>2.22</version>
 		</dependency>
 		<dependency>
 			<groupId>org.java-websocket</groupId>
@@ -258,7 +258,7 @@
 		<dependency>
 			<groupId>org.osgi</groupId>
 			<artifactId>org.osgi.service.jdbc</artifactId>
-			<version>1.0.0</version>
+			<version>1.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.osgi</groupId>
@@ -274,7 +274,7 @@
 			<!-- Used by io.openems.backend.metadata.odoo -->
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
-			<version>42.3.0</version>
+			<version>42.3.1</version>
 		</dependency>
 		<dependency>
 			<!-- Used by io.openems.edge.timedata.rrd4j -->

diff --git a/doc/modules/ROOT/assets/images/config-simulator-grid-meter-acting.png b/doc/modules/ROOT/assets/images/config-simulator-grid-meter-acting.png
diff --git a/doc/modules/ROOT/assets/images/openems-ui-login.png b/doc/modules/ROOT/assets/images/openems-ui-login.png
diff --git a/doc/modules/ROOT/pages/gettingstarted.adoc b/doc/modules/ROOT/pages/gettingstarted.adoc
@@ -208,24 +208,21 @@ NOTE: If you receive an error message that the command `npm` could not be found,
 
 . In Visual Studios integrated terminal type...
 +
-`ng serve`
+`ng serve -o -c openems-edge-dev`
++
+NOTE: If you receive an error message, that you have no rights to execute "ng serve", set "Set-ExecutionPolicy RemoteSigned -Scope CurrentUser".
 +
 The log shows:
 +
 `NG Live Development Server is listening on localhost:4200, open your browser on http://localhost:4200/`
-
++
 . Open a browser at http://localhost:4200
 
 . You should see OpenEMS UI. Log in as user "guest" by clicking on the tick mark. Alternatively type "admin" in the password field to log in with extended permissions.
 +
 .OpenEMS UI Login screen
 image::openems-ui-login.png[OpenEMS UI Login screen]
 
-. Change to the Energymonitor by clicking on the arrow.
-+
-.OpenEMS UI Overview screen
-image::openems-ui-overview.png[OpenEMS UI Overview screen]
-
 . You should see the Energymonitor showing the same data as the DebugLog output on the console.
 +
 .OpenEMS UI Energymonitor screen
@@ -343,11 +340,13 @@ It is again noteworthy here, that:
 
 . In Visual Studios integrated terminal type...
 +
-`ng serve`
+`ng serve -o -c openems-backend-dev`
 
 . Open a browser at http://localhost:4200
 
-. You should see again OpenEMS UI, but this time you are not asked for a login (because Metadata.Dummy does not require any) and are directly forwarded to the Energy Monitor at `http://localhost:4200/device/edge0/index`. You are now seeing the data from OpenEMS Edge via OpenEMS Backend.
+. You should see OpenEMS UI Login. Log in with any email / username and password.
+
+. You should see again OpenEMS UI, you have to login again (because Metadata.Dummy does require a login), then you are forwarded to `http://localhost:4200/device/edge0/live`. You are now seeing the data from OpenEMS Edge via OpenEMS Backend.
 +
 .UI via Backend
 image::ui-via-backend.png[UI via Backend]

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 2021.18.0
+Version 2021.19.0
 :sectnums:
 :sectnumlevels: 4
 :toc:

diff --git a/io.openems.backend.application/BackendApp.bndrun b/io.openems.backend.application/BackendApp.bndrun
@@ -39,7 +39,7 @@
 
 -runbundles: \
 	Java-WebSocket;version='[1.5.2,1.5.3)',\
-	com.google.gson;version='[2.8.8,2.8.9)',\
+	com.google.gson;version='[2.8.9,2.8.10)',\
 	com.google.guava;version='[31.0.1,31.0.2)',\
 	com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\
 	com.zaxxer.HikariCP;version='[4.0.3,4.0.4)',\
@@ -76,7 +76,7 @@
 	org.jsr-305;version='[3.0.2,3.0.3)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
 	org.ops4j.pax.logging.pax-logging-log4j1;version='[2.0.10,2.0.11)',\
-	org.osgi.service.jdbc;version='[1.0.0,1.0.1)',\
+	org.osgi.service.jdbc;version='[1.0.1,1.0.2)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
-	org.postgresql.jdbc;version='[42.3.0,42.3.1)'
+	org.postgresql.jdbc;version='[42.3.1,42.3.2)'
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 = 18;
+	public final static short VERSION_MINOR = 19;
 
 	/**
 	 * The patch version of OpenEMS.

diff --git a/io.openems.edge.application/EdgeApp.bndrun b/io.openems.edge.application/EdgeApp.bndrun
@@ -153,7 +153,7 @@
 	Java-WebSocket;version='[1.5.2,1.5.3)',\
 	com.fazecast.jSerialComm;version='[2.5.1,2.5.2)',\
 	com.ghgande.j2mod;version='[2.5.5,2.5.6)',\
-	com.google.gson;version='[2.8.8,2.8.9)',\
+	com.google.gson;version='[2.8.9,2.8.10)',\
 	com.google.guava;version='[31.0.1,31.0.2)',\
 	com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\
 	com.sun.jna;version='[5.9.0,5.9.1)',\

diff --git a/io.openems.edge.meter.api/src/io/openems/edge/meter/api/AsymmetricMeter.java b/io.openems.edge.meter.api/src/io/openems/edge/meter/api/AsymmetricMeter.java
@@ -712,8 +712,8 @@ public static void initializePowerSumChannels(AsymmetricMeter meter) {
 		final Consumer<Value<Integer>> reactivePowerSum = ignore -> {
 			meter._setReactivePower(TypeUtils.sum(//
 					meter.getReactivePowerL1Channel().getNextValue().get(), //
-					meter.getReactivePowerL1Channel().getNextValue().get(), //
-					meter.getReactivePowerL1Channel().getNextValue().get())); //
+					meter.getReactivePowerL2Channel().getNextValue().get(), //
+					meter.getReactivePowerL3Channel().getNextValue().get())); //
 		};
 		meter.getReactivePowerL1Channel().onSetNextValue(reactivePowerSum);
 		meter.getReactivePowerL2Channel().onSetNextValue(reactivePowerSum);

diff --git a/...nems.edge.timedata.influxdb/src/io/openems/edge/timedata/influxdb/InfluxTimedataImpl.java b/...nems.edge.timedata.influxdb/src/io/openems/edge/timedata/influxdb/InfluxTimedataImpl.java
@@ -34,6 +34,7 @@
 import io.openems.edge.common.component.AbstractOpenemsComponent;
 import io.openems.edge.common.component.ComponentManager;
 import io.openems.edge.common.component.OpenemsComponent;
+import io.openems.edge.common.cycle.Cycle;
 import io.openems.edge.common.event.EdgeEventConstants;
 import io.openems.edge.timedata.api.Timedata;
 import io.openems.shared.influxdb.InfluxConnector;
@@ -51,6 +52,9 @@ public class InfluxTimedataImpl extends AbstractOpenemsComponent
 
 	private final Logger log = LoggerFactory.getLogger(InfluxTimedataImpl.class);
 
+	@Reference
+	private Cycle cycle;
+
 	private InfluxConnector influxConnector = null;
 
 	// Counts the number of Cycles till data is written to InfluxDB.
@@ -104,11 +108,12 @@ public void handleEvent(Event event) {
 	}
 
 	protected synchronized void collectAndWriteChannelValues() {
-		long timestamp = System.currentTimeMillis() / 1000;
+		int cycleTime = this.cycle.getCycleTime(); // [ms]
+		long timestamp = System.currentTimeMillis() / cycleTime * cycleTime; // Round value to Cycle-Time in [ms]
 
 		if (++this.cycleCount >= this.config.noOfCycles()) {
 			this.cycleCount = 0;
-			final Builder point = Point.measurement(InfluxConnector.MEASUREMENT).time(timestamp, TimeUnit.SECONDS);
+			final Builder point = Point.measurement(InfluxConnector.MEASUREMENT).time(timestamp, TimeUnit.MILLISECONDS);
 			final AtomicBoolean addedAtLeastOneChannelValue = new AtomicBoolean(false);
 
 			this.componentManager.getEnabledComponents().stream().filter(c -> c.isEnabled()).forEach(component -> {

diff --git a/io.openems.wrapper/influxdb-java.bnd b/io.openems.wrapper/influxdb-java.bnd
@@ -6,7 +6,7 @@ Bundle-Version: 2.17
 
 Include-Resource: \
 	@converter-moshi-2.9.0.jar,\
-	@influxdb-java-2.17.jar,\
+	@influxdb-java-2.22.jar,\
 	@moshi-1.12.0.jar,\
 	@msgpack-core-0.9.0.jar,\
 	@retrofit-2.9.0.jar

diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "openems-ui",
-  "version": "2021.18.0",
+  "version": "2021.19.0",
   "license": "AGPL-3.0",
   "private": true,
   "dependencies": {
@@ -20,8 +20,8 @@
     "angular-mydatepicker": "^0.11.5",
     "chart.js": "^2.9.4",
     "classlist.js": "^1.1.20150312",
-    "d3": "^7.0.1",
-    "date-fns": "^2.23.0",
+    "d3": "^7.1.1",
+    "date-fns": "^2.25.0",
     "file-saver-es": "^2.0.5",
     "ng2-charts": "^2.4.3",
     "ngx-cookie-service": "^12.0.3",

diff --git a/ui/src/app/user/user.component.html b/ui/src/app/user/user.component.html
@@ -95,8 +95,8 @@
                 <a target="_blank" href="https://openems.io" translate>About.openEMS</a>
               </li>
               <li>
-                <a target="_blank" href="https://github.com/OpenEMS/openems/releases/tag/2021.18.0">
-                  <span translate>About.build</span>: 2021.18.0 (2021-10-21)</a>
+                <a target="_blank" href="https://github.com/OpenEMS/openems/releases/tag/2021.19.0">
+                  <span translate>About.build</span>: 2021.19.0 (2021-11-04)</a>
               </li>
             </ul>
             <p class="ion-padding">

diff --git a/ui/src/themes/openems/environments/edge-prod.ts b/ui/src/themes/openems/environments/edge-prod.ts
@@ -8,8 +8,8 @@ export const environment: Environment = {
     edgeLongName: "Open Energy Management System",
 
     backend: 'OpenEMS Edge',
-    url: "ws://" + location.hostname + ":8085",
+    url: "ws://" + location.hostname + ":8075",
 
     production: true,
     debugMode: false,
-};
+};