Open
Conversation
# Conflicts: # ui/package-lock.json # ui/package.json # ui/src/app/edge/live/autarchy/autarchy.component.ts # ui/src/app/edge/live/heatpump/heatpump.component.ts # ui/src/app/edge/live/live.module.ts # ui/src/app/shared/service/service.ts
…velop_realOpenEMS # Conflicts: # ui/package-lock.json # ui/package.json # ui/src/app/edge/live/autarchy/autarchy.component.ts # ui/src/app/edge/live/heatpump/heatpump.component.ts # ui/src/app/edge/live/live.module.ts # ui/src/app/shared/service/service.ts
…elop_realOpenEMS
# Conflicts: # ui/package-lock.json # ui/package.json # ui/src/app/edge/live/live.module.ts # ui/src/app/shared/service/service.ts
|
Test |
* Bump info.faljse:SDNotify from 1.3 to 1.5 in /cnf Bumps [info.faljse:SDNotify](https://github.com/faljse/SDNotify) from 1.3 to 1.5. - [Commits](https://github.com/faljse/SDNotify/commits) --- updated-dependencies: - dependency-name: info.faljse:SDNotify dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Update bnd --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
* Bump org.rrd4j:rrd4j from 3.8.2 to 3.9 in /cnf Bumps [org.rrd4j:rrd4j](https://github.com/rrd4j/rrd4j) from 3.8.2 to 3.9. - [Changelog](https://github.com/rrd4j/rrd4j/blob/master/changelog.txt) - [Commits](https://github.com/rrd4j/rrd4j/commits) --- updated-dependencies: - dependency-name: org.rrd4j:rrd4j dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Update bndrun --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
… in /cnf (OpenEMS#2326) * Bump org.apache.felix:org.apache.felix.http.jetty in /cnf Bumps org.apache.felix:org.apache.felix.http.jetty from 5.0.4 to 5.0.6. --- updated-dependencies: - dependency-name: org.apache.felix:org.apache.felix.http.jetty dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Update bndrun --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
This fixes the issue reported in https://community.openems.io/t/modbus-tcp-gerat-mit-eclipse-debuggen/1839/2 * Add JUnit test that shows previous implementation error * Parse FC4 response to Register[] Tested on private setup
This PR adds: - ENTSO-E as Time-of-Use Tariff provider for day-ahead prices in European power grids. These tariffs can then be used e.g. in combination with "ESS Time-of-Use Tariff Discharge Controller" (https://github.com/OpenEMS/openems/tree/develop/io.openems.edge.controller.ess.timeofusetariff.discharge) or its future replacement in OpenEMS#2238. - Global configuration for "Currency" in the Core.Meta Component. Every monetary value in OpenEMS is inherently expressed in this Currency. Values obtained in a different currency (e.g. energy prices from a web service) have to be internally converted to this Currency. - "exchangerate.host" (Exchange rates API is a free service for current and historical foreign exchange rates & crypto currencies rates). The implementation is currently only local to the ENTSO-E bundle, because we currently do not need this feature anywhere else yet. In future this could be extracted to a separate service. _If you or your company use this project or like what [exchangerate.host] is doing, please consider backing [them] so [they] can continue maintaining and evolving this project." -> "https://exchangerate.host/#/donate" To request a (free) authentication token for the ENTSO-E transparency platform, please see chapter "2. Authentication and Authorisation" in the official API documentation: https://transparency.entsoe.eu/content/static_content/Static%20content/web%20api/Guide.html#_authentication_and_authorisation Co-authored-by: Sagar Bandi Venu <sagar.venu@fenecon.de>
Bumps [compare-versions](https://github.com/omichelsen/compare-versions) from 6.0.0 to 6.1.0. - [Changelog](https://github.com/omichelsen/compare-versions/blob/main/CHANGELOG.md) - [Commits](omichelsen/compare-versions@v6.0.0...v6.1.0) --- updated-dependencies: - dependency-name: compare-versions dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
…penEMS#2324) Based on PR OpenEMS#2304 by [nlamarti](https://github.com/nlamarti), this new PR handles the comments made there. Comparing the old and new output file `DefaultSunSpecModel.java`, the following changed: - The descriptions "Ref 3: 8.14.3.2, Ref 4: 17" in the 12x models disappeared, because they are not in the json-files. - The models 302-304 are now ignored. They only consist of one repeating block (which OpenEMS cannot handle as of now), and as far as I can see, no component uses them currently. - The models 701-715 are added - Descriptions of some points changed Note that the length of model 701 is 155>126=maximum length of a modbus task in j2mod. As the `AbstractOpenemsSunSpecComponent` adds one task for each block, this causes an error (see issue 2311). I have fixed this already, this will be done in a seperate PR. Furthermore, I used modern syntax in the switch-statements in `SunSpecPoint.java`, as I had to update them anyway due to the new pointn type STRING32. Lastly, I had to write a new method `getAsStringOrElse` in `JsonUtils.java`, and the other changes in this file are caused by the automatic code clean up. --------- Co-authored-by: nlamarti <2514024+nlamarti@users.noreply.github.com> Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
- Update text and images - Fix Bnd templates Fixes OpenEMS#1507
* create seprate release action * change to push event
Adds some basic backend documentation about Metadata and Timedata. Gives some more starter information on the usage of the influxdb and the aggregated influxdb bundle. --------- Co-authored-by: Thomas Sicking <91258335+tsicking@users.noreply.github.com> Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de> Co-authored-by: Michael Grill <59126309+michaelgrill@users.noreply.github.com>
…2256) An Edge2EdgeEss tried to read out the write-only channels, causing a read error. This is fixed by setting the modbus register of a write-only channel to "undefined" (like it is done for the registers in between natures). - Add a JUnit test - Migrated the entire file to switch expressions --------- Co-authored-by: Stefan Feilmeier <3515268+sfeilmeier@users.noreply.github.com>
2023.10.0
…2380) * Bump com.squareup.okio:okio-jvm from 3.5.0 to 3.6.0 in /cnf Bumps [com.squareup.okio:okio-jvm](https://github.com/square/okio) from 3.5.0 to 3.6.0. - [Changelog](https://github.com/square/okio/blob/master/CHANGELOG.md) - [Commits](square/okio@parent-3.5.0...parent-3.6.0) --- updated-dependencies: - dependency-name: com.squareup.okio:okio-jvm dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Update bndrun --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
… in /cnf (OpenEMS#2379) * Bump org.apache.felix:org.apache.felix.http.jetty in /cnf Bumps org.apache.felix:org.apache.felix.http.jetty from 5.1.0 to 5.1.2. --- updated-dependencies: - dependency-name: org.apache.felix:org.apache.felix.http.jetty dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Update bndrun --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
… 3.0.0 in /cnf (OpenEMS#2378) * Bump org.apache.felix:org.apache.felix.http.servlet-api in /cnf Bumps org.apache.felix:org.apache.felix.http.servlet-api from 2.1.0 to 3.0.0. --- updated-dependencies: - dependency-name: org.apache.felix:org.apache.felix.http.servlet-api dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * Update bndrun --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
…#2377) * Bump io.reactivex.rxjava3:rxjava from 3.1.7 to 3.1.8 in /cnf Bumps [io.reactivex.rxjava3:rxjava](https://github.com/ReactiveX/RxJava) from 3.1.7 to 3.1.8. - [Release notes](https://github.com/ReactiveX/RxJava/releases) - [Commits](ReactiveX/RxJava@v3.1.7...v3.1.8) --- updated-dependencies: - dependency-name: io.reactivex.rxjava3:rxjava dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Update bndrun --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
…penEMS#2376) * Bump org.checkerframework:checker-qual from 3.38.0 to 3.39.0 in /cnf Bumps [org.checkerframework:checker-qual](https://github.com/typetools/checker-framework) from 3.38.0 to 3.39.0. - [Release notes](https://github.com/typetools/checker-framework/releases) - [Changelog](https://github.com/typetools/checker-framework/blob/master/docs/CHANGELOG.md) - [Commits](typetools/checker-framework@checker-framework-3.38.0...checker-framework-3.39.0) --- updated-dependencies: - dependency-name: org.checkerframework:checker-qual dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Update bndrun --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
* Bump commons-io:commons-io from 2.13.0 to 2.14.0 in /cnf Bumps commons-io:commons-io from 2.13.0 to 2.14.0. --- updated-dependencies: - dependency-name: commons-io:commons-io dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Update bndrun --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
… in /cnf (OpenEMS#2383) * Bump org.apache.felix:org.apache.felix.webconsole in /cnf Bumps org.apache.felix:org.apache.felix.webconsole from 4.9.4 to 4.9.6. --- updated-dependencies: - dependency-name: org.apache.felix:org.apache.felix.webconsole dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Update bndrun --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
* Bump de.bytefish:pgbulkinsert from 8.1.1 to 8.1.2 in /cnf Bumps [de.bytefish:pgbulkinsert](https://github.com/bytefish/PgBulkInsert) from 8.1.1 to 8.1.2. - [Release notes](https://github.com/bytefish/PgBulkInsert/releases) - [Changelog](https://github.com/PgBulkInsert/PgBulkInsert/blob/master/CHANGELOG.md) - [Commits](https://github.com/bytefish/PgBulkInsert/commits) --- updated-dependencies: - dependency-name: de.bytefish:pgbulkinsert dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Update bndrun + wrapper * Update pom --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
) This new implementation replaces the previous controller called TimeOfUseTariffDischarge. **BREAKING CHANGE:** Be aware, that this PR introduces a new Factory-ID `Controller.Ess.Time-Of-Use-Tariff'` for the Controller. Old configurations will have to be updated manually! - Added Jsonrpc request handler to show future data in UI. - Modified Awattar provider implementation to handle querying for a price every hour instead of once a day. - Added appropriate channels for better debugging. - Added suitable test cases. README: = ESS Time-of-Use Tariff This Controller optimizes the performance of an energy storage system (ESS) in conjunction with a Time-Of-Use (ToU) Tariff provider. The primary aim of the controller is to optimize the economic utilization of energy stored within the battery, primarily for self-consumption. To achieve this goal, the controller employs a rolling approach, where it continuously fetches predictions from the prediction service. It takes into account the current state of the battery's capacity, recalculates its operations, and generates a detailed schedule for the Energy Storage System (ESS) for the upcoming 24-hour period, in 15-minute intervals. This iterative and dynamic approach ensures that the ESS operates efficiently by staying synchronized with real-time forecasts and the evolving state of the battery, thereby maximizing cost-effectiveness and self-consumption of stored energy. == Schedule Calculation Modes The schedule calculation process varies depending on the local market conditions. To accommodate this variability, two distinct modes have been introduced to facilitate flexible operation: CHARGE_CONSUMPTION:: This mode is well-suited for markets that permit charging the battery from the grid. In this mode, the controller utilizes production and consumption forecasts along with day-ahead electricity prices to calculate the optimal time periods for charging the battery from the grid. This approach ensures efficient utilization of resources while taking advantage of cost-effective grid charging opportunities. DELAY_DISCHARGE:: This mode is tailored for markets where grid charging is restricted or discouraged. In such scenarios, optimal time periods are determined based on forecasts and day-ahead pricing information. The controller then schedules the Energy Storage System (ESS) to limit or delay discharging during these specific periods. This strategic approach aims to optimize economic performance by avoiding costly grid interactions when grid charging is not feasible or economical. These two operation modes provide the necessary flexibility to adapt to varying market conditions, allowing for efficient energy management and cost savings based on the specific requirements of your local energy market. --------- Co-authored-by: Stefan Feilmeier <3515268+sfeilmeier@users.noreply.github.com> Co-authored-by: Michael Grill <59126309+michaelgrill@users.noreply.github.com>
…PhasesFromReactivePower (OpenEMS#2386) * Bugfix in SinglePhaseMeter.calculateSinglePhaseFromActivePower * Validate bugfix with JUnit test * Add more JUnit test + fix one more copy&paste error --------- Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
- There are SunSpec Channels which have a constant scale factor, e.g. S305_LAT has a scale factor of -7. The current implementation of the AbstractOpenemsSunSpecComponent cannot handle these, but only those whose scale factor is read via modbus. This PR handles this issue. - Moreover, a DummySunSpecComponent with all default models is added for JUnit testing, as well as a small JUnit test checking that the modbus tasks are not too long. - DummySunSpecComponent: initialize SunSpec modals in ASC order - Refactor addReadTasks to preprocessModbusElements to be able to reuse it for WriteTasks - Create one FC16WriteRegistersTask for all writeable registers of one block This solves some perfomance problems we had with multiple WriteTasks being executed on every Cycle (e.g. write ActivePower and ReactivePower channels) - Extract generateElementToChannelConverter logic was split to two places before; also now I am always applying the 'isDefined' check - even for Points with Scale-Factor - ScaleFactor: get next value to win one cycle (NOTE: this is still too slow with one cycle, but that will be tackled in another PR) --------- Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
…enEMS#2390) * Bump com.google.guava:guava from 32.1.2-jre to 32.1.3-jre in /cnf Bumps [com.google.guava:guava](https://github.com/google/guava) from 32.1.2-jre to 32.1.3-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Update bnd * Update bndrun * Update bndrun --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
* Introduce _sum/UnmanagedConsumptionActivePower This channel value represents the part of the Consumption that is not actively managed by OpenEMS, i.e. it is calculated as _sum/ConsumptionActivePower minus charge power for an electric vehicle charging station, etc. The value is used for forecasting of consumption. * PhoenixContact Meter: add invert option * SunSpec: dynamic scale-factors Handle dynamically changing scale-factors in SunSpec * AppCenter: add required property to AppDef - moved required from field to AppDef - add test for required to field - minor property changes * ESS Cluster: Calculate effective start stop * Alpitronic Hypercharger: fix energy `null` vs 0 * Implement F&F Filipowski MR-AO-1 + Analog Output Controller * ControllerEssGridOptimizedCharge, IoShelly25, IoShellyPlug: set persistence priority to high for some channels Set PersistencePriority of channels to high in ControllerEssGridOptimizedCharge, IoShelly25, IoShellyPlug because they are used in UI * Edge: change firstSetupProtocol from being today to null * AppCenter: FixActivePower App Added a App for a FixActivePower Controller. * UI: Stringify values of formly field type text * Stringify json in formly-field type text to enable editing in UI "Update Component" * UI: Restrict Queries before IBN-Date * adjust calendar to only be able to select all dates after ibn * Bugfix for ENTSO-E * Add Webasto Apps --------- Co-authored-by: Sagar Venu <32655208+venu-sagar@users.noreply.github.com> Co-authored-by: Pooran Chandrashekaraiah <46567310+pooran-c@users.noreply.github.com> Co-authored-by: Michael Grill <59126309+michaelgrill@users.noreply.github.com> Co-authored-by: Hueseyin Sahutoglu <34771592+huseyinsaht@users.noreply.github.com> Co-authored-by: Lorant Meszlenyi <16509320+hydroid7@users.noreply.github.com> Co-authored-by: Sebastian Asen <47855186+sebastianasen@users.noreply.github.com> Co-authored-by: Kai Jeschek <99220919+da-Kai@users.noreply.github.com> Co-authored-by: Lukas Rieger <73471197+lukasrgr@users.noreply.github.com>
…MS#2399) * Bump com.squareup.okhttp3:logging-interceptor in /cnf Bumps [com.squareup.okhttp3:logging-interceptor](https://github.com/square/okhttp) from 4.11.0 to 4.12.0. - [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md) - [Commits](square/okhttp@parent-4.11.0...parent-4.12.0) --- updated-dependencies: - dependency-name: com.squareup.okhttp3:logging-interceptor dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump com.squareup.okhttp3:okhttp from 4.11.0 to 4.12.0 in /cnf Bumps [com.squareup.okhttp3:okhttp](https://github.com/square/okhttp) from 4.11.0 to 4.12.0. - [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md) - [Commits](square/okhttp@parent-4.11.0...parent-4.12.0) --- updated-dependencies: - dependency-name: com.squareup.okhttp3:okhttp dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Update bnd --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
…EMS#2400) * Bump com.google.guava:failureaccess from 1.0.1 to 1.0.2 in /cnf Bumps com.google.guava:failureaccess from 1.0.1 to 1.0.2. --- updated-dependencies: - dependency-name: com.google.guava:failureaccess dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Update bndrun --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
* Bump org.jsoup:jsoup from 1.16.1 to 1.16.2 in /cnf Bumps [org.jsoup:jsoup](https://github.com/jhy/jsoup) from 1.16.1 to 1.16.2. - [Release notes](https://github.com/jhy/jsoup/releases) - [Changelog](https://github.com/jhy/jsoup/blob/master/CHANGES) - [Commits](jhy/jsoup@jsoup-1.16.1...jsoup-1.16.2) --- updated-dependencies: - dependency-name: org.jsoup:jsoup dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Update bndrun --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
* Moved TimeLeapClock from edge.common to common UnitTests of Backend have no access to TimeLeapClock, this commit fixes the issue. Co-authored-by: Kai Jeschek <99220919+da-Kai@users.noreply.github.com> * Fix sorting of imports --------- Co-authored-by: Kai Jeschek <99220919+da-Kai@users.noreply.github.com> Co-authored-by: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
# Conflicts: # .github/workflows/build.yml # ui/package-lock.json # ui/package.json # ui/src/app/edge/live/live.module.ts # ui/src/app/shared/service/service.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Testing gh pr comment for code coverage