Beta release ISO15118-20

.github/CODEOWNERS

@@ -22,6 +22,7 @@
 /modules/EnergyNode/ @corneliusclaussen @hikinggrass @pietfried
 /modules/EvseManager/ @corneliusclaussen @SebaLukas @hikinggrass @pietfried
 /modules/EvManager/ @SebaLukas @pietfried @MarzellT
+/modules/Evse15118D20/ @SebaLukas @a-w50 @corneliusclaussen
 /modules/EvseSecurity/ @AssemblyJohn @pietfried @hikinggrass
 /modules/EvseV2G/ @corneliusclaussen @SebaLukas @james-ctc
 /modules/EvseSlac/ @a-w50 @corneliusclaussen @SebaLukas

CMakeLists.txt

@@ -102,6 +102,7 @@ else()
     find_package(everest-modbus REQUIRED)
     find_package(everest-ocpp REQUIRED)
     find_package(cbv2g REQUIRED)
+    find_package(iso15118 REQUIRED)
 
     find_package(PalSigslot REQUIRED)
 

config/CMakeLists.txt

@@ -3,6 +3,7 @@ generate_config_run_script(CONFIG sil-two-evse)
 generate_config_run_script(CONFIG sil-ocpp)
 generate_config_run_script(CONFIG sil-ocpp201)
 generate_config_run_script(CONFIG sil-dc)
+generate_config_run_script(CONFIG sil-dc-d20)
 generate_config_run_script(CONFIG sil-dc-tls)
 generate_config_run_script(CONFIG sil-dc-sae-v2g)
 generate_config_run_script(CONFIG sil-dc-sae-v2h)

config/config-sil-dc-d20.yaml

@@ -0,0 +1,148 @@
+active_modules:
+  iso15118_charger:
+    module: Evse15118D20
+    config_module:
+      device: auto
+  iso15118_car:
+    module: PyEvJosev
+    config_module:
+      device: auto
+      supported_DIN70121: false
+      supported_ISO15118_2: false
+      supported_ISO15118_20_DC: true
+      tls_active: true
+  evse_manager:
+    module: EvseManager
+    config_module:
+      connector_id: 1
+      evse_id: DE*PNX*E12345*1
+      evse_id_din: 49A80737A45678
+      session_logging: true
+      session_logging_xml: false
+      session_logging_path: /tmp/everest-logs
+      charge_mode: DC
+      payment_enable_contract: false
+    connections:
+      bsp:
+        - module_id: yeti_driver
+          implementation_id: board_support
+      powermeter_car_side:
+        - module_id: powersupply_dc
+          implementation_id: powermeter
+      slac:
+        - module_id: slac
+          implementation_id: evse
+      hlc:
+        - module_id: iso15118_charger
+          implementation_id: charger
+      powersupply_DC:
+        - module_id: powersupply_dc
+          implementation_id: main
+      imd:
+        - module_id: imd
+          implementation_id: main
+  powersupply_dc:
+    module: DCSupplySimulator
+  yeti_driver:
+    module: JsYetiSimulator
+    config_module:
+      connector_id: 1
+  slac:
+    module: SlacSimulator
+  imd:
+    config_implementation:
+      main:
+        selftest_success: true
+    module: IMDSimulator
+  ev_manager:
+    module: EvManager
+    config_module:
+      connector_id: 1
+      auto_enable: true
+      auto_exec: false
+      auto_exec_commands: sleep 3;iso_wait_slac_matched;iso_start_v2g_session DC;iso_wait_pwr_ready;iso_wait_for_stop 15;iso_wait_v2g_session_stopped;unplug;
+      dc_target_current: 20
+      dc_target_voltage: 400
+    connections:
+      ev_board_support:
+        - module_id: yeti_driver
+          implementation_id: ev_board_support
+      ev:
+        - module_id: iso15118_car
+          implementation_id: ev
+      slac:
+        - module_id: slac
+          implementation_id: ev
+  auth:
+    module: Auth
+    config_module:
+      connection_timeout: 10
+      selection_algorithm: FindFirst
+    connections:
+      token_provider:
+        - module_id: token_provider
+          implementation_id: main
+      token_validator:
+        - module_id: token_validator
+          implementation_id: main
+      evse_manager:
+        - module_id: evse_manager
+          implementation_id: evse
+  token_provider:
+    module: DummyTokenProvider
+    config_implementation:
+      main:
+        token: TOKEN1
+    connections:
+      evse:
+        - module_id: evse_manager
+          implementation_id: evse
+  token_validator:
+    module: DummyTokenValidator
+    config_implementation:
+      main:
+        validation_result: Accepted
+        validation_reason: Token seems valid
+        sleep: 0.25
+  evse_security:
+    module: EvseSecurity
+    config_module:
+      private_key_password: "123456"
+  energy_manager:
+    module: EnergyManager
+    config_module:
+      schedule_total_duration: 1
+      schedule_interval_duration: 60
+      debug: false
+    connections:
+      energy_trunk:
+        - module_id: grid_connection_point
+          implementation_id: energy_grid
+  grid_connection_point:
+    module: EnergyNode
+    config_module:
+      fuse_limit_A: 40.0
+      phase_count: 3
+    connections:
+      price_information: []
+      energy_consumer:
+        - module_id: evse_manager
+          implementation_id: energy_grid
+      powermeter:
+        - module_id: yeti_driver
+          implementation_id: powermeter
+  api:
+    module: API
+    connections:
+      evse_manager:
+        - module_id: evse_manager
+          implementation_id: evse
+      error_history:
+        - module_id: error_history
+          implementation_id: error_history
+  error_history:
+    module: ErrorHistory
+    config_implementation:
+      error_history:
+        database_path: /tmp/error_history.db
+x-module-layout: {}

