Generate OCPP 2.1 public draft messages

config/v201/component_config/standardized/InternalCtrlr.json

@@ -835,6 +835,24 @@
           "description": "If enabled we allow connections using security level 0. This does pose a security risk and is not allowed according to the OCPP spec",
           "default": false,
           "type": "boolean"
+      },
+      "SupportedOcppVersions": {
+          "variable_name": "SupportedOcppVersions",
+          "characteristics": {
+              "supportsMonitoring": true,
+              "dataType": "SequenceList",
+              "valuesList": "ocpp2.0.1,ocpp2.1"
+          },
+          "attributes": [
+              {
+                  "type": "Actual",
+                  "mutability": "ReadOnly",
+                  "value": "ocpp2.1,ocpp2.0.1"
+              }
+          ],
+          "description": "List of supported OCPP versions in order of preference",
+          "default": "ocpp2.1,ocpp2.0.1",
+          "type": "string"
       }
   },
   "required": [
@@ -847,6 +865,7 @@
     "NetworkConnectionProfiles",
     "NumberOfConnectors",
     "SupportedCiphers12",
-    "SupportedCiphers13"
+    "SupportedCiphers13",
+    "SupportedOcppVersions"
   ]
 }

include/ocpp/common/constants.hpp

@@ -20,7 +20,7 @@ constexpr float DEFAULT_LIMIT_WATTS = 33120.0;
 constexpr std::int32_t DEFAULT_AND_MAX_NUMBER_PHASES = 3;
 constexpr float LOW_VOLTAGE = 230;
 
-constexpr float NO_LIMIT_SPECIFIED = -1.0;
+// constexpr float NO_LIMIT_SPECIFIED = -1.0;
 constexpr std::int32_t NO_START_PERIOD = -1;
 constexpr std::int32_t EVSEID_NOT_SET = -1;
 

include/ocpp/v201/charge_point.hpp

@@ -282,7 +282,7 @@ class ChargePointInterface {
     /// \param certificate
     /// \param ocsp_request_data
     /// \return AuthorizeResponse containing the result of the validation
-    virtual AuthorizeResponse validate_token(const IdToken id_token, const std::optional<CiString<5500>>& certificate,
+    virtual AuthorizeResponse validate_token(const IdToken id_token, const std::optional<CiString<10000>>& certificate,
                                              const std::optional<std::vector<OCSPRequestData>>& ocsp_request_data) = 0;
 
     /// \brief Data transfer mechanism initiated by charger
@@ -418,6 +418,8 @@ class ChargePoint : public ChargePointInterface, private ocpp::ChargingStationBa
 
     // states
     std::atomic<RegistrationStatusEnum> registration_status;
+    std::atomic<OcppProtocolVersion> ocpp_version =
+        OcppProtocolVersion::Unknown; // version that is currently in use, selected by CSMS in websocket handshake
     FirmwareStatusEnum firmware_status;
     // The request ID in the last firmware update status received
     std::optional<int32_t> firmware_status_id;
@@ -472,7 +474,8 @@ class ChargePoint : public ChargePointInterface, private ocpp::ChargingStationBa
     void scheduled_check_client_certificate_expiration();
     void scheduled_check_v2g_certificate_expiration();
     void websocket_connected_callback(const int configuration_slot,
-                                      const NetworkConnectionProfile& network_connection_profile);
+                                      const NetworkConnectionProfile& network_connection_profile,
+                                      const OcppProtocolVersion ocpp_version);
     void websocket_disconnected_callback(const int configuration_slot,
                                          const NetworkConnectionProfile& network_connection_profile);
     void websocket_connection_failed(ConnectionFailedReason reason);
@@ -555,15 +558,15 @@ class ChargePoint : public ChargePointInterface, private ocpp::ChargingStationBa
     /// \param connector_type   The connector type.
     /// \return True when a connector is available and the evse id exists.
     ///
-    bool is_connector_available(const uint32_t evse_id, std::optional<ConnectorEnum> connector_type);
+    bool is_connector_available(const uint32_t evse_id, std::optional<CiString<20>> connector_type);
 
     ///
     /// \brief Check if the connector exists on the given evse id.
     /// \param evse_id          The evse id to check for.
     /// \param connector_type   The connector type.
     /// \return False if evse id does not exist or evse does not have the given connector type.
     ///
-    bool does_connector_exist(const uint32_t evse_id, std::optional<ConnectorEnum> connector_type);
+    bool does_connector_exist(const uint32_t evse_id, std::optional<CiString<20>> connector_type);
 
     /// \brief Get the value optional offline flag
     /// \return true if the charge point is offline. std::nullopt if it is online;
@@ -652,9 +655,8 @@ class ChargePoint : public ChargePointInterface, private ocpp::ChargingStationBa
                           const bool initiated_by_trigger_message = false);
 
     // Functional Block K: Smart Charging
