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.

Sign up for GitHub

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

Jump to bottom

Refactor Energy Management integration of OCPP and API modules #872

Merged
merged 34 commits into from
Nov 7, 2024
Merged

Refactor Energy Management integration of OCPP and API modules #872

merged 34 commits into from
Nov 7, 2024

Commits on Nov 4, 2024

  1. Initial draft for EnergyManagement refactor: 

    * Remove set_external_limits from evse_manager inteface
* Change requirement to apply limits of API and OCPP modules from evse_manager to external_energy_limits

TODOs:
* Adjust all EVerest configuration files
* Add documentation to API and OCPP modules
* EnergyManager currently seg faults

Signed-off-by: pietfried <pietgoempel@gmail.com>
    @Pietfried
    Pietfried committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    5b53f2f View commit details
    Browse the repository at this point in the history

  2. extended documentation for OCPP module 

    Signed-off-by: pietfried <pietgoempel@gmail.com>
    @Pietfried
    Pietfried committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    94227c5 View commit details
    Browse the repository at this point in the history

  3. addressed requested changes 

    Signed-off-by: Piet Gömpel <pietgoempel@gmail.com>
    @Pietfried
    Pietfried committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    250a0c4 View commit details
    Browse the repository at this point in the history

  4. Install ev-cli locally and depend on templates files for generation 

    Signed-off-by: Kai-Uwe Hermann <kai-uwe.hermann@pionix.de>
    @hikinggrass @Pietfried
    hikinggrass authored and Pietfried committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    84c1a2e View commit details
    Browse the repository at this point in the history

  5. Fixed issue when recursively creating Market objects. Changed vector … 

    …of children to unique_ptr

Signed-off-by: Piet Gömpel <pietgoempel@gmail.com>
    @Pietfried
    Pietfried committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    f852602 View commit details
    Browse the repository at this point in the history

  6. * Changed all ocpp configs to meet the new connection requirements fo… 

    …r the energy management

* Using the mapping of the requirement to determine the connect requirement to call based on the evse id

Signed-off-by: Piet Gömpel <pietgoempel@gmail.com>
    @Pietfried
    Pietfried committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    0e2c47b View commit details
    Browse the repository at this point in the history

  7. Revert changes accidentally added during rebase 

    Signed-off-by: Piet Gömpel <pietgoempel@gmail.com>
    @Pietfried
    Pietfried committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    b40c355 View commit details
    Browse the repository at this point in the history

  8. Revised OCPP module documentation and added section for OCPP201 

    Signed-off-by: Piet Gömpel <pietgoempel@gmail.com>
    @Pietfried
    Pietfried committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    26842c7 View commit details
    Browse the repository at this point in the history

  9. Removed catching out_of_range. Can't be thrown anymore 

    Signed-off-by: Piet Gömpel <pietgoempel@gmail.com>
    @Pietfried
    Pietfried committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    9728639 View commit details
    Browse the repository at this point in the history

  10. revert changes within EnergyManager that accidentally got in while re… 

    …basing

Signed-off-by: Piet Gömpel <pietgoempel@gmail.com>
    @Pietfried
    Pietfried committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    1e93b9e View commit details
    Browse the repository at this point in the history

  11. Install ev-cli locally and depend on templates files for generation 

    Signed-off-by: Kai-Uwe Hermann <kai-uwe.hermann@pionix.de>
    @hikinggrass @Pietfried
    hikinggrass authored and Pietfried committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    50f41e3 View commit details
    Browse the repository at this point in the history

  12. Revert some changes to cmake 

    Signed-off-by: Piet Gömpel <pietgoempel@gmail.com>
    @Pietfried
    Pietfried committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    b50efc8 View commit details
    Browse the repository at this point in the history

  13. Updated config module mappings 

    Signed-off-by: Piet Gömpel <pietgoempel@gmail.com>
    @Pietfried
    Pietfried committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    6d061cc View commit details
    Browse the repository at this point in the history

  14. Update modules/OCPP/doc.rst 

    Co-authored-by: barsnick <barsnick@users.noreply.github.com>
Signed-off-by: Piet Gömpel <37657534+Pietfried@users.noreply.github.com>
    @Pietfried @barsnick
    Pietfried and barsnick authored Nov 4, 2024
    Configuration menu
    Copy the full SHA
    a55757d View commit details
    Browse the repository at this point in the history

  15. Update modules/OCPP/doc.rst 

    Co-authored-by: barsnick <barsnick@users.noreply.github.com>
Signed-off-by: Piet Gömpel <37657534+Pietfried@users.noreply.github.com>
    @Pietfried @barsnick
    Pietfried and barsnick authored Nov 4, 2024
    Configuration menu
    Copy the full SHA
    d0e3b75 View commit details
    Browse the repository at this point in the history

  16. Update modules/OCPP/doc.rst 

    Co-authored-by: barsnick <barsnick@users.noreply.github.com>
Signed-off-by: Piet Gömpel <37657534+Pietfried@users.noreply.github.com>
    @Pietfried @barsnick
    Pietfried and barsnick authored Nov 4, 2024
    Configuration menu
    Copy the full SHA
    adfe3fb View commit details
    Browse the repository at this point in the history

  17. Update modules/OCPP/doc.rst 

    Co-authored-by: barsnick <barsnick@users.noreply.github.com>