dependencies.yaml

@@ -43,6 +43,12 @@ libfsm:
   git_tag: v0.2.0
   cmake_condition: "EVEREST_DEPENDENCY_ENABLED_LIBFSM"
 
+# libiso15118
+libiso15118:
+  git: https://github.com/EVerest/libiso15118.git
+  git_tag: v0.2.0
+  cmake_condition: "EVEREST_DEPENDENCY_ENABLED_LIBISO15118"
+
 # LEM DCBM 400/600 module
 libcurl:
   git: https://github.com/curl/curl.git

interfaces/ISO15118_charger.yaml

@@ -14,9 +14,9 @@ cmds:
         description: Available energy transfer modes supported by the EVSE
         type: array
         items:
-          description: The different energy modes supported by the SECC
-          type: string
-          $ref: /iso15118_charger#/EnergyTransferMode
+          description: The different energy modes supported by the SECC 
+          type: object
+          $ref: /iso15118_charger#/SupportedEnergyMode
         minItems: 1
         maxItems: 6
       sae_j2847_mode:
@@ -346,3 +346,8 @@ vars:
     description: >-
       Debug - Contains the selected protocol
     type: string
+  display_parameters:
+    description: >-
+      Parameters that may be displayed on the EVSE (Soc, battery capacity)
+    type: object
+    $ref: /iso15118_charger#/DisplayParameters

module-dependencies.cmake

@@ -57,6 +57,11 @@ ev_define_dependency(
     DEPENDENCY_NAME sqlite_cpp
     DEPENDENT_MODULES_LIST ErrorHistory)
 
+ev_define_dependency(
+    DEPENDENCY_NAME libiso15118
+    OUTPUT_VARIABLE_SUFFIX LIBISO15118
+    DEPENDENT_MODULES_LIST Evse15118D20)
+
 if(NOT everest-gpio IN_LIST EVEREST_EXCLUDE_DEPENDENCIES)
     set(EVEREST_DEPENDENCY_ENABLED_EVEREST_GPIO ON)
 else()

modules/CMakeLists.txt

@@ -4,6 +4,7 @@ ev_add_module(EnergyManager)
 ev_add_module(EnergyNode)
 ev_add_module(EvManager)
 ev_add_module(ErrorHistory)
+ev_add_module(Evse15118D20)
 ev_add_module(EvseManager)
 ev_add_module(EvseSecurity)
 ev_add_module(EvseSlac)

modules/DummyV2G/main/ISO15118_chargerImpl.cpp

