From 1d464d2a7380248b04c3e734ed5c6e84bbf53ddf Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Wed, 15 Mar 2017 13:04:42 +0100 Subject: Revert accessing CAN device with a map indexing on dev name Main reason for that behavior revert is because of generator that rely on CAN device name and so we have point on these object by specify the device name. Instead of shared pointer between objects, instead binding is based on device name. With a device name you can get the shared pointer on it using new static method from can_bus_t object. Change-Id: I331e0ad8d03c88a15c697d12a9fce3699b0cd962 Signed-off-by: Romain Forlot --- src/can/can-bus.hpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/can/can-bus.hpp') diff --git a/src/can/can-bus.hpp b/src/can/can-bus.hpp index 97b683d..a51dfb1 100644 --- a/src/can/can-bus.hpp +++ b/src/can/can-bus.hpp @@ -68,7 +68,7 @@ private: std::mutex decoded_can_message_mutex_; /// < mutex protecting the vehicle_message_q_ queue. std::queue vehicle_message_q_; /// < queue that'll store openxc_VehicleMessage to pushed - std::vector> can_devices_; /// < Can device map containing all can_bus_dev_t objects initialized during init_can_dev function + static std::map> can_devices_; /// < Can device map containing all can_bus_dev_t objects initialized during init_can_dev function public: can_bus_t(int conf_file); @@ -91,5 +91,6 @@ public: openxc_VehicleMessage next_vehicle_message(); void push_new_vehicle_message(const openxc_VehicleMessage& v_msg); - const std::vector>& get_can_devices() const; + const std::map>& get_can_devices() const; + static std::shared_ptr get_can_device(std::string bus); }; -- cgit 1.2.3-korg