Merge pull request #132 from c-jimenez/release/v1.3.0

Release/v1.3.0

Author: c-jimenez

3rdparty/CMakeLists.txt

@@ -28,4 +28,5 @@ set(CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE_INIT} ${DISABLED_WARNING_LW
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE_INIT} ${DISABLED_WARNING_LWS}")
 endif()
 
+set(LWS_WITH_NETLINK OFF)
 add_subdirectory(libwebsockets)

CMakeLists.txt

@@ -4,8 +4,8 @@
 
 cmake_minimum_required(VERSION 3.13)
 
-project(OpenOCPP DESCRIPTION "Open Source C++ implementation of the OCPP 2.6 protocol"
-                 VERSION 1.2.0
+project(OpenOCPP DESCRIPTION "Open Source C++ implementation of the OCPP 1.6 protocol"
+                 VERSION 1.3.0
 )
 
 # Definitions for Version.h file
@@ -101,7 +101,11 @@ target_link_libraries(open-ocpp-dynamic
     ws
     websockets
 )
-set_target_properties(open-ocpp-dynamic PROPERTIES OUTPUT_NAME "open-ocpp")
+set_target_properties(open-ocpp-dynamic PROPERTIES
+    OUTPUT_NAME "open-ocpp"
+    VERSION ${PROJECT_VERSION}
+    SOVERSION ${PROJECT_VERSION_MAJOR}
+)
 
 # Install commands
 include(GNUInstallDirs)

README.md

@@ -32,7 +32,7 @@ As such it can be used and distributed in any commercial and non-commercial prod
       - [Extended trigger messages](#extended-trigger-messages)
       - [Certificate management](#certificate-management)
       - [Signed firmware update](#signed-firmware-update)
-    - [OCPP IS15118 PnC extensions](#ocpp-is15118-pnc-extensions)
+    - [OCPP ISO15118 PnC extensions](#ocpp-iso15118-pnc-extensions)
       - [Charge Point role](#charge-point-role)
       - [Central System role](#central-system-role)
     - [Internal configuration keys](#internal-configuration-keys)
@@ -231,7 +231,7 @@ If **InternalCertificateManagementEnabled** is set to **true**, the storage of c
 
 **Open OCPP** provides helper classes based on OpenSSL to ease private keys, certificate and certificate requests usage : generation, signature, verification. They can be used in the user application callbacks. These helpers can be found in the ocpp::tools::x509 namespace and are widely used in the **Open OCPP** source code and examples.
 
-### OCPP IS15118 PnC extensions
+### OCPP ISO15118 PnC extensions
 
 **Open OCPP** fully supports the whole messaging, data types and configuration keys set associated to the ISO15118 PnC extensions.
 
@@ -241,7 +241,7 @@ In Charge Point role these extensions consists mainly on forwarding messages fro
 
 **Open OCPP** implements the forwarding and provides callback and retries capabilities for certificates messages.
 
-Allthough **Open OCPP** is able to manage a certificate store, the Chare Point certificate used for ISO15118 communication won't be stored in it even if the **InternalCertificateManagementEnabled** configuration key is set to **true**. This is will allow for the ISO15118-2 stack to access this certificate and use it to secure its communications with the vehicule.
+Allthough **Open OCPP** is able to manage a certificate store, the Charge Point certificate used for ISO15118 communication won't be stored in it even if the **InternalCertificateManagementEnabled** configuration key is set to **true**. This is will allow for the ISO15118-2 stack to access this certificate and use it to secure its communications with the vehicule.
 
 #### Central System role
 

examples/CMakeLists.txt

@@ -5,6 +5,7 @@ add_subdirectory(iso15118_chargepoint)
 add_subdirectory(iso15118_centralsystem)
 add_subdirectory(quick_start_centralsystem)
 add_subdirectory(quick_start_chargepoint)
+add_subdirectory(quick_start_cs_lc_hybrid)
 add_subdirectory(quick_start_localcontroller)
 add_subdirectory(remote_chargepoint)
 add_subdirectory(security_centralsystem)

examples/README.md

@@ -7,6 +7,7 @@ The following examples are available for OCPP 1.6 standard :
 * [Quick start Central System example](./quick_start_centralsystem/README.md)
 * [Quick start Charge Point example](./quick_start_chargepoint/README.md)
 * [Quick start Local Controller example](./quick_start_localcontroller/README.md)
+* [Quick start Hybrid Central System / Local Controller example](./quick_start_cs_lc_hybrid/README.md)
 * [Remote Charge Point example](./remote_chargepoint/README.md)
 
 The following examples are available for OCPP 1.6 security extensions :

examples/common/DefaultCentralSystemEventsHandler.h

@@ -260,7 +260,7 @@ class DefaultCentralSystemEventsHandler : public ocpp::centralsystem::ICentralSy
     /** @brief Remove a charge point from the connected charge points */
     void removeChargePoint(const std::string& identifier);
 
-  private:
+  protected:
     /** @brief Path to the V2G root CA */
     std::filesystem::path m_iso_v2g_root_ca;
     /** @brief Path to the MO root CA */

examples/common/DefaultChargePointEventsHandler.cpp

@@ -166,10 +166,28 @@ bool DefaultChargePointEventsHandler::getMeterValue(
 /** @copydoc bool IChargePointEventsHandler::remoteStartTransactionRequested(unsigned int, const std::string&) */
 bool DefaultChargePointEventsHandler::remoteStartTransactionRequested(unsigned int connector_id, const std::string& id_tag)
 {
+    bool ret = false;
     cout << "Remote start transaction : " << connector_id << " - " << id_tag << endl;
-    m_remote_start_pending[connector_id - 1u] = true;
-    m_remote_start_id_tag[connector_id - 1u]  = id_tag;
-    return true;
+    if (connector_id != 0)
+    {
+        m_remote_start_pending[connector_id - 1u] = true;
+        m_remote_start_id_tag[connector_id - 1u]  = id_tag;
+        ret                                       = true;
+    }
+    else
+    {
+        for (size_t i = 1; i <= m_config.ocppConfig().numberOfConnectors(); i++)
+        {
+            if (m_chargepoint->getConnectorStatus(i) < ChargePointStatus::Charging)
+            {
+                m_remote_start_pending[i - 1u] = true;
+                m_remote_start_id_tag[i - 1u]  = id_tag;
+                ret                            = true;
+                break;
+            }
+        }
+    }
+    return ret;
 }
 
 /** @copydoc bool IChargePointEventsHandler::remoteStopTransactionRequested(unsigned int) */

examples/common/config/CentralSystemConfig.h

@@ -84,6 +84,14 @@ class CentralSystemConfig : public ocpp::config::ICentralSystemConfig
     /** @brief Maximum number of entries in the log (0 = no logs in database) */
     unsigned int logMaxEntriesCount() const override { return get<unsigned int>("LogMaxEntriesCount"); }
 
+    // Behavior
+
+    /** @brief Size of the thread pool to handle incoming requests from the Charge Points */
+    unsigned int incomingRequestsFromCpThreadPoolSize() const override
+    {
+        return get<unsigned int>("IncomingRequestsFromCpThreadPoolSize");
+    };
+
     // ISO 15118 PnC extensions
 
     /** @brief If this variable set to true, then the Central System supports ISO 15118 plug and charge messages via the DataTransfer mechanism as

examples/common/config/LocalControllerConfig.h

@@ -87,9 +87,32 @@ class LocalControllerConfig : public ocpp::config::ILocalControllerConfig
 
     // Behavior
 
+    /** @brief Size of the thread pool to handle incoming requests from the Charge Points */
+    unsigned int incomingRequestsFromCpThreadPoolSize() const override
+    {
+        return get<unsigned int>("IncomingRequestsFromCpThreadPoolSize");
+    };
+    /** @brief Size of the thread pool to handle incoming requests from the Central System */
+    unsigned int incomingRequestsFromCsThreadPoolSize() const override
+    {
+        return get<unsigned int>("IncomingRequestsFromCsThreadPoolSize");
+    };
     /** @brief Disconnect from Charge Point on Central System disconnection */
     bool disconnectFromCpWhenCsDisconnected() const override { return getBool("DisconnectFromCpWhenCsDisconnected"); }
 
+    // Unused from Central System configuration interface
+
+    /** @brief Boot notification retry interval */
+    std::chrono::seconds bootNotificationRetryInterval() const override
+    {
+        return get<std::chrono::seconds>("BootNotificationRetryInterval");
+    }
+    /** @brief Heartbeat interval */
+    std::chrono::seconds heartbeatInterval() const override { return get<std::chrono::seconds>("HeartbeatInterval"); }
+    /** @brief If this variable set to true, then the Central System supports ISO 15118 plug and charge messages via the DataTransfer mechanism as
+               described in this application note. */
+    bool iso15118PnCEnabled() const override { return getBool("Iso15118PnCEnabled"); }
+
   private:
     /** @brief Configuration file */
     ocpp::helpers::IniFile& m_config;

examples/common/config/OcppConfig.cpp

@@ -197,21 +197,34 @@ ocpp::types::ConfigurationStatus OcppConfig::setConfiguration(const std::string&
     {
         if ((it->second & PARAM_WRITE) != 0)
         {
-            if ((it->second & PARAM_OCPP) != 0)
+            std::size_t key_is_interval = key.find("Interval");
+            if (key_is_interval != std::string::npos)
             {
-                m_config.set(OCPP_PARAMS, key, value);
-            }
-            else
-            {
-                m_config.set(STACK_PARAMS, key, value);
-            }
-            if ((it->second & PARAM_REBOOT) != 0)
-            {
-                ret = ConfigurationStatus::RebootRequired;
+                std::size_t value_is_negative = key.find("-");
+                if (value_is_negative)
+                {
+                    ret = ConfigurationStatus::Rejected;
+                }
             }
-            else
+
+            if (ret != ConfigurationStatus::Rejected)
             {
-                ret = ConfigurationStatus::Accepted;
+                if ((it->second & PARAM_OCPP) != 0)
+                {
+                    m_config.set(OCPP_PARAMS, key, value);
+                }
+                else
+                {
+                    m_config.set(STACK_PARAMS, key, value);
+                }
+                if ((it->second & PARAM_REBOOT) != 0)
+                {
+                    ret = ConfigurationStatus::RebootRequired;
+                }
+                else
+                {
+                    ret = ConfigurationStatus::Accepted;
+                }
             }
         }
         else