@@ -14,11 +14,16 @@ void ISO15118_chargerImpl::ready() {
 
 void ISO15118_chargerImpl::handle_setup(
     types::iso15118_charger::EVSEID& evse_id,
-    std::vector<types::iso15118_charger::EnergyTransferMode>& supported_energy_transfer_modes,
+    std::vector<types::iso15118_charger::SupportedEnergyMode>& supported_energy_transfer_modes,
     types::iso15118_charger::SaeJ2847BidiMode& sae_j2847_mode, bool& debug_mode) {
     // your code for cmd setup goes here
 }
 
+void ISO15118_chargerImpl::handle_set_charging_parameters(
+    types::iso15118_charger::SetupPhysicalValues& physical_values) {
+    // your code for cmd set_charging_parameters goes here
+}
+
 void ISO15118_chargerImpl::handle_session_setup(std::vector<types::iso15118_charger::PaymentOption>& payment_options,
                                                 bool& supported_certificate_service) {
     // your code for cmd session_setup goes here
@@ -55,10 +60,6 @@ void ISO15118_chargerImpl::handle_stop_charging(bool& stop) {
     // your code for cmd stop_charging goes here
 }
 
-void ISO15118_chargerImpl::handle_set_charging_parameters(
-    types::iso15118_charger::SetupPhysicalValues& physical_values) {
-}
-
 void ISO15118_chargerImpl::handle_update_ac_max_current(double& max_current) {
     // your code for cmd update_ac_max_current goes here
 }

modules/DummyV2G/main/ISO15118_chargerImpl.hpp

@@ -33,9 +33,10 @@ class ISO15118_chargerImpl : public ISO15118_chargerImplBase {
 
 protected:
     // command handler functions (virtual)
-    virtual void handle_setup(types::iso15118_charger::EVSEID& evse_id,
-                              std::vector<types::iso15118_charger::EnergyTransferMode>& supported_energy_transfer_modes,
-                              types::iso15118_charger::SaeJ2847BidiMode& sae_j2847_mode, bool& debug_mode) override;
+    virtual void
+    handle_setup(types::iso15118_charger::EVSEID& evse_id,
+                 std::vector<types::iso15118_charger::SupportedEnergyMode>& supported_energy_transfer_modes,
+                 types::iso15118_charger::SaeJ2847BidiMode& sae_j2847_mode, bool& debug_mode) override;
     virtual void handle_set_charging_parameters(types::iso15118_charger::SetupPhysicalValues& physical_values) override;
     virtual void handle_session_setup(std::vector<types::iso15118_charger::PaymentOption>& payment_options,
                                       bool& supported_certificate_service) override;

modules/Evse15118D20/CMakeLists.txt

@@ -0,0 +1,29 @@
+#
+# AUTO GENERATED - MARKED REGIONS WILL BE KEPT
+# template version 3
+#
+
+# module setup:
+#   - ${MODULE_NAME}: module name
+ev_setup_cpp_module()
+
+# ev@bcc62523-e22b-41d7-ba2f-825b493a3c97:v1
+target_sources(${MODULE_NAME}
+    PRIVATE
+        charger/session_logger.cpp
+)
+
+target_link_libraries(${MODULE_NAME}
+    PRIVATE
+        iso15118::iso15118
+)
+# ev@bcc62523-e22b-41d7-ba2f-825b493a3c97:v1
+
+target_sources(${MODULE_NAME}
+    PRIVATE
+        "charger/ISO15118_chargerImpl.cpp"
+)
+
+# ev@c55432ab-152c-45a9-9d2e-7281d50c69c3:v1
+# insert other things like install cmds etc here
+# ev@c55432ab-152c-45a9-9d2e-7281d50c69c3:v1

modules/Evse15118D20/Evse15118D20.cpp

@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright Pionix GmbH and Contributors to EVerest
+#include "Evse15118D20.hpp"
+
+namespace module {
+
+void Evse15118D20::init() {
+    invoke_init(*p_charger);
+}
+
+void Evse15118D20::ready() {
+    invoke_ready(*p_charger);
+}
+
+} // namespace module

modules/Evse15118D20/Evse15118D20.hpp

@@ -0,0 +1,66 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright Pionix GmbH and Contributors to EVerest
+#ifndef EVSE15118D20_HPP
+#define EVSE15118D20_HPP
+
+//
+// AUTO GENERATED - MARKED REGIONS WILL BE KEPT
+// template version 2
+//
+
+#include "ld-ev.hpp"
+
+// headers for provided interface implementations
+#include <generated/interfaces/ISO15118_charger/Implementation.hpp>
+
+// ev@4bf81b14-a215-475c-a1d3-0a484ae48918:v1
+// insert your custom include headers here
+// ev@4bf81b14-a215-475c-a1d3-0a484ae48918:v1
+
+namespace module {
+
+struct Conf {
+    std::string device;
+    std::string certificate_path;
+    std::string logging_path;
+    std::string tls_negotiation_strategy;
+    std::string private_key_password;
+    bool enable_ssl_logging;
+    bool enable_tls_key_logging;
+};
+
+class Evse15118D20 : public Everest::ModuleBase {
+public:
+    Evse15118D20() = delete;
+    Evse15118D20(const ModuleInfo& info, std::unique_ptr<ISO15118_chargerImplBase> p_charger, Conf& config) :
+        ModuleBase(info), p_charger(std::move(p_charger)), config(config){};
+
+    const std::unique_ptr<ISO15118_chargerImplBase> p_charger;
+    const Conf& config;
+
+    // ev@1fce4c5e-0ab8-41bb-90f7-14277703d2ac:v1
+    // insert your public definitions here
+    // ev@1fce4c5e-0ab8-41bb-90f7-14277703d2ac:v1
+
+protected:
+    // ev@4714b2ab-a24f-4b95-ab81-36439e1478de:v1
+    // insert your protected definitions here
+    // ev@4714b2ab-a24f-4b95-ab81-36439e1478de:v1
+
+private:
+    friend class LdEverest;
+    void init();
+    void ready();
+
+    // ev@211cfdbe-f69a-4cd6-a4ec-f8aaa3d1b6c8:v1
+    // insert your private definitions here
+    // ev@211cfdbe-f69a-4cd6-a4ec-f8aaa3d1b6c8:v1
+};
+
+// ev@087e516b-124c-48df-94fb-109508c7cda9:v1
+// insert other definitions here
+// ev@087e516b-124c-48df-94fb-109508c7cda9:v1
+
+} // namespace module
+
+#endif // EVSE15118D20_HPP