From 40cab9808fa58ddba8398d08b82bc7c70977e40e Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Mon, 21 Oct 2024 22:19:06 +0200 Subject: [PATCH] SatelliteAgent/SatelliteController: adapt for change evse_manager interface This adapts for the following PR in everest-core: - https://github.com/EVerest/everest-core/pull/872 - https://github.com/EVerest/everest-core/pull/924 Signed-off-by: Michael Heimpold --- modules/SatelliteAgent/SatelliteAgent.cpp | 8 ++++---- modules/SatelliteController/SatelliteController.cpp | 2 ++ .../SatelliteController/evse_manager/evse_managerImpl.cpp | 6 ------ .../SatelliteController/evse_manager/evse_managerImpl.hpp | 1 - 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/modules/SatelliteAgent/SatelliteAgent.cpp b/modules/SatelliteAgent/SatelliteAgent.cpp index 4d00b52..4e165a8 100644 --- a/modules/SatelliteAgent/SatelliteAgent.cpp +++ b/modules/SatelliteAgent/SatelliteAgent.cpp @@ -63,6 +63,10 @@ void SatelliteAgent::init() { this->add_to_event_list("evse_manager", "powermeter", value); }); + this->r_evse_manager->subscribe_powermeter_public_key_ocmf([&](std::string value) { + this->add_to_event_list("evse_manager", "powermeter_public_key_ocmf", value); + }); + this->r_evse_manager->subscribe_evse_id([&](std::string value) { this->add_to_event_list("evse_manager", "evse_id", value); }); @@ -287,10 +291,6 @@ void SatelliteAgent::init_rpc_binds() { return this->r_evse_manager->call_force_unlock(connector_id); }); - this->rpc->bind("evse_manager_set_external_limits", [&](std::string& value) { - return this->r_evse_manager->call_set_external_limits(json::parse(value)); - }); - this->rpc->bind("evse_manager_set_get_certificate_response", [&](std::string& certificate_response) { this->r_evse_manager->call_set_get_certificate_response(json::parse(certificate_response)); }); diff --git a/modules/SatelliteController/SatelliteController.cpp b/modules/SatelliteController/SatelliteController.cpp index b8bc649..6b38b83 100644 --- a/modules/SatelliteController/SatelliteController.cpp +++ b/modules/SatelliteController/SatelliteController.cpp @@ -136,6 +136,8 @@ void SatelliteController::ready() { this->p_evse_manager->publish_telemetry(event["value"]); else if (event["var"] == "powermeter") this->p_evse_manager->publish_powermeter(event["value"]); + else if (event["var"] == "powermeter_public_key_ocmf") + this->p_evse_manager->publish_powermeter_public_key_ocmf(event["value"]); else if (event["var"] == "evse_id") this->p_evse_manager->publish_evse_id(event["value"]); else if (event["var"] == "hw_capabilities") diff --git a/modules/SatelliteController/evse_manager/evse_managerImpl.cpp b/modules/SatelliteController/evse_manager/evse_managerImpl.cpp index 1519084..d82af71 100644 --- a/modules/SatelliteController/evse_manager/evse_managerImpl.cpp +++ b/modules/SatelliteController/evse_manager/evse_managerImpl.cpp @@ -69,12 +69,6 @@ bool evse_managerImpl::handle_force_unlock(int& connector_id) { return this->mod->rpc->call("evse_manager_force_unlock", connector_id).as(); } -void evse_managerImpl::handle_set_external_limits(types::energy::ExternalLimits& value) { - json j = value; - - this->mod->rpc->call("evse_manager_set_external_limits", j.dump()); -} - void evse_managerImpl::handle_set_get_certificate_response( types::iso15118_charger::ResponseExiStreamStatus& certificate_response) { json j = certificate_response; diff --git a/modules/SatelliteController/evse_manager/evse_managerImpl.hpp b/modules/SatelliteController/evse_manager/evse_managerImpl.hpp index d125dd8..b69504f 100644 --- a/modules/SatelliteController/evse_manager/evse_managerImpl.hpp +++ b/modules/SatelliteController/evse_manager/evse_managerImpl.hpp @@ -46,7 +46,6 @@ class evse_managerImpl : public evse_managerImplBase { virtual bool handle_resume_charging() override; virtual bool handle_stop_transaction(types::evse_manager::StopTransactionRequest& request) override; virtual bool handle_force_unlock(int& connector_id) override; - virtual void handle_set_external_limits(types::energy::ExternalLimits& value) override; virtual void handle_set_get_certificate_response( types::iso15118_charger::ResponseExiStreamStatus& certificate_response) override; virtual bool handle_external_ready_to_start_charging() override;