Signed-off-by: Piet Gömpel <37657534+Pietfried@users.noreply.github.com>
    @Pietfried @barsnick
    Pietfried and barsnick authored Nov 4, 2024
    Configuration menu
    Copy the full SHA
    21f2abd View commit details
    Browse the repository at this point in the history

  18. Update modules/OCPP201/doc.rst 

    Co-authored-by: barsnick <barsnick@users.noreply.github.com>
Signed-off-by: Piet Gömpel <37657534+Pietfried@users.noreply.github.com>
    @Pietfried @barsnick
    Pietfried and barsnick authored Nov 4, 2024
    Configuration menu
    Copy the full SHA
    b439ad4 View commit details
    Browse the repository at this point in the history

  19. Update modules/OCPP201/doc.rst 

    Co-authored-by: barsnick <barsnick@users.noreply.github.com>
Signed-off-by: Piet Gömpel <37657534+Pietfried@users.noreply.github.com>
    @Pietfried @barsnick
    Pietfried and barsnick authored Nov 4, 2024
    Configuration menu
    Copy the full SHA
    e520998 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2024

  1. Addressed requested changes 

    Signed-off-by: Piet Gömpel <pietgoempel@gmail.com>
    @Pietfried
    Pietfried committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    fedd0e0 View commit details
    Browse the repository at this point in the history

  2. Moved duplicated code to seperate library in lib/staging for accessin… 

    …g external_energy_limits reference by evse id

Signed-off-by: Piet Gömpel <pietgoempel@gmail.com>
    @Pietfried
    Pietfried committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    1f86326 View commit details
    Browse the repository at this point in the history

  3. Update everest-framework to v0.18.0 and everest-utils to v0.4.0 

    Signed-off-by: Kai-Uwe Hermann <kai-uwe.hermann@pionix.de>
    @hikinggrass
    hikinggrass committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    26d3344 View commit details
    Browse the repository at this point in the history

  4. Update everestrs in Cargo.tom and Cargo.lock 

    Signed-off-by: Kai-Uwe Hermann <kai-uwe.hermann@pionix.de>
    @hikinggrass
    hikinggrass committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    4c812ad View commit details
    Browse the repository at this point in the history

  5. Bump required ev-cli version to 0.4.0 

    Signed-off-by: Kai-Uwe Hermann <kai-uwe.hermann@pionix.de>
    @hikinggrass
    hikinggrass committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    31734a7 View commit details
    Browse the repository at this point in the history

  6. Replace removed Requirement constructor usage in test 

    Signed-off-by: Kai-Uwe Hermann <kai-uwe.hermann@pionix.de>
    @hikinggrass
    hikinggrass committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    fae7422 View commit details
    Browse the repository at this point in the history

  7. Add missing nullopt for mapping in interface stub of test 

    Signed-off-by: Kai-Uwe Hermann <kai-uwe.hermann@pionix.de>
    @hikinggrass
    hikinggrass committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    e3afe4b View commit details
    Browse the repository at this point in the history

  8. Adapt operator< of Requirement to new free function for test 

    Signed-off-by: Kai-Uwe Hermann <kai-uwe.hermann@pionix.de>
    @hikinggrass
    hikinggrass committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    3baf9e8 View commit details
    Browse the repository at this point in the history

  9. Update everest-testing to fix integration test failures 

    Signed-off-by: Kai-Uwe Hermann <kai-uwe.hermann@pionix.de>
    @hikinggrass
    hikinggrass committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    1943b72 View commit details
    Browse the repository at this point in the history

  10. Bump everest-utils version to v0.4.1 to use fixed everest-testing 

    Signed-off-by: Kai-Uwe Hermann <kai-uwe.hermann@pionix.de>
    @hikinggrass
    hikinggrass committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    b5eda5f View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2024

  1. Merge remote-tracking branch 'origin/main' into feature/energymgmt-in… 

    …tegration-ocpp-and-api

# Conflicts:
#	lib/staging/CMakeLists.txt

Signed-off-by: Kai-Uwe Hermann <kai-uwe.hermann@pionix.de>
    @hikinggrass
    hikinggrass committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    df34c0c View commit details
    Browse the repository at this point in the history

  2. Fix typos 

    Signed-off-by: Kai-Uwe Hermann <kai-uwe.hermann@pionix.de>
    @hikinggrass
    hikinggrass committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    2d17432 View commit details
    Browse the repository at this point in the history

  3. Bump ev-cli dependency 

    Signed-off-by: Kai-Uwe Hermann <kai-uwe.hermann@pionix.de>
    @hikinggrass
    hikinggrass committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    106a16d View commit details
    Browse the repository at this point in the history

  4. Bump everest-utils 

    Signed-off-by: Kai-Uwe Hermann <kai-uwe.hermann@pionix.de>
    @hikinggrass
    hikinggrass committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    adf275d View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2024

  1. Bump everest-utils to 0.4.2 

    Signed-off-by: Kai-Uwe Hermann <kai-uwe.hermann@pionix.de>
    @hikinggrass
    hikinggrass committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    57a8e38 View commit details
    Browse the repository at this point in the history