updated: added optional evse_id to on_handle method

Signed-off-by: Coury Richards <146002925+couryrr-afs@users.noreply.github.com>

Author: Coury Richards

include/ocpp/v201/charge_point.hpp

@@ -262,9 +262,11 @@ class ChargePointInterface {
     /// \brief Notifies the ChargePoint that an external limit has been cleared.
     /// This shall send a ClearedChargingLimitRequest when called.
     // This may send TransactionEventRequest if the \p percentage_delta is greater than our LimitChangeSignificance.
+    /// \param evse_id if provided checks for transactions on the provided evse
     /// \param percentage_delta the percent changed from the existing limits
     /// \param source the source of the external limit
-    virtual void on_external_limit_cleared(double percentage_delta, ChargingLimitSourceEnum source) = 0;
+    virtual void on_external_limit_cleared(std::optional<int32_t> evse_id, double percentage_delta,
+                                           ChargingLimitSourceEnum source) = 0;
 
     /// \brief Data transfer mechanism initiated by charger
     /// \param vendorId
@@ -897,8 +899,9 @@ class ChargePoint : public ChargePointInterface, private ocpp::ChargingStationBa
     void on_external_limits_changed(const std::variant<ConstantChargingLimit, ChargingSchedule>& limit,
                                     double percentage_delta, ChargingLimitSourceEnum source,
                                     std::optional<int32_t> evse_id) override;
-    
-    void on_external_limit_cleared(double percentage_delta, ChargingLimitSourceEnum source) override;
+
+    void on_external_limit_cleared(std::optional<int32_t> evse_id, double percentage_delta,
+                                   ChargingLimitSourceEnum source) override;
 
     std::optional<DataTransferResponse> data_transfer_req(const CiString<255>& vendorId,
                                                           const std::optional<CiString<50>>& messageId,

lib/ocpp/v201/charge_point.cpp

@@ -1112,7 +1112,8 @@ void ChargePoint::on_external_limits_changed(const std::variant<ConstantCharging
     }
 }
 
-void ChargePoint::on_external_limit_cleared(double percentage_delta, ChargingLimitSourceEnum source) {
+void ChargePoint::on_external_limit_cleared(std::optional<int32_t> evse_id, double percentage_delta,
+                                            ChargingLimitSourceEnum source) {
     auto request = this->smart_charging_handler->handle_external_limit_cleared(percentage_delta, source);
 
     auto [cleared_charging_limit_request, transaction_event_requests] = request;

tests/lib/ocpp/v201/test_charge_point.cpp

@@ -25,6 +25,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <memory>
+#include <optional>
 #include <variant>
 
 static const int DEFAULT_EVSE_ID = 1;
@@ -984,7 +985,7 @@ TEST_F(ChargepointTestFixtureV201, K13_OnExternalLimitsCleared_CallsHandler) {
 
     EXPECT_CALL(*smart_charging_handler, handle_external_limit_cleared(deltaChanged, source));
 
-    charge_point->on_external_limit_cleared(deltaChanged, source);
+    charge_point->on_external_limit_cleared(std::nullopt, deltaChanged, source);
 }
 
 } // namespace ocpp::v201