From efc7297476bfee786e6f69800552ca03e20d128d Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Tue, 16 May 2017 00:24:15 +0200 Subject: [PATCH] There is no more need having pointer on socket device Return bus name string. Change-Id: I0e7f4171c3d1052cb6425cd5b93e5a593d7d277f Signed-off-by: Romain Forlot --- CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp | 6 +++++- CAN-binder/low-can-binding/utils/openxc-utils.cpp | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp b/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp index c1b06406..8a55365e 100644 --- a/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp +++ b/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp @@ -199,7 +199,11 @@ void diagnostic_manager_t::shims_logger(const char* format, ...) void diagnostic_manager_t::shims_timer() {} -std::shared_ptr diagnostic_manager_t::get_can_bus_dev() +std::string diagnostic_manager_t::get_can_bus() +{ + return bus_; +} + active_diagnostic_request_t* diagnostic_manager_t::get_last_recurring_requests() const { return recurring_requests_.back(); diff --git a/CAN-binder/low-can-binding/utils/openxc-utils.cpp b/CAN-binder/low-can-binding/utils/openxc-utils.cpp index d77a0a34..2cf03e41 100644 --- a/CAN-binder/low-can-binding/utils/openxc-utils.cpp +++ b/CAN-binder/low-can-binding/utils/openxc-utils.cpp @@ -34,12 +34,15 @@ openxc_VehicleMessage build_VehicleMessage(active_diagnostic_request_t* request, const DiagnosticResponse& response, float parsed_value) { openxc_VehicleMessage message; + configuration_t& conf = configuration_t::instance(); message.has_type = true; message.type = openxc_VehicleMessage_Type::openxc_VehicleMessage_Type_DIAGNOSTIC; message.has_diagnostic_response = true; message.diagnostic_response.has_bus = true; - message.diagnostic_response.bus = configuration_t::instance().get_diagnostic_manager().get_can_bus_dev()->get_index(); + message.diagnostic_response.bus = conf.get_can_bus_manager().get_can_device( + conf.get_diagnostic_manager().get_can_bus()) + ->get_index(); message.diagnostic_response.has_message_id = true; if(request->get_id() != OBD2_FUNCTIONAL_BROADCAST_ID) -- 2.16.6