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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
5b53f2f
Initial draft for EnergyManagement refactor:
Pietfried Sep 20, 2024
94227c5
extended documentation for OCPP module
Pietfried Sep 20, 2024
250a0c4
addressed requested changes
Pietfried Oct 10, 2024
84c1a2e
Install ev-cli locally and depend on templates files for generation
hikinggrass Oct 4, 2024
f852602
Fixed issue when recursively creating Market objects. Changed vector …
Pietfried Oct 11, 2024
0e2c47b
* Changed all ocpp configs to meet the new connection requirements fo…
Pietfried Oct 14, 2024
b40c355
Revert changes accidentally added during rebase
Pietfried Oct 14, 2024
26842c7
Revised OCPP module documentation and added section for OCPP201
Pietfried Oct 14, 2024
9728639
Removed catching out_of_range. Can't be thrown anymore
Pietfried Oct 15, 2024
1e93b9e
revert changes within EnergyManager that accidentally got in while re…
Pietfried Oct 15, 2024
50f41e3
Install ev-cli locally and depend on templates files for generation
hikinggrass Oct 4, 2024
b50efc8
Revert some changes to cmake
Pietfried Oct 30, 2024
6d061cc
Updated config module mappings
Pietfried Nov 4, 2024
a55757d
Update modules/OCPP/doc.rst
Pietfried Nov 4, 2024
d0e3b75
Update modules/OCPP/doc.rst
Pietfried Nov 4, 2024
adfe3fb
Update modules/OCPP/doc.rst
Pietfried Nov 4, 2024
21f2abd
Update modules/OCPP/doc.rst
Pietfried Nov 4, 2024
b439ad4
Update modules/OCPP201/doc.rst
Pietfried Nov 4, 2024
e520998
Update modules/OCPP201/doc.rst
Pietfried Nov 4, 2024
fedd0e0
Addressed requested changes
Pietfried Nov 5, 2024
1f86326
Moved duplicated code to seperate library in lib/staging for accessin…
Pietfried Nov 5, 2024
26d3344
Update everest-framework to v0.18.0 and everest-utils to v0.4.0
hikinggrass Nov 5, 2024
4c812ad
Update everestrs in Cargo.tom and Cargo.lock
hikinggrass Nov 5, 2024
31734a7
Bump required ev-cli version to 0.4.0
hikinggrass Nov 5, 2024
fae7422
Replace removed Requirement constructor usage in test
hikinggrass Nov 5, 2024
e3afe4b
Add missing nullopt for mapping in interface stub of test
hikinggrass Nov 5, 2024
3baf9e8
Adapt operator< of Requirement to new free function for test
hikinggrass Nov 5, 2024
1943b72
Update everest-testing to fix integration test failures
hikinggrass Nov 5, 2024
b5eda5f
Bump everest-utils version to v0.4.1 to use fixed everest-testing
hikinggrass Nov 5, 2024
df34c0c
Merge remote-tracking branch 'origin/main' into feature/energymgmt-in…
hikinggrass Nov 6, 2024
2d17432
Fix typos
hikinggrass Nov 6, 2024
106a16d
Bump ev-cli dependency
hikinggrass Nov 6, 2024
adf275d
Bump everest-utils
hikinggrass Nov 6, 2024
57a8e38
Bump everest-utils to 0.4.2
hikinggrass Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/ev-project-bootstrap.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
set_property(
GLOBAL
PROPERTY EVEREST_REQUIRED_EV_CLI_VERSION "0.3.0"
PROPERTY EVEREST_REQUIRED_EV_CLI_VERSION "0.4.0"
)

# FIXME (aw): clean up this inclusion chain
Expand Down
2 changes: 1 addition & 1 deletion cmake/everest-generate.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,4 +743,4 @@ endfunction()