-    void report_charging_profile_req(const int32_t request_id, const int32_t evse_id,
-                                     const ChargingLimitSourceEnum source, const std::vector<ChargingProfile>& profiles,
-                                     const bool tbc);
+    void report_charging_profile_req(const int32_t request_id, const int32_t evse_id, const CiString<20> source,
+                                     const std::vector<ChargingProfile>& profiles, const bool tbc);
     void report_charging_profile_req(const ReportChargingProfilesRequest& req);
 
     // Functional Block N: Diagnostics
@@ -871,7 +873,7 @@ class ChargePoint : public ChargePointInterface, private ocpp::ChargingStationBa
 
     std::optional<std::string> get_evse_transaction_id(int32_t evse_id) override;
 
-    AuthorizeResponse validate_token(const IdToken id_token, const std::optional<CiString<5500>>& certificate,
+    AuthorizeResponse validate_token(const IdToken id_token, const std::optional<CiString<10000>>& certificate,
                                      const std::optional<std::vector<OCSPRequestData>>& ocsp_request_data) override;
 
     void on_event(const std::vector<EventData>& events) override;

include/ocpp/v201/charge_point_callbacks.hpp

@@ -84,8 +84,8 @@ struct Callbacks {
     /// \brief Check if the current reservation for the given evse id is made for the id token / group id token.
     /// \return The reservation check status of this evse / id token.
     ///
-    std::function<ocpp::ReservationCheckStatus(const int32_t evse_id, const CiString<36> idToken,
-                                               const std::optional<CiString<36>> groupIdToken)>
+    std::function<ocpp::ReservationCheckStatus(const int32_t evse_id, const CiString<255> idToken,
+                                               const std::optional<CiString<255>> groupIdToken)>
         is_reservation_for_token_callback;
     std::function<UpdateFirmwareResponse(const UpdateFirmwareRequest& request)> update_firmware_request_callback;
     // callback to be called when a variable has been changed by the CSMS
@@ -145,7 +145,8 @@ struct Callbacks {
 
     /// \brief Callback function is called when the websocket connection status changes
     std::optional<std::function<void(const bool is_connected, const int configuration_slot,
-                                     const NetworkConnectionProfile& network_connection_profile)>>
+                                     const NetworkConnectionProfile& network_connection_profile,
+                                     const OcppProtocolVersion ocpp_version)>>
         connection_state_changed_callback;
 
     /// \brief Callback functions called for get / set / clear display messages

include/ocpp/v201/connectivity_manager.hpp

@@ -15,8 +15,15 @@
 
 class DeviceModel;
 
-using WebsocketConnectionCallback = std::function<void(
-    int configuration_slot, const NetworkConnectionProfile& network_connection_profile, OcppProtocolVersion version)>;
+/// \brief The result of a configuration of a network profile.
+struct ConfigNetworkResult {
+    std::optional<std::string> interface_address; ///< ip address or interface string
+    bool success;                                 ///< true if the configuration was successful
+};
+
+using WebsocketConnectionCallback =
+    std::function<void(int configuration_slot, const NetworkConnectionProfile& network_connection_profile,
+                       const OcppProtocolVersion version)>;
 using WebsocketConnectionFailedCallback = std::function<void(ConnectionFailedReason reason)>;
 using ConfigureNetworkConnectionProfileCallback = std::function<std::future<ConfigNetworkResult>(
     const int32_t configuration_slot, const NetworkConnectionProfile& network_connection_profile)>;

include/ocpp/v201/constants.hpp

@@ -10,7 +10,8 @@ namespace v201 {
 
 /// \brief OCPP 2.0.1 defines this as 5600 but it can be set to a higher value, which we do here, if it's reported via
 /// the device model, which we do as well
-constexpr std::size_t ISO15118_GET_EV_CERTIFICATE_EXI_RESPONSE_SIZE = 7500;
+/// 17000 is the vminimum alue from OCPP 2.1
+constexpr std::size_t ISO15118_GET_EV_CERTIFICATE_EXI_RESPONSE_SIZE = 17000;
 
 } // namespace v201
 } // namespace ocpp

include/ocpp/v201/ctrlr_component_variables.hpp

@@ -88,6 +88,7 @@ extern const ComponentVariable MessageQueueSizeThreshold;
 extern const ComponentVariable MaxMessageSize;
 extern const ComponentVariable ResumeTransactionsOnBoot;
 extern const ComponentVariable AllowSecurityLevelZeroConnections;
+extern const RequiredComponentVariable SupportedOcppVersions;
 extern const ComponentVariable AlignedDataCtrlrEnabled;
 extern const ComponentVariable AlignedDataCtrlrAvailable;
 extern const RequiredComponentVariable AlignedDataInterval;

include/ocpp/v201/database_handler.hpp

@@ -167,7 +167,7 @@ class DatabaseHandlerInterface {
     /// \brief Inserts or updates the given \p profile to CHARGING_PROFILES table
     virtual void insert_or_update_charging_profile(
         const int evse_id, const v201::ChargingProfile& profile,
-        const ChargingLimitSourceEnum charging_limit_source = ChargingLimitSourceEnum::CSO) = 0;
+        const CiString<20> charging_limit_source = ChargingLimitSourceEnumStringType::CSO) = 0;
 
     /// \brief Deletes the profile with the given \p profile_id
     virtual bool delete_charging_profile(const int profile_id) = 0;
@@ -196,7 +196,7 @@ class DatabaseHandlerInterface {
     /// \brief Retrieves all ChargingProfiles grouped by EVSE ID
     virtual std::map<int32_t, std::vector<v201::ChargingProfile>> get_all_charging_profiles_group_by_evse() = 0;
 
-    virtual ChargingLimitSourceEnum get_charging_limit_source_for_profile(const int profile_id) = 0;
+    virtual CiString<20> get_charging_limit_source_for_profile(const int profile_id) = 0;
 
     virtual std::unique_ptr<common::SQLiteStatementInterface> new_statement(const std::string& sql) = 0;
 };
@@ -270,7 +270,7 @@ class DatabaseHandler : public DatabaseHandlerInterface, public common::Database
     /// charging profiles
     void insert_or_update_charging_profile(
         const int evse_id, const v201::ChargingProfile& profile,
-        const ChargingLimitSourceEnum charging_limit_source = ChargingLimitSourceEnum::CSO) override;
+        const CiString<20> charging_limit_source = ChargingLimitSourceEnumStringType::CSO) override;
     bool delete_charging_profile(const int profile_id) override;
     void delete_charging_profile_by_transaction_id(const std::string& transaction_id) override;
     bool clear_charging_profiles() override;
