From 24057b7fad6d4d1f1f264995d0f5865acf466004 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Sun, 12 Mar 2017 19:38:49 +0100 Subject: Make diagnostic manager initialization processus. It is initiliazed with by default the first CAN bus device in the CAN bus device list from CAN bus manager. The object is instancied at configuration_t object first invokation and after all CAN buses has been initialized then the diag manager is initialized too. Change-Id: I4894f2c62f575676c34efec3608b97de8c5326e1 Signed-off-by: Romain Forlot --- src/can/can-bus.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/can/can-bus.cpp') diff --git a/src/can/can-bus.cpp b/src/can/can-bus.cpp index 7a18ce8f..8edf5bac 100644 --- a/src/can/can-bus.cpp +++ b/src/can/can-bus.cpp @@ -186,13 +186,13 @@ int can_bus_t::init_can_dev() for(const auto& device : devices_name) { - can_devices_m_[device] = std::make_shared(device, i); - if (can_devices_m_[device]->open() == 0) + can_devices_.push_back(std::make_shared(device, i)); + if (can_devices_[i]->open() == 0) { i++; DEBUG(binder_interface, "Start reading thread"); NOTICE(binder_interface, "%s device opened and reading", device.c_str()); - can_devices_m_[device]->start_reading(*this); + can_devices_[i]->start_reading(*this); } else ERROR(binder_interface, "Can't open device %s", device.c_str()); @@ -349,8 +349,8 @@ void can_bus_t::push_new_vehicle_message(const openxc_VehicleMessage& v_msg) * * @return map can_bus_dev_m_ map */ -std::map> can_bus_t::get_can_devices() +const std::vector>& can_bus_t::get_can_devices() const { - return can_devices_m_; + return can_devices_; } -- cgit 1.2.3-korg