set(EVEREST_EXCLUDE_MODULES "" CACHE STRING "A list of modules that will not be built")
set(EVEREST_INCLUDE_MODULES "" CACHE STRING "A list of modules that will be built. If the list is empty, all modules will be built.")
option(EVEREST_EXCLUDE_CPP_MODULES "Exclude all C++ modules from the build" OFF)
option(EVEREST_EXCLUDE_CPP_MODULES "Exclude all C++ modules from the build" OFF)
Pietfried marked this conversation as resolved.
Show resolved Hide resolved
41 changes: 39 additions & 2 deletions config/config-sil-energy-management.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ active_modules:
supported_ISO15118_2: true
evse_manager_1:
module: EvseManager
mapping:
module:
evse: 1
config_module:
connector_id: 1
evse_id: DE*PNX*E12345*1
Expand Down Expand Up @@ -43,6 +46,9 @@ active_modules:
implementation_id: charger
evse_manager_2:
module: EvseManager
mapping:
module:
evse: 2
config_module:
connector_id: 2
evse_id: DE*PNX*E12345*2
Expand Down Expand Up @@ -159,25 +165,56 @@ active_modules:
connections:
price_information: []
energy_consumer:
- module_id: evse_manager_1
- module_id: evse_manager_1_sink
implementation_id: energy_grid
- module_id: evse_manager_2
- module_id: evse_manager_2_sink
implementation_id: energy_grid
powermeter:
- module_id: yeti_driver_1
implementation_id: powermeter
evse_manager_1_sink:
module: EnergyNode
mapping:
module:
evse: 1
config_module:
fuse_limit_A: 32.0
phase_count: 3
connections:
energy_consumer:
- module_id: evse_manager_1
implementation_id: energy_grid
evse_manager_2_sink:
module: EnergyNode
mapping:
module:
evse: 2
config_module:
fuse_limit_A: 32.0
phase_count: 3
connections:
energy_consumer:
- module_id: evse_manager_2
implementation_id: energy_grid
api:
module: API
connections:
evse_manager:
- module_id: evse_manager_1
implementation_id: evse
- module_id: evse_manager_2
implementation_id: evse
random_delay:
- module_id: evse_manager_1
implementation_id: random_delay
error_history:
- module_id: error_history
implementation_id: error_history
evse_energy_sink:
- module_id: evse_manager_1_sink
implementation_id: external_limits
- module_id: evse_manager_2_sink
implementation_id: external_limits
error_history:
module: ErrorHistory
config_implementation:
Expand Down
95 changes: 88 additions & 7 deletions config/config-sil-ocpp-custom-extension.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ active_modules:
supported_ISO15118_2: true
evse_manager_1:
module: EvseManager
evse: 1
mapping:
module:
evse: 1
config_module:
connector_id: 1
evse_id: "1"
Expand All @@ -25,6 +27,7 @@ active_modules:
ac_hlc_enabled: false
ac_hlc_use_5percent: false
ac_enforce_hlc: false
external_ready_to_start_charging: true
connections:
bsp:
- module_id: yeti_driver_1
Expand All @@ -40,7 +43,9 @@ active_modules:
implementation_id: charger
evse_manager_2:
module: EvseManager
evse: 2
mapping:
module:
evse: 2
config_module:
connector_id: 2
evse_id: "2"
Expand All @@ -50,6 +55,7 @@ active_modules:
ac_hlc_enabled: false
ac_hlc_use_5percent: false
ac_enforce_hlc: false
external_ready_to_start_charging: true
connections:
bsp:
- module_id: yeti_driver_2
Expand All @@ -65,12 +71,16 @@ active_modules:
implementation_id: charger
yeti_driver_1:
module: JsYetiSimulator
evse: 1
mapping:
module:
evse: 1
config_module:
connector_id: 1
yeti_driver_2:
module: JsYetiSimulator
evse: 2
mapping:
module:
evse: 2
config_module:
connector_id: 2
slac:
Expand Down Expand Up @@ -152,6 +162,13 @@ active_modules:
data_transfer:
- module_id: ocpp_extension
implementation_id: data_transfer
evse_energy_sink:
- module_id: grid_connection_point
implementation_id: external_limits
- module_id: evse_manager_1_ocpp_sink
implementation_id: external_limits
- module_id: evse_manager_2_ocpp_sink
implementation_id: external_limits
evse_security:
module: EvseSecurity
config_module:
Expand All @@ -175,30 +192,94 @@ active_modules:
energy_trunk:
- module_id: grid_connection_point
implementation_id: energy_grid
grid_connection_point:
evse_manager_1_ocpp_sink:
module: EnergyNode
mapping:
module:
evse: 1
config_module:
fuse_limit_A: 40.0
fuse_limit_A: 32.0
phase_count: 3
connections:
price_information: []
energy_consumer:
- module_id: evse_manager_1
implementation_id: energy_grid
evse_manager_2_ocpp_sink:
module: EnergyNode
mapping:
module:
evse: 2
config_module:
fuse_limit_A: 32.0
phase_count: 3
connections:
energy_consumer:
- module_id: evse_manager_2
implementation_id: energy_grid
evse_manager_1_api_sink:
module: EnergyNode
mapping:
module:
evse: 1
config_module:
fuse_limit_A: 32.0
phase_count: 3
connections:
energy_consumer:
- module_id: evse_manager_1_ocpp_sink
implementation_id: energy_grid
powermeter:
- module_id: yeti_driver_1
implementation_id: powermeter
evse_manager_2_api_sink:
module: EnergyNode
mapping:
module:
evse: 2
config_module:
fuse_limit_A: 32.0
phase_count: 3
connections:
energy_consumer:
- module_id: evse_manager_2_ocpp_sink
implementation_id: energy_grid
powermeter:
- module_id: yeti_driver_2
implementation_id: powermeter
grid_connection_point:
module: EnergyNode
mapping:
module:
evse: 0
config_module:
fuse_limit_A: 40.0
phase_count: 3
connections:
price_information: []
energy_consumer:
- module_id: evse_manager_1_api_sink
implementation_id: energy_grid
- module_id: evse_manager_2_api_sink
implementation_id: energy_grid
api:
module: API
connections:
evse_manager:
- module_id: evse_manager_1
implementation_id: evse
- module_id: evse_manager_2
implementation_id: evse
ocpp:
- module_id: ocpp
implementation_id: ocpp_generic
error_history:
- module_id: error_history
implementation_id: error_history
evse_energy_sink:
- module_id: evse_manager_1_api_sink
implementation_id: external_limits
- module_id: evse_manager_2_api_sink
implementation_id: external_limits
error_history:
module: ErrorHistory
config_implementation:
Expand Down
Loading
Loading