Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FEMS Backports 2024-11-19 #2882

Merged
merged 25 commits into from
Nov 19, 2024
Merged

FEMS Backports 2024-11-19 #2882

merged 25 commits into from
Nov 19, 2024

Conversation

sfeilmeier
Copy link
Contributor

No description provided.

sfeilmeier and others added 24 commits November 19, 2024 18:29
- restructure test env to be suited for ibn unittests

`TestingUtils.mergeSetup` makes setting up effective test environments easier

Reviewed-by: Sagar Venu <32655208+venu-sagar@users.noreply.github.com>
Reviewed-by: Stefan Feilmeier <3515268+sfeilmeier@users.noreply.github.com>
Co-authored-by: Lukas Rieger <73471197+lukasrgr@users.noreply.github.com>
Co-committed-by: Lukas Rieger <73471197+lukasrgr@users.noreply.github.com>
- distribute sending data over (almost) whole 5 minutes to have not all data at once in the backend
- added sparate executor for aggregated tasks
- use single created "now" timestamp
- add randomiser for sending aggregated tasks between 0sec - 270sec

Reviewed-by: Kai Jeschek <99220919+da-Kai@users.noreply.github.com>
Reviewed-by: Stefan Feilmeier <3515268+sfeilmeier@users.noreply.github.com>
Co-authored-by: Michael Grill <59126309+michaelgrill@users.noreply.github.com>
Co-committed-by: Michael Grill <59126309+michaelgrill@users.noreply.github.com>
Co-authored-by: Sebastian Asen <47855186+sebastianasen@users.noreply.github.com>
Co-authored-by: Michael Grill <59126309+michaelgrill@users.noreply.github.com>
Co-authored-by: Stefan Feilmeier <3515268+sfeilmeier@users.noreply.github.com>
Reviewed-by: Sebastian Asen <47855186+sebastianasen@users.noreply.github.com>
Reviewed-by: Michael Grill <59126309+michaelgrill@users.noreply.github.com>
Co-authored-by: Johann Kaufmann <165755282+johannk24@users.noreply.github.com>
Co-committed-by: Johann Kaufmann <165755282+johannk24@users.noreply.github.com>
- updated price retrieving
- use oauth client for credentials
- only zipcode needed for local prices

Co-authored-by: Sagar Venu <32655208+venu-sagar@users.noreply.github.com>
Reviewed-by: Sagar Venu <32655208+venu-sagar@users.noreply.github.com>
Reviewed-by: Stefan Feilmeier <3515268+sfeilmeier@users.noreply.github.com>
Co-authored-by: Michael Grill <59126309+michaelgrill@users.noreply.github.com>
Co-committed-by: Michael Grill <59126309+michaelgrill@users.noreply.github.com>
…en2 & Commercial 92)

- Preparation for new OpenEMS Hardware
- use new modbus port for new hardware

Reviewed-by: Kai Jeschek <99220919+da-Kai@users.noreply.github.com>
Reviewed-by: Stefan Feilmeier <3515268+sfeilmeier@users.noreply.github.com>
Co-authored-by: Michael Grill <59126309+michaelgrill@users.noreply.github.com>
Co-committed-by: Michael Grill <59126309+michaelgrill@users.noreply.github.com>
- Replacing time of use title with Cent instead of cent per kWh

Reviewed-by: Stefan Feilmeier <3515268+sfeilmeier@users.noreply.github.com>
Co-authored-by: Lukas Rieger <73471197+lukasrgr@users.noreply.github.com>
Co-committed-by: Lukas Rieger <73471197+lukasrgr@users.noreply.github.com>
- Update 14a Controller in Scheduler to be at the top
- added Setting to enable 14a in Commercial 92 & Home Gen 2 Apps

Reviewed-by: Sebastian Asen <47855186+sebastianasen@users.noreply.github.com>
Reviewed-by: Stefan Feilmeier <3515268+sfeilmeier@users.noreply.github.com>
Co-authored-by: Michael Grill <59126309+michaelgrill@users.noreply.github.com>
Co-committed-by: Michael Grill <59126309+michaelgrill@users.noreply.github.com>
The hardware block at the goodwe responsible for three functions needs to be enabled/disabled if at least one of this external limitation function is needed.

