diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-03-15 13:04:42 +0100 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-03-16 17:21:57 +0100 |
| commit | 1d464d2a7380248b04c3e734ed5c6e84bbf53ddf (patch) | |
| tree | c75ef10c1a45477f4597e4edd97d0a7fc16a4447 /src/can/can-bus.hpp | |
| parent | 56c22348d3af944b68bc7395553b9f8b1a817ba6 (diff) | |
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 <romain.forlot@iot.bzh>
Diffstat (limited to 'src/can/can-bus.hpp')
| -rw-r--r-- | src/can/can-bus.hpp | 5 |
1 files changed, 3 insertions, 2 deletions
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 <openxc_VehicleMessage> vehicle_message_q_; /// < queue that'll store openxc_VehicleMessage to pushed - std::vector<std::shared_ptr<can_bus_dev_t>> can_devices_; /// < Can device map containing all can_bus_dev_t objects initialized during init_can_dev function + static std::map<std::string, std::shared_ptr<can_bus_dev_t>> 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<std::shared_ptr<can_bus_dev_t>>& get_can_devices() const; + const std::map<std::string, std::shared_ptr<can_bus_dev_t>>& get_can_devices() const; + static std::shared_ptr<can_bus_dev_t> get_can_device(std::string bus); }; |