Aligned data ctrlr and sampled data ctrlr must always be available and the required variables are really always required. Only make smart charging ctrlr if smart charging is available.

Signed-off-by: Maaike Zijderveld, iolar <git.mail@iolar.nl>

Author: maaikez

include/ocpp/v201/ctrlr_component_variables.hpp

@@ -15,13 +15,13 @@ struct RequiredComponentVariable : ComponentVariable {
     /// \brief Constructor
     RequiredComponentVariable() : required_for({OcppProtocolVersion::v201, OcppProtocolVersion::v21}) {};
 
-           ///
-           /// \brief RequiredComponentVariable
-           /// \param component    Component
-           /// \param variable     Variable
-           /// \param custom_data  Custom data (default nullopt)
-           /// \param required_for Required for which version. Multiple versions can be given.
-           ///
+    ///
+    /// \brief RequiredComponentVariable
+    /// \param component    Component
+    /// \param variable     Variable
+    /// \param custom_data  Custom data (default nullopt)
+    /// \param required_for Required for which version. Multiple versions can be given.
+    ///
     RequiredComponentVariable(const Component component, const std::optional<Variable> variable,
                               const std::optional<CustomData> custom_data = std::nullopt,
                               const std::set<OcppProtocolVersion> required_for = {OcppProtocolVersion::v201,
@@ -32,7 +32,7 @@ struct RequiredComponentVariable : ComponentVariable {
         this->customData = custom_data;
     };
 
-           /// \brief For which ocpp protocol version(s) this component variable is required.
+    /// \brief For which ocpp protocol version(s) this component variable is required.
     std::set<OcppProtocolVersion> required_for;
 };
 

lib/ocpp/v201/charge_point.cpp

@@ -100,7 +100,10 @@ void ChargePoint::start(BootReasonEnum bootreason, bool start_connecting) {
     this->message_queue->get_persisted_messages_from_db();
     this->boot_notification_req(bootreason);
     // call clear_invalid_charging_profiles when system boots
-    this->clear_invalid_charging_profiles();
+    if (this->smart_charging != nullptr) {
+        this->clear_invalid_charging_profiles();
+    }
+
     if (start_connecting) {
         this->connectivity_manager->connect();
     }
@@ -306,7 +309,9 @@ void ChargePoint::on_transaction_finished(const int32_t evse_id, const DateTime&
                                 transaction_id_token, meter_values, std::nullopt, this->is_offline(), std::nullopt);
 
     // K02.FR.05 The transaction is over, so delete the TxProfiles associated with the transaction.
-    smart_charging->delete_transaction_tx_profiles(enhanced_transaction->get_transaction().transactionId);
+    if (smart_charging != nullptr) {
+        smart_charging->delete_transaction_tx_profiles(enhanced_transaction->get_transaction().transactionId);
+    }
     evse_handle.release_transaction();
 
     bool send_reset = false;
@@ -697,9 +702,12 @@ void ChargePoint::initialize(const std::map<int32_t, int32_t>& evse_connector_st
             this->callbacks.configure_network_connection_profile_callback.value());
     }
 
-    this->smart_charging = std::make_unique<SmartCharging>(
-        *this->device_model, *this->evse_manager, *this->connectivity_manager, *this->message_dispatcher,
-        *this->database_handler, this->callbacks.set_charging_profiles_callback);
+    if (device_model->get_optional_value<bool>(ControllerComponentVariables::SmartChargingCtrlrAvailable)
+            .value_or(false)) {
+        this->smart_charging = std::make_unique<SmartCharging>(
+            *this->device_model, *this->evse_manager, *this->connectivity_manager, *this->message_dispatcher,
+            *this->database_handler, this->callbacks.set_charging_profiles_callback);
+    }
 
     this->tariff_and_cost = std::make_unique<TariffAndCost>(
         *this->message_dispatcher, *this->device_model, *this->evse_manager, *this->meter_values,
@@ -799,7 +807,11 @@ void ChargePoint::handle_message(const EnhancedMessage<v201::MessageType>& messa
         case MessageType::ClearChargingProfile:
         case MessageType::GetChargingProfiles:
         case MessageType::GetCompositeSchedule:
-            this->smart_charging->handle_message(message);
+            if (this->smart_charging != nullptr) {
+                this->smart_charging->handle_message(message);
+            } else {
+                send_not_implemented_error(message.uniqueId, message.messageTypeId);
+            }
             break;
         case MessageType::GetDisplayMessages:
         case MessageType::SetDisplayMessage:
@@ -2036,9 +2048,12 @@ void ChargePoint::handle_remote_start_transaction_request(Call<RequestStartTrans
         // with RequestStartTransactionResponse with status = Rejected and optionally with reasonCode =
         // "InvalidProfile" or "InvalidSchedule".
 
-        bool is_smart_charging_enabled =
+        const bool is_smart_charging_enabled =
+            this->device_model->get_optional_value<bool>(ControllerComponentVariables::SmartChargingCtrlrAvailable)
+                .value_or(false) &&
             this->device_model->get_optional_value<bool>(ControllerComponentVariables::SmartChargingCtrlrEnabled)
-                .value_or(false);
+                .value_or(false) &&
+            this->smart_charging != nullptr;
 
         if (is_smart_charging_enabled) {
             if (msg.chargingProfile.has_value()) {
@@ -2256,8 +2271,9 @@ void ChargePoint::clear_invalid_charging_profiles() {
         for (const auto& [evse_id, profiles] : evses) {
             for (auto profile : profiles) {
                 try {
-                    if (this->smart_charging->conform_and_validate_profile(profile, evse_id) !=
-                        ProfileValidationResultEnum::Valid) {
+                    if (this->smart_charging != nullptr &&
+                        this->smart_charging->conform_and_validate_profile(profile, evse_id) !=
+                            ProfileValidationResultEnum::Valid) {
                         this->database_handler->delete_charging_profile(profile.id);
                     }
                 } catch (const QueryExecutionException& e) {
@@ -2300,16 +2316,27 @@ ChargePoint::set_variables(const std::vector<SetVariableData>& set_variable_data
 }
 
 GetCompositeScheduleResponse ChargePoint::get_composite_schedule(const GetCompositeScheduleRequest& request) {
+    if (this->smart_charging == nullptr) {
+        GetCompositeScheduleResponse response;
+        response.status = GenericStatusEnum::Rejected;
+        return response;
+    }
     return this->smart_charging->get_composite_schedule(request);
 }
 
 std::optional<CompositeSchedule> ChargePoint::get_composite_schedule(int32_t evse_id, std::chrono::seconds duration,
                                                                      ChargingRateUnitEnum unit) {
+    if (this->smart_charging == nullptr) {
+        return std::nullopt;
+    }
     return this->smart_charging->get_composite_schedule(evse_id, duration, unit);
 }
 
 std::vector<CompositeSchedule> ChargePoint::get_all_composite_schedules(const int32_t duration_s,
                                                                         const ChargingRateUnitEnum& unit) {
+    if (this->smart_charging == nullptr) {
+        return {};
+    }
     return this->smart_charging->get_all_composite_schedules(duration_s, unit);
 }
 

lib/ocpp/v201/ctrlr_component_variables.cpp

@@ -1195,20 +1195,10 @@ ComponentVariable get_component_variable(const int32_t evse_id, const int32_t co
 
 const std::vector<std::pair<ComponentVariable, std::vector<RequiredComponentVariable>>>
     required_component_available_variables{
-        {ControllerComponentVariables::AlignedDataCtrlrAvailable,
-         {ControllerComponentVariables::AlignedDataInterval, ControllerComponentVariables::AlignedDataMeasurands,
-          ControllerComponentVariables::AlignedDataTxEndedInterval,
-          ControllerComponentVariables::AlignedDataTxEndedMeasurands}},
         {ControllerComponentVariables::LocalAuthListCtrlrAvailable,
          {ControllerComponentVariables::LocalAuthListCtrlrEntries,
           ControllerComponentVariables::ItemsPerMessageSendLocalList,
           ControllerComponentVariables::BytesPerMessageSendLocalList}},
-        {ControllerComponentVariables::SampledDataCtrlrAvailable,
-         {ControllerComponentVariables::SampledDataTxEndedMeasurands,
-          ControllerComponentVariables::SampledDataTxEndedInterval,
-          ControllerComponentVariables::SampledDataTxStartedMeasurands,
-          ControllerComponentVariables::SampledDataTxUpdatedMeasurands,
-          ControllerComponentVariables::SampledDataTxUpdatedInterval}},
         {ControllerComponentVariables::SmartChargingCtrlrAvailable,
          {ControllerComponentVariables::ChargingProfileMaxStackLevel,
           ControllerComponentVariables::ChargingScheduleChargingRateUnit,
@@ -1232,6 +1222,15 @@ const std::vector<std::pair<ComponentVariable, std::vector<RequiredComponentVari
           ControllerComponentVariables::DisplayMessageSupportedPriorities}}};
 
 const std::vector<RequiredComponentVariable> required_variables{
+    ControllerComponentVariables::AlignedDataInterval,
+    ControllerComponentVariables::AlignedDataMeasurands,
+    ControllerComponentVariables::AlignedDataTxEndedInterval,
+    ControllerComponentVariables::AlignedDataTxEndedMeasurands,
+    ControllerComponentVariables::SampledDataTxEndedMeasurands,
+    ControllerComponentVariables::SampledDataTxEndedInterval,
+    ControllerComponentVariables::SampledDataTxStartedMeasurands,
+    ControllerComponentVariables::SampledDataTxUpdatedMeasurands,
+    ControllerComponentVariables::SampledDataTxUpdatedInterval,
     ControllerComponentVariables::ChargePointId,
     ControllerComponentVariables::NetworkConnectionProfiles,
     ControllerComponentVariables::ChargeBoxSerialNumber,