Addressed requested changes

Signed-off-by: Piet Gömpel <pietgoempel@gmail.com>

Author: Pietfried

CMakeLists.txt

@@ -19,7 +19,7 @@ option(OCPP_INSTALL "Install the library (shared data might be installed anyway)
 option(LIBOCPP_ENABLE_DEPRECATED_WEBSOCKETPP "Websocket++ has been removed from the project" OFF)
 
 option(LIBOCPP_ENABLE_V16 "Enable OCPP 1.6 in the ocpp library" ON)
-option(LIBOCPP_ENABLE_V2 "Enable OCPP 2.0.1 in the ocpp library" ON)
+option(LIBOCPP_ENABLE_V2 "Enable OCPP 2.0.1 and OCPP2.1 in the ocpp library" ON)
 
 if((NOT LIBOCPP_ENABLE_V16) AND (NOT LIBOCPP_ENABLE_V2))
     message(FATAL_ERROR "At least one of LIBOCPP_ENABLE_V16 and LIBOCPP_ENABLE_V2 needs to be ON")

config/v2/CMakeLists.txt

@@ -20,7 +20,7 @@ set(MIGRATION_DEVICE_MODEL_FILE_VERSION_V2 ${TARGET_MIGRATION_FILE_VERSION} PARE
 set(MIGRATION_FILES_SOURCE_DIR_V2 ${MIGRATION_FILES_LOCATION} PARENT_SCOPE)
 set(MIGRATION_FILES_DEVICE_MODEL_SOURCE_DIR_V2 ${MIGRATION_FILES_DEVICE_MODEL_LOCATION} PARENT_SCOPE)
 
-option(LIBOCPP_INSTALL_DEVICE_MODEL_DATABASE "Install device model database for OCPP201" ON)
+option(LIBOCPP_INSTALL_DEVICE_MODEL_DATABASE "Install device model database for OCPP2.0.1 and OCPP2.1" ON)
 
 list(APPEND CONFIGS
      ../logging.ini

doc/common/getting_started.md

@@ -69,4 +69,4 @@ Please see the [Getting Started documentation for OCPP2.0.1](../v2/getting_start
 You will find the generated doxygen documentation at:
 `build/dist/docs/html/index.html`
 
-The main reference for the integration of libocpp for OCPP1.6 is the ocpp::v16::ChargePoint class defined in `v16/charge_point.hpp` , for OCPP2.0.1 that is the ocpp::v2::ChargePoint class defined in `v2/charge_point.hpp` .
+The main reference for the integration of libocpp for OCPP1.6 is the ocpp::v16::ChargePoint class defined in `v16/charge_point.hpp` , for OCPP2.0.1 and OCPP2.1 that is the ocpp::v2::ChargePoint class defined in `v2/charge_point.hpp` .

include/ocpp/common/types.hpp

@@ -610,7 +610,7 @@ std::ostream& operator<<(std::ostream& os, const CertificateHashDataChain& k);
 
 enum class OcppProtocolVersion {
     v16,
-    v2,
+    v201,
     v21,
     Unknown,
 };

include/ocpp/v2/charge_point.hpp

@@ -126,7 +126,7 @@ class ChargePointInterface {
     /// \param charging_state   The new charging state
     virtual void
     on_transaction_started(const int32_t evse_id, const int32_t connector_id, const std::string& session_id,
-                           const DateTime& timestamp, const ocpp::v2::TriggerReasonEnum trigger_reason,
+                           const DateTime& timestamp, const TriggerReasonEnum trigger_reason,
                            const MeterValue& meter_start, const std::optional<IdToken>& id_token,
                            const std::optional<IdToken>& group_id_token, const std::optional<int32_t>& reservation_id,
                            const std::optional<int32_t>& remote_start_id, const ChargingStateEnum charging_state) = 0;
@@ -523,7 +523,7 @@ class ChargePoint : public ChargePointInterface, private ocpp::ChargingStationBa
     on_get_15118_ev_certificate_request(const Get15118EVCertificateRequest& request) override;
 
     void on_transaction_started(const int32_t evse_id, const int32_t connector_id, const std::string& session_id,
-                                const DateTime& timestamp, const ocpp::v2::TriggerReasonEnum trigger_reason,
+                                const DateTime& timestamp, const TriggerReasonEnum trigger_reason,
                                 const MeterValue& meter_start, const std::optional<IdToken>& id_token,
                                 const std::optional<IdToken>& group_id_token,
                                 const std::optional<int32_t>& reservation_id,

include/ocpp/v2/functional_blocks/transaction.hpp

@@ -46,7 +46,7 @@ class TransactionInterface : public MessageHandlerInterface {
     /// \param charging_state   The new charging state
     virtual void
     on_transaction_started(const int32_t evse_id, const int32_t connector_id, const std::string& session_id,
-                           const DateTime& timestamp, const ocpp::v2::TriggerReasonEnum trigger_reason,
+                           const DateTime& timestamp, const TriggerReasonEnum trigger_reason,
                            const MeterValue& meter_start, const std::optional<IdToken>& id_token,
                            const std::optional<IdToken>& group_id_token, const std::optional<int32_t>& reservation_id,
                            const std::optional<int32_t>& remote_start_id, const ChargingStateEnum charging_state) = 0;
@@ -69,12 +69,10 @@ class TransactionInterface : public MessageHandlerInterface {
 
     // Functional Block E: Transactions
     virtual void transaction_event_req(const TransactionEventEnum& event_type, const DateTime& timestamp,
-                                       const ocpp::v2::Transaction& transaction,
-                                       const ocpp::v2::TriggerReasonEnum& trigger_reason, const int32_t seq_no,
-                                       const std::optional<int32_t>& cable_max_current,
-                                       const std::optional<ocpp::v2::EVSE>& evse,
-                                       const std::optional<ocpp::v2::IdToken>& id_token,
-                                       const std::optional<std::vector<ocpp::v2::MeterValue>>& meter_value,
+                                       const Transaction& transaction, const TriggerReasonEnum& trigger_reason,
+                                       const int32_t seq_no, const std::optional<int32_t>& cable_max_current,
+                                       const std::optional<EVSE>& evse, const std::optional<IdToken>& id_token,
+                                       const std::optional<std::vector<MeterValue>>& meter_value,
                                        const std::optional<int32_t>& number_of_phases_used, const bool offline,
                                        const std::optional<int32_t>& reservation_id,
                                        const bool initiated_by_trigger_message = false) = 0;

lib/ocpp/common/types.cpp

@@ -1062,7 +1062,7 @@ std::string ocpp_protocol_version_to_string(OcppProtocolVersion e) {
     switch (e) {
     case OcppProtocolVersion::v16:
         return "ocpp1.6";
-    case OcppProtocolVersion::v2:
+    case OcppProtocolVersion::v201:
         return "ocpp2.0.1";
     case OcppProtocolVersion::v21:
         return "ocpp2.1";
@@ -1078,7 +1078,7 @@ OcppProtocolVersion string_to_ocpp_protocol_version(const std::string& s) {
         return OcppProtocolVersion::v16;
     }
     if (s == "ocpp2.0.1") {
-        return OcppProtocolVersion::v2;
+        return OcppProtocolVersion::v201;
     }
     if (s == "ocpp2.1") {
         return OcppProtocolVersion::v21;

lib/ocpp/v2/connectivity_manager.cpp

@@ -337,7 +337,7 @@ ConnectivityManager::get_ws_connection_options(const int32_t configuration_slot)
             network_connection_profile.securityProfile);
 
         WebsocketConnectionOptions connection_options{
-            {OcppProtocolVersion::v2},
+            {OcppProtocolVersion::v201},
             uri,
             network_connection_profile.securityProfile,
             this->device_model.get_optional_value<std::string>(ControllerComponentVariables::BasicAuthPassword),

src/code_generator/common/generate_cpp.py

@@ -613,7 +613,7 @@ def parse_schemas(version: str, schema_dir: Path = Path('schemas/json/'),
 
     if version == '1.6' or version == '16' or version == 'v16':
         version_path = 'v16'
-    elif version == '2.0.1' or version == '201' or version == 'v2':
+    elif version == '2.0.1' or version == '201' or version == 'v201':
         version_path = 'v2'
     else:
         raise ValueError(f"Version {version} not a valid ocpp version")