Extended RequiredComponentVariable with additional property to specify for which ocpp version a variable is required. This is the base to continue implementing a device model integrity check inside libocpps DeviceModel class

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

Author: Pietfried

include/ocpp/v201/ctrlr_component_variables.hpp

@@ -9,6 +9,8 @@
 namespace ocpp {
 namespace v201 {
 
+std::vector<RequiredComponentVariable> required_variables;
+
 namespace ControllerComponents {
 extern const Component InternalCtrlr;
 extern const Component AlignedDataCtrlr;

include/ocpp/v201/ocpp_types.hpp

@@ -5,6 +5,7 @@
 #ifndef OCPP_V201_OCPP_TYPES_HPP
 #define OCPP_V201_OCPP_TYPES_HPP
 
+#include <set>
 #include <string>
 
 #include <nlohmann/json_fwd.hpp>
@@ -2239,7 +2240,19 @@ void from_json(const json& j, Firmware& k);
 /// \returns an output stream with the Firmware written to
 std::ostream& operator<<(std::ostream& os, const Firmware& k);
 
-struct RequiredComponentVariable : ComponentVariable {};
+struct RequiredComponentVariable : ComponentVariable {
+    RequiredComponentVariable() : required_for({OcppProtocolVersion::v201, OcppProtocolVersion::v21}) {};
+    RequiredComponentVariable(const Component component, const std::optional<CustomData> custom_data,
+                              const std::optional<Variable> variable,
+                              const std::set<OcppProtocolVersion> required_for = {OcppProtocolVersion::v201,
+                                                                                  OcppProtocolVersion::v21}) :
+        ComponentVariable(), required_for(required_for) {
+        this->component = component;
+        this->variable = variable;
+        this->customData = custom_data;
+    };
+    std::set<OcppProtocolVersion> required_for;
+};
 } // namespace v201
 } // namespace ocpp
 

lib/ocpp/v201/ctrlr_component_variables.cpp

@@ -1080,6 +1080,12 @@ const ComponentVariable TariffCostCtrlrAvailableTariff = {
     ControllerComponents::TariffCostCtrlr,
     std::optional<Variable>({"Available", "Tariff"}),
 };
+const ComponentVariable EvseSleep = {
+    ControllerComponents::SmartChargingCtrlr,
+    std::nullopt,
+    std::optional<Variable>({"EvseSleep", std::nullopt}),
+    {OcppProtocolVersion::v21}
+};
 const ComponentVariable TariffCostCtrlrAvailableCost = {
     ControllerComponents::TariffCostCtrlr,
     std::optional<Variable>({"Available", "Cost"}),

lib/ocpp/v201/device_model.cpp

@@ -429,6 +429,8 @@ void DeviceModel::check_integrity(const std::map<int32_t, int32_t>& evse_connect
     try {
         this->device_model->check_integrity();
 
+        // TODO: add required variable check here.
+
         int32_t nr_evse_components = 0;
         std::map<int32_t, int32_t> evse_id_nr_connector_components;