X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fcan%2Fcan-bus.cpp;h=79fcd3fc4c52b397c167c4e6cc7f264ce4e579c3;hb=d67146a15dad49d28bea92891cff1a8489534aa5;hp=93de2a380da9ead80d4c3c3c264663eda45cde95;hpb=fe5a4857985fd00b961c63274e678c8df19feaee;p=apps%2Fagl-service-can-low-level.git

diff --git a/src/can/can-bus.cpp b/src/can/can-bus.cpp
index 93de2a38..79fcd3fc 100644
--- a/src/can/can-bus.cpp
+++ b/src/can/can-bus.cpp
@@ -39,11 +39,6 @@ extern "C"
 	#include <afb/afb-binding.h>
 }
 
-/********************************************************************************
-*
-*		can_bus_t method implementation
-*
-*********************************************************************************/
 /**
 * @brief Class constructor
 *
@@ -81,7 +76,7 @@ void can_bus_t::can_decode_message()
 		/* First we have to found which can_signal_t it is */
 		search_key = build_DynamicField((double)can_message.get_id());
 		signals.clear();
-		config->find_can_signals(search_key, signals);
+		configuration_t::instance().find_can_signals(search_key, signals);
 
 		/* Decoding the message ! Don't kill the messenger ! */
 		for(auto& sig : signals)
@@ -94,9 +89,9 @@ void can_bus_t::can_decode_message()
 			DEBUG(binder_interface, "Operator[] key string: %s, event valid? %d", sig.generic_name, afb_event_is_valid(s[std::string(sig.generic_name)]));
 			DEBUG(binder_interface, "Nb elt matched char: %d", (int)s.count(sig.generic_name));
 			DEBUG(binder_interface, "Nb elt matched string: %d", (int)s.count(std::string(sig.generic_name)));*/
-			if( s.find(sig->get_generic_name()) != s.end() && afb_event_is_valid(s[sig->get_generic_name()]))
+			if( s.find(sig->get_name()) != s.end() && afb_event_is_valid(s[sig->get_name()]))
 			{
-				decoded_message = decoder_t::translateSignal(*sig, can_message, config->get_can_signals());
+				decoded_message = decoder_t::translateSignal(*sig, can_message, configuration_t::instance().get_can_signals());
 
 				openxc_SimpleMessage s_message = build_SimpleMessage(sig->get_generic_name(), decoded_message);
 				vehicle_message = build_VehicleMessage_with_SimpleMessage(openxc_DynamicField_Type::openxc_DynamicField_Type_NUM, s_message);
@@ -186,16 +181,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);
-			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 +227,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 +336,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_;
 }
-