@@ -282,7 +282,7 @@ class DatabaseHandler : public DatabaseHandlerInterface, public common::Database
     std::vector<v201::ChargingProfile> get_charging_profiles_for_evse(const int evse_id) override;
     std::vector<v201::ChargingProfile> get_all_charging_profiles() override;
     virtual std::map<int32_t, std::vector<v201::ChargingProfile>> get_all_charging_profiles_group_by_evse() override;
-    ChargingLimitSourceEnum get_charging_limit_source_for_profile(const int profile_id) override;
+    CiString<20> get_charging_limit_source_for_profile(const int profile_id) override;
 
     std::unique_ptr<common::SQLiteStatementInterface> new_statement(const std::string& sql) override;
 };

include/ocpp/v201/evse.hpp

@@ -41,7 +41,7 @@ class EvseInterface {
     /// \param connector_type   The connector type to check.
     /// \return True if connector type is unknown or this evse has the given connector type.
     ///
-    virtual bool does_connector_exist(ConnectorEnum connector_type) const = 0;
+    virtual bool does_connector_exist(CiString<20> connector_type) const = 0;
 
     ///
     /// \brief Get connector status.
@@ -54,7 +54,7 @@ class EvseInterface {
     /// \param connector_type   The connector type to filter on (optional).
     /// \return Connector status. If connector type is given and does not exist, std::nullopt.
     ///
-    virtual std::optional<ConnectorStatusEnum> get_connector_status(std::optional<ConnectorEnum> connector_type) = 0;
+    virtual std::optional<ConnectorStatusEnum> get_connector_status(std::optional<CiString<20>> connector_type) = 0;
 
     /// \brief Opens a new transaction
     /// \param transaction_id id of the transaction
@@ -223,7 +223,7 @@ class Evse : public EvseInterface {
     /// \param connector_id     Connector id
     /// \return The connector type. If evse or connector id is not correct: std::nullopt.
     ///
-    std::optional<ConnectorEnum> get_evse_connector_type(const uint32_t connector_id) const;
+    std::optional<CiString<20>> get_evse_connector_type(const uint32_t connector_id) const;
 
 public:
     /// \brief Construct a new Evse object
@@ -247,8 +247,8 @@ class Evse : public EvseInterface {
     int32_t get_id() const;
 
     uint32_t get_number_of_connectors() const;
-    bool does_connector_exist(const ConnectorEnum connector_type) const override;
-    std::optional<ConnectorStatusEnum> get_connector_status(std::optional<ConnectorEnum> connector_type) override;
+    bool does_connector_exist(const CiString<20> connector_type) const override;
+    std::optional<ConnectorStatusEnum> get_connector_status(std::optional<CiString<20>> connector_type) override;
 
     void open_transaction(const std::string& transaction_id, const int32_t connector_id, const DateTime& timestamp,
                           const MeterValue& meter_start, const std::optional<IdToken>& id_token,

include/ocpp/v201/evse_manager.hpp

@@ -29,7 +29,7 @@ class EvseManagerInterface {
     /// \param evse_id          The evse id to check for.
     /// \param connector_type   The connector type.
     /// \return False if evse id does not exist or evse does not have the given connector type.
-    virtual bool does_connector_exist(const int32_t evse_id, ConnectorEnum connector_type) const = 0;
+    virtual bool does_connector_exist(const int32_t evse_id, const CiString<20> connector_type) const = 0;
 
     /// \brief Check if an evse with \p id exists
     virtual bool does_evse_exist(int32_t id) const = 0;
@@ -65,7 +65,7 @@ class EvseManager : public EvseManagerInterface {
     EvseInterface& get_evse(int32_t id) override;
     const EvseInterface& get_evse(const int32_t id) const override;
 
-    virtual bool does_connector_exist(const int32_t evse_id, const ConnectorEnum connector_type) const override;
+    virtual bool does_connector_exist(const int32_t evse_id, const CiString<20> connector_type) const override;
     bool does_evse_exist(const int32_t id) const override;
 
     size_t get_number_of_evses() const override;

include/ocpp/v201/functional_blocks/authorization.hpp

@@ -19,7 +19,7 @@ class AuthorizationInterface : public MessageHandlerInterface {
     }
 
     virtual void start_auth_cache_cleanup_thread() = 0;
-    virtual AuthorizeResponse authorize_req(const IdToken id_token, const std::optional<CiString<5500>>& certificate,
+    virtual AuthorizeResponse authorize_req(const IdToken id_token, const std::optional<CiString<10000>>& certificate,
                                             const std::optional<std::vector<OCSPRequestData>>& ocsp_request_data) = 0;
     virtual void trigger_authorization_cache_cleanup() = 0;
     ///\brief Calculate and update the authorization cache size in the device model
@@ -36,7 +36,7 @@ class AuthorizationInterface : public MessageHandlerInterface {
     /// \param certificate
     /// \param ocsp_request_data
     /// \return AuthorizeResponse containing the result of the validation
-    virtual AuthorizeResponse validate_token(const IdToken id_token, const std::optional<CiString<5500>>& certificate,
+    virtual AuthorizeResponse validate_token(const IdToken id_token, const std::optional<CiString<10000>>& certificate,
                                              const std::optional<std::vector<OCSPRequestData>>& ocsp_request_data) = 0;
 };
 
@@ -62,7 +62,7 @@ class Authorization : public AuthorizationInterface {
     ~Authorization();
     void start_auth_cache_cleanup_thread() override;
     void handle_message(const ocpp::EnhancedMessage<MessageType>& message) override;
-    AuthorizeResponse authorize_req(const IdToken id_token, const std::optional<ocpp::CiString<5500>>& certificate,
+    AuthorizeResponse authorize_req(const IdToken id_token, const std::optional<ocpp::CiString<10000>>& certificate,
                                     const std::optional<std::vector<OCSPRequestData>>& ocsp_request_data) override;
     void trigger_authorization_cache_cleanup() override;
     void update_authorization_cache_size() override;
@@ -76,7 +76,7 @@ class Authorization : public AuthorizationInterface {
     /// \param certificate
     /// \param ocsp_request_data
     /// \return AuthorizeResponse containing the result of the validation
-    AuthorizeResponse validate_token(const IdToken id_token, const std::optional<CiString<5500>>& certificate,
+    AuthorizeResponse validate_token(const IdToken id_token, const std::optional<CiString<10000>>& certificate,
                                      const std::optional<std::vector<OCSPRequestData>>& ocsp_request_data) override;
 
 private: // Functions

include/ocpp/v201/functional_blocks/reservation.hpp

@@ -16,8 +16,8 @@ class EvseManagerInterface;
 
 typedef std::function<ReserveNowStatusEnum(const ReserveNowRequest& request)> ReserveNowCallback;
 typedef std::function<bool(const int32_t reservationId)> CancelReservationCallback;
-typedef std::function<ocpp::ReservationCheckStatus(const int32_t evse_id, const CiString<36> idToken,
-                                                   const std::optional<CiString<36>> groupIdToken)>
+typedef std::function<ocpp::ReservationCheckStatus(const int32_t evse_id, const CiString<255> idToken,
+                                                   const std::optional<CiString<255>> groupIdToken)>
     IsReservationForTokenCallback;
 
 class ReservationInterface : public MessageHandlerInterface {

include/ocpp/v201/messages/Authorize.hpp

@@ -18,9 +18,9 @@ namespace v201 {
 /// \brief Contains a OCPP Authorize message
 struct AuthorizeRequest : public ocpp::Message {
     IdToken idToken;
-    std::optional<CustomData> customData;
-    std::optional<CiString<5500>> certificate;
+    std::optional<CiString<10000>> certificate;
     std::optional<std::vector<OCSPRequestData>> iso15118CertificateHashData;
+    std::optional<CustomData> customData;
 
     /// \brief Provides the type of this Authorize message as a human readable string
     /// \returns the message type as a human readable string
@@ -40,8 +40,10 @@ std::ostream& operator<<(std::ostream& os, const AuthorizeRequest& k);
 /// \brief Contains a OCPP AuthorizeResponse message
 struct AuthorizeResponse : public ocpp::Message {
     IdTokenInfo idTokenInfo;
-    std::optional<CustomData> customData;
     std::optional<AuthorizeCertificateStatusEnum> certificateStatus;
+    std::optional<std::vector<EnergyTransferModeEnum>> allowedEnergyTransfer;
+    std::optional<Tariff> tariff;
+    std::optional<CustomData> customData;
 
     /// \brief Provides the type of this AuthorizeResponse message as a human readable string
     /// \returns the message type as a human readable string

include/ocpp/v201/messages/BootNotification.hpp

@@ -41,8 +41,8 @@ struct BootNotificationResponse : public ocpp::Message {
     ocpp::DateTime currentTime;
     int32_t interval;
     RegistrationStatusEnum status;
-    std::optional<CustomData> customData;
     std::optional<StatusInfo> statusInfo;
+    std::optional<CustomData> customData;
 
     /// \brief Provides the type of this BootNotificationResponse message as a human readable string
     /// \returns the message type as a human readable string