Keep subscription to signal simplier without doubling

[apps/agl-service-can-low-level.git] / src / can / can-bus.cpp

diff --git a/src/can/can-bus.cpp b/src/can/can-bus.cpp
index 7a18ce8..469b55d 100644 (file)
--- a/src/can/can-bus.cpp
+++ b/src/can/can-bus.cpp
@@ -186,16 +186,16 @@ int can_bus_t::init_can_dev()
 
                for(const auto& device : devices_name)
                {
-                       can_devices_m_[device] = std::make_shared<can_bus_dev_t>(device, i);
-                       if (can_devices_m_[device]->open() == 0)
+                       can_devices_.push_back(std::make_shared<can_bus_dev_t>(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());
+                       i++;
                }
 
                NOTICE(binder_interface, "Initialized %d/%d can bus device(s)", i, t);
@@ -232,15 +232,7 @@ std::vector<std::string> can_bus_t::read_conf()
                jo = json_tokener_parse(fd_conf_content.c_str());
 
                if (jo == NULL || !json_object_object_get_ex(jo, "canbus", &canbus))
-               {/**
-* @brief Telling if the pushing thread is running
-*  This is the boolean value on which the while loop
-*  take its condition. Set it to false will stop the
-*  according thread.
-*
-* @return true if pushing thread is running, false if not.
-*/
-
+               {
                        ERROR(binder_interface, "Can't find canbus node in the configuration file. Please review it.");
                        ret.clear();
                }
@@ -349,8 +341,7 @@ void can_bus_t::push_new_vehicle_message(const openxc_VehicleMessage& v_msg)
 *
 * @return map can_bus_dev_m_ map
 */
-std::map<std::string, std::shared_ptr<can_bus_dev_t>> can_bus_t::get_can_devices()
+const std::vector<std::shared_ptr<can_bus_dev_t>>& can_bus_t::get_can_devices() const
 {
-       return can_devices_m_;
+       return can_devices_;
 }
-