* 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>

config/config-sil-energy-management.yaml

@@ -159,25 +159,52 @@ 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
+    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
+    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:

config/config-sil-ocpp-custom-extension.yaml

@@ -152,6 +152,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:
@@ -175,30 +182,84 @@ active_modules:
       energy_trunk:
         - module_id: grid_connection_point
           implementation_id: energy_grid
-  grid_connection_point:
+  evse_manager_1_ocpp_sink:
     module: EnergyNode
+    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
+    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:
+    evse: 1
+    module: EnergyNode
+    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
+    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
+    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:

config/config-sil-ocpp-pnc.yaml

@@ -28,6 +28,8 @@ active_modules:
       ac_hlc_enabled: true
       ac_hlc_use_5percent: false
       ac_enforce_hlc: false
+      external_ready_to_start_charging: true
+      request_zero_power_in_idle: true
     connections:
       bsp:
         - module_id: yeti_driver_1
@@ -53,6 +55,8 @@ active_modules:
       ac_hlc_enabled: false
       ac_hlc_use_5percent: false
       ac_enforce_hlc: false
+      external_ready_to_start_charging: true
+      request_zero_power_in_idle: true
     connections:
       bsp:
         - module_id: yeti_driver_2
@@ -157,6 +161,13 @@ active_modules:
       security:
         - module_id: evse_security
           implementation_id: main
+      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:
@@ -169,30 +180,84 @@ active_modules:
       energy_trunk:
         - module_id: grid_connection_point
           implementation_id: energy_grid
-  grid_connection_point:
+  evse_manager_1_ocpp_sink:
     module: EnergyNode
+    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
+    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:
+    evse: 1
+    module: EnergyNode
+    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
+    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
+    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:

config/config-sil-ocpp.yaml

@@ -161,12 +161,12 @@ active_modules:
       display_message:
         - module_id: display_message
           implementation_id: display_message
-      evse_manager_energy_sink:
+      evse_energy_sink:
         - module_id: grid_connection_point
           implementation_id: external_limits
-        - module_id: evse_manager_1_sink
+        - module_id: evse_manager_1_ocpp_sink
           implementation_id: external_limits
-        - module_id: evse_manager_2_sink
+        - module_id: evse_manager_2_ocpp_sink
           implementation_id: external_limits
   display_message:
     module: TerminalCostAndPriceMessage
@@ -181,61 +181,89 @@ active_modules:
   token_provider_1:
     module: DummyTokenProviderManual
   energy_manager:
-    config_module:
-      debug: true
     module: EnergyManager
     connections:
       energy_trunk:
         - module_id: grid_connection_point
           implementation_id: energy_grid
-  evse_manager_1_sink:
+  evse_manager_1_ocpp_sink:
     module: EnergyNode
+    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_ocpp_sink:
+    module: EnergyNode
+    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:
+    evse: 1
+    module: EnergyNode
+    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_sink:
+  evse_manager_2_api_sink:
     module: EnergyNode
+    evse: 2
     config_module:
       fuse_limit_A: 32.0
       phase_count: 3
     connections:
       energy_consumer:
-        - module_id: evse_manager_2
+        - 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
+    evse: 0
     config_module:
       fuse_limit_A: 40.0
       phase_count: 3
     connections:
       price_information: []
       energy_consumer:
-        - module_id: evse_manager_1_sink
+        - module_id: evse_manager_1_api_sink
           implementation_id: energy_grid
-        - module_id: evse_manager_2_sink
+        - 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: