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-10 (2) #2846

Merged
merged 18 commits into from
Oct 18, 2024
Merged

FEMS Backports 2024-10 (2) #2846

merged 18 commits into from
Oct 18, 2024

Conversation

sfeilmeier
Copy link
Contributor

@sfeilmeier sfeilmeier commented Oct 18, 2024

  • EVCS HardyBarth: communicate via HTTP-Bridge

    • Implemented BridgeHttp in Impl of HardyBarthEvcs
    • All Api Calls now flow through that Bridge
    • Api Calls (esp. setHeartBeat that previously was synchronous) are now asynchronous
    • Add JUnit tests
  • EVCS: implement ElectricityMeter

    • Migrate all EVCS to ElectricityMeter Nature
    • Add DeprecatedEvcs Nature to mark EVCS that have to be migrated and still support old Channels ChargePower and ActiveConsumptionEnergy
    • Implement generic evaluatePhaseCount() method
    • UI: Mix Evcs & ElectricityMeter (live != history)
      • Live: use ElectricityMeter if its already available (e.g. for power of individual phases)
      • History: use Evcs to ensure availability of historic data
    • Implement configurable PhaseRotation in configuration and Apps (copied and adjusted from proposal version for a new EVCS API (v2) #2047)
    • Fix AbstractManagedEvcs deactivate()
  • UI: Performance improvements

    • Navigation for users with at most Role OWNER with one fems assigned, get directly routed to device/edgeId/live
    • Navigation for users with at least Role INSTALLER -> /overview
    • Removed flickering of headerComponent. Issue results from creating header component for each view
  • Sum: do not ignore ExtremeEverValues in EdgeConfig

  • Update gradle to 8.10.2

  • UI: Refactor heating element history

    • Refactoring HeatingElement and using the new Cumulated[Level 1 -3]ActiveTime
  • UI: Adjust Chart-axis generation

    • Multiple yAxis: Increase chart canvas by putting y axis labels into ticks, the most upper tick gets replaced by axis title
  • Extend export to Excel file

    • Added detailed data for the excel export of historic data
  • UI: fix header in history charts and add enable rescaling in history charts

    • Rescaling of charts was not possible due to not ignoring hidden values
    • Header was shown in the chart views
    • Introduce <app-header> and keep <header> as single navigation point header
  • Java JUnit tests: improve framework + cleanup

    • Improve OpenEMS JUnit test framework
    • Apply best practices to JUnit tests

Co-authored-by: Lukas Rieger [email protected]
Co-authored-by: Sebastian Asen [email protected]
Co-authored-by: Stefan Feilmeier [email protected]
Co-authored-by: Johann Kaufmann [email protected]

sfeilmeier and others added 18 commits October 18, 2024 23:17
- extend UI-README
- remove all references to `Time-of-use Beta Test`

Reviewed-by: Stefan Feilmeier <[email protected]>
Co-authored-by: Lukas Rieger <[email protected]>
Co-committed-by: Lukas Rieger <[email protected]>
- Implemented BridgeHttp in Impl of HardyBarthEvcs
- All Api Calls now flow through that Bridge
- Api Calls (esp. setHeartBeat that previously was synchronous) are now asynchronous
- Add JUnit tests

Co-authored-by: Sebastian Asen <[email protected]>
Co-authored-by: Stefan Feilmeier <[email protected]>
Reviewed-by: Michael Grill <[email protected]>
Reviewed-by: Stefan Feilmeier <[email protected]>
Co-authored-by: Johann Kaufmann <[email protected]>
Co-committed-by: Johann Kaufmann <[email protected]>
- Navigation for users with at most Role `OWNER` with one fems assigned, get directly routed to `device/edgeId/live`
- Navigation for users with at least Role  `INSTALLER` -> `/overview`
- Removed flickering of headerComponent. Issue results from creating header component for each view

Co-authored-by: Stefan Feilmeier <[email protected]>
Reviewed-by: Anas Shetla <[email protected]>
Reviewed-by: Stefan Feilmeier <[email protected]>
Co-authored-by: Lukas Rieger <[email protected]>
Co-committed-by: Lukas Rieger <[email protected]>
- Migrate all EVCS to ElectricityMeter Nature
- Add `DeprecatedEvcs` Nature to mark EVCS that have to be migrated and still support old Channels ChargePower and ActiveConsumptionEnergy
- Implement generic `evaluatePhaseCount()` method
- UI:  Mix Evcs & ElectricityMeter (live != history)
  - Live: use ElectricityMeter if its already available (e.g. for power of individual phases)
  - History: use Evcs to ensure availability of historic data
- Implement configurable PhaseRotation in configuration and Apps (copied and adjusted from https://github.com/OpenEMS/openems/blob/f73c2376e80fc0b820e5864e2ea6f83467c9aa87/io.openems.edge.evcs.api/src/io/openems/edge/evcs/v2/api/PhaseRotation.java)
- Fix AbstractManagedEvcs deactivate()

Reviewed-by: Sebastian Asen <[email protected]>
https://github.com/gradle/gradle/releases/tag/v8.10.2
(cherry picked from commit 14131763b8dd9bd58cafd683abe7641303f1a627)
- Refactoring HeatingElement and using the new ```Cumulated[Level 1 -3]ActiveTime```

Co-authored-by: Sebastian Asen <[email protected]>
Reviewed-by: Sebastian Asen <[email protected]>
Reviewed-by: Stefan Feilmeier <[email protected]>
Co-authored-by: Lukas Rieger <[email protected]>
Co-committed-by: Lukas Rieger <[email protected]>
- Multiple yAxis: Increase chart canvas by putting y axis labels into ticks, the most upper tick gets replaced by axis title

Reviewed-by: Stefan Feilmeier <[email protected]>
Co-authored-by: Lukas Rieger <[email protected]>
Co-committed-by: Lukas Rieger <[email protected]>
- Added detailed data for the excel export of historic data

Co-authored-by: Sebastian Asen <[email protected]>
Reviewed-by: Sebastian Asen <[email protected]>
Reviewed-by: Michael Grill <[email protected]>
Reviewed-by: Stefan Feilmeier <[email protected]>
Co-authored-by: Johann Kaufmann <[email protected]>
Co-committed-by: Johann Kaufmann <[email protected]>
…charts

- Rescaling of charts was not possible due to not ignoring hidden values
- Header was shown in the chart views

Reviewed-by: Stefan Feilmeier <[email protected]>
Co-authored-by: Lukas Rieger <[email protected]>
Co-committed-by: Lukas Rieger <[email protected]>
Reviewed-by: Stefan Feilmeier <[email protected]>
Co-authored-by: Sebastian Asen <[email protected]>
Co-committed-by: Sebastian Asen <[email protected]>
- Introduce `<app-header>` and keep `<header>` as single navigation point header

Reviewed-by: Stefan Feilmeier <[email protected]>
Co-authored-by: Lukas Rieger <[email protected]>
Co-committed-by: Lukas Rieger <[email protected]>
…ters

Evcs were listed with meters not with charging stations

Reviewed-by: Stefan Feilmeier <[email protected]>
Co-authored-by: Lukas Rieger <[email protected]>
Co-committed-by: Lukas Rieger <[email protected]>
- Improve OpenEMS JUnit test framework
- Apply best practices to JUnit tests
- Because of the recent change that all evcs now inherit the nature "elecricitymeter" they now appear twice in the excel list, because both natures are checked for
- Removed check for "evcs" nature so charging stations only appear once

Co-authored-by: Sebastian Asen <[email protected]>
Reviewed-by: Stefan Feilmeier <[email protected]>
Co-authored-by: Johann Kaufmann <[email protected]>
Co-committed-by: Johann Kaufmann <[email protected]>
Copy link

codecov bot commented Oct 18, 2024

Codecov Report

Attention: Patch coverage is 30.94737% with 328 lines in your changes missing coverage. Please review.

Additional details and impacted files
@@              Coverage Diff              @@
##             develop    #2846      +/-   ##
=============================================
+ Coverage      56.11%   56.39%   +0.29%     
- Complexity      8545     8665     +120     
=============================================
  Files           2140     2147       +7     
  Lines          90538    90682     +144     
  Branches        6717     6746      +29     
=============================================
+ Hits           50795    51134     +339     
+ Misses         37985    37721     -264     
- Partials        1758     1827      +69     

@sfeilmeier sfeilmeier merged commit 0b2071c into develop Oct 18, 2024
6 of 7 checks passed
@sfeilmeier sfeilmeier deleted the feature/fems-backports branch October 18, 2024 22:22
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