Functions of Register 47010 (DRED_REMOTE_SHUTDOWN_RCR_FUNCTIONS_ENABLE)
- DRED
- Remote Shutdown (NA-Schutz)
- RCR (Rundsteuerempfänger)

Co-authored-by: Michael Grill <59126309+michaelgrill@users.noreply.github.com>
Reviewed-by: Michael Grill <59126309+michaelgrill@users.noreply.github.com>
Reviewed-by: Stefan Feilmeier <3515268+sfeilmeier@users.noreply.github.com>
Co-authored-by: Sebastian Asen <47855186+sebastianasen@users.noreply.github.com>
Co-committed-by: Sebastian Asen <47855186+sebastianasen@users.noreply.github.com>
Update App Names

Reviewed-by: Sebastian Asen <47855186+sebastianasen@users.noreply.github.com>
Co-authored-by: Michael Grill <59126309+michaelgrill@users.noreply.github.com>
Co-committed-by: Michael Grill <59126309+michaelgrill@users.noreply.github.com>
- new standard prop "excludingIp" in common props of apps
- Formly builder gets all IPs via new Request and builds a RegEx using those ips
- formly builder is then set as a validator
- json rpc request that gets all ip addresses of the system

Reviewed-by: Michael Grill <59126309+michaelgrill@users.noreply.github.com>
Reviewed-by: Stefan Feilmeier <3515268+sfeilmeier@users.noreply.github.com>
Co-authored-by: Johann Kaufmann <165755282+johannk24@users.noreply.github.com>
Co-committed-by: Johann Kaufmann <165755282+johannk24@users.noreply.github.com>
- try angular 18 feature of standalone lazy loaded components
-> [ref](https://angular.dev/guide/ngmodules/lazy-loading) -> reduces init bundle size
- decrease size of init app bundle

- Fetched on app init
- Resources for changelog now only fetched if route got activated

Reviewed-by: Sagar Venu <32655208+venu-sagar@users.noreply.github.com>
Reviewed-by: Stefan Feilmeier <3515268+sfeilmeier@users.noreply.github.com>
Co-authored-by: Lukas Rieger <73471197+lukasrgr@users.noreply.github.com>
Co-committed-by: Lukas Rieger <73471197+lukasrgr@users.noreply.github.com>
- Remove static config in ToU-Controller; instead apply Limiter.RESTRICTED_MODE of referenced `ControllerEssLimiter14a`
- Fix Limiter Channel type to BOOLEAN

Reviewed-by: Sagar Venu <sagar.venu@fenecon.de>
Reviewed-by: Lukas Rieger <73471197+lukasrgr@users.noreply.github.com>
Reviewed-by: Stefan Feilmeier <3515268+sfeilmeier@users.noreply.github.com>
Co-authored-by: Sagar Venu <32655208+venu-sagar@users.noreply.github.com>
Co-committed-by: Sagar Venu <32655208+venu-sagar@users.noreply.github.com>
- Apply rounding of decimal values to states

Reviewed-by: Lukas Rieger <73471197+lukasrgr@users.noreply.github.com>
- Currently incompatible apps are shown multiple times when a key is redeemed
- This is due to an already filled array getting filled again.
- To prevent this, the array is cleared out before the apps are getting shown.

Reviewed-by: Michael Grill <59126309+michaelgrill@users.noreply.github.com>
Reviewed-by: Stefan Feilmeier <3515268+sfeilmeier@users.noreply.github.com>
Co-authored-by: Fabian Brandtner <10850256+fabian94533@users.noreply.github.com>
Co-committed-by: Fabian Brandtner <10850256+fabian94533@users.noreply.github.com>
- utils class for evcs
- static method that checks which channelId has to be read for the power value of the evcs
- history and live widget of evcs use static method

Co-authored-by: Sebastian Asen <47855186+sebastianasen@users.noreply.github.com>
Reviewed-by: Lukas Rieger <73471197+lukasrgr@users.noreply.github.com>
Reviewed-by: Sebastian Asen <47855186+sebastianasen@users.noreply.github.com>
Reviewed-by: Stefan Feilmeier <3515268+sfeilmeier@users.noreply.github.com>
Co-authored-by: Johann Kaufmann <165755282+johannk24@users.noreply.github.com>
Co-committed-by: Johann Kaufmann <165755282+johannk24@users.noreply.github.com>
…slation

- Fix translations in changelogmodule
- Fix last yAxis tick to be a number instead of `kW` in heating element history

Reviewed-by: Sagar Venu <32655208+venu-sagar@users.noreply.github.com>
Reviewed-by: Stefan Feilmeier <3515268+sfeilmeier@users.noreply.github.com>
Co-authored-by: Lukas Rieger <73471197+lukasrgr@users.noreply.github.com>
Co-committed-by: Lukas Rieger <73471197+lukasrgr@users.noreply.github.com>
`changelog` was not scrollable

Reviewed-by: Sagar Venu <32655208+venu-sagar@users.noreply.github.com>
Reviewed-by: hanna  spaeth <hanna.spaeth@fenecon.de>
Reviewed-by: Stefan Feilmeier <3515268+sfeilmeier@users.noreply.github.com>
Co-authored-by: Lukas Rieger <73471197+lukasrgr@users.noreply.github.com>
Co-committed-by: Lukas Rieger <73471197+lukasrgr@users.noreply.github.com>
The "readElementsOnce" was designed to use FC3. Some modbus devices require FC4 instead. This change now requires explicit definition of the `FunctionCode`.

Co-authored-by: Stefan Feilmeier <3515268+sfeilmeier@users.noreply.github.com>
Reviewed-by: Hueseyin Sahutoglu <34771592+huseyinsaht@users.noreply.github.com>
Reviewed-by: Stefan Feilmeier <3515268+sfeilmeier@users.noreply.github.com>
Co-authored-by: Pooran Chandrashekaraiah <46567310+pooran-c@users.noreply.github.com>
Co-committed-by: Pooran Chandrashekaraiah <46567310+pooran-c@users.noreply.github.com>
- Extract common methods to an abstract QuarterlyValues class
- Make sure ZonedDateTime `isEqual()` method is used to retrieve values. Before the ZoneId would make a difference (see new test in DummyPredictorManagerTest.java)
- Use Guavas ImmutableSortedMap which does not anymore allow `null` values

Co-authored-by: Sagar Venu <32655208+venu-sagar@users.noreply.github.com>
Reviewed-by: Sagar Venu <32655208+venu-sagar@users.noreply.github.com>
Time-of-use history:
- Change ordering of datasets, that `GridBuy` is at the forefront
- fix y Axis title to display `Cent` instead of `kW`
- fix scaling issues with null values caused by `GridBuy` dataset

Reviewed-by: Sagar Venu <32655208+venu-sagar@users.noreply.github.com>
Reviewed-by: Stefan Feilmeier <3515268+sfeilmeier@users.noreply.github.com>
Co-authored-by: Lukas Rieger <73471197+lukasrgr@users.noreply.github.com>
Co-committed-by: Lukas Rieger <73471197+lukasrgr@users.noreply.github.com>
Copy link

codecov bot commented Nov 19, 2024

Codecov Report

Attention: Patch coverage is 71.17904% with 264 lines in your changes missing coverage. Please review.

Additional details and impacted files
@@              Coverage Diff              @@
##             develop    #2882      +/-   ##
=============================================
+ Coverage      56.82%   57.32%   +0.50%     
- Complexity      9043     9159     +116     
=============================================
  Files           2171     2177       +6     
  Lines          92271    92873     +602     
  Branches        6848     6883      +35     
=============================================
+ Hits           52426    53227     +801     
+ Misses         37924    37698     -226     
- Partials        1921     1948      +27     
---- 🚨 Try these New Features:

@sfeilmeier sfeilmeier changed the title FEMS Backports 2024.11.19 FEMS Backports 2024-11-19 Nov 19, 2024
@sfeilmeier sfeilmeier merged commit 6f227ca into develop Nov 19, 2024
7 checks passed
@sfeilmeier sfeilmeier deleted the feature/fems-backports branch November 19, 2024 18:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant