X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fcan%2Fcan-bus.cpp;h=0510998bd47d4e215fe0011350c79c27e897e301;hb=244a40656a2aff974b25418791e58703502f566b;hp=6cd99ba35f91ff1535748f3085f566d343160bd7;hpb=6d6b880b2769add860cb0f135e0f784f8aaf5e00;p=apps%2Fagl-service-can-low-level.git

diff --git a/low-can-binding/can/can-bus.cpp b/low-can-binding/can/can-bus.cpp
index 6cd99ba3..0510998b 100644
--- a/low-can-binding/can/can-bus.cpp
+++ b/low-can-binding/can/can-bus.cpp
@@ -44,12 +44,31 @@ can_bus_t::~can_bus_t()
 }
 
 /// @brief Class constructor
-///
-/// @param[in] conf_file - handle to the json configuration file.
-can_bus_t::can_bus_t(utils::config_parser_t conf_file)
-	: conf_file_{conf_file}
+can_bus_t::can_bus_t()
 {}
 
+/// @brief Fills the CAN device map member with value from device
+///
+/// @param[in] mapping configuration section.
+void can_bus_t::set_can_devices(json_object *mapping)
+{
+	if (! mapping)
+	{
+		AFB_ERROR("Can't initialize CAN buses with this empty mapping.");
+		return;
+	}
+
+	struct json_object_iterator it = json_object_iter_begin(mapping);
+	struct json_object_iterator end = json_object_iter_end(mapping);
+	while (! json_object_iter_equal(&it, &end)) {
+		can_devices_mapping_.push_back(std::make_pair(
+			json_object_iter_peek_name(&it),
+			json_object_get_string(json_object_iter_peek_value(&it))
+			));
+		json_object_iter_next(&it);
+	}
+}
+
 /// @brief Take a decoded message to determine if its value complies with the desired
 /// filters.
 ///
@@ -120,7 +139,7 @@ void can_bus_t::process_diagnostic_signals(diagnostic_manager_t& manager, std::s
 
 	openxc_VehicleMessage vehicle_message = manager.find_and_decode_adr(message);
 	if (message->get_timestamp())
-		{vehicle_message.timestamp = message->get_timestamp();}
+		vehicle_message.timestamp = message->get_timestamp();
 	if( (vehicle_message.has_simple_message && vehicle_message.simple_message.has_name) &&
 		s.find(subscription_id) != s.end() && afb_event_is_valid(s[subscription_id]->get_event()))
 	{
@@ -162,11 +181,9 @@ void can_bus_t::can_decode_message()
 				std::lock_guard<std::mutex> subscribed_signals_lock(sm.get_subscribed_signals_mutex());
 				map_subscription& s = sm.get_subscribed_signals();
 				if(application_t::instance().get_diagnostic_manager().is_diagnostic_response(message))
-				{
 					process_diagnostic_signals(application_t::instance().get_diagnostic_manager(), message, s);
-				}
 				else
-					{process_signals(message, s);}
+					process_signals(message, s);
 			}
 			can_message_lock.lock();
 		}
@@ -200,9 +217,9 @@ void can_bus_t::can_event_push()
 					if(afb_event_push(s[v_message.first]->get_event(), jo) == 0)
 					{
 						if(v_message.second.has_diagnostic_response)
-							{on_no_clients(s[v_message.first], v_message.second.diagnostic_response.pid, s);}
+							on_no_clients(s[v_message.first], v_message.second.diagnostic_response.pid, s);
 						else
-							{on_no_clients(s[v_message.first], s);}
+							on_no_clients(s[v_message.first], s);
 					}
 				}
 			}
@@ -303,23 +320,6 @@ void can_bus_t::push_new_vehicle_message(int subscription_id, const openxc_Vehic
 	vehicle_message_q_.push(std::make_pair(subscription_id, v_msg));
 }
 
-/// @brief Fills the CAN device map member with value from device
-/// mapping configuration file read at initialization.
-void can_bus_t::set_can_devices()
-{
-	if(conf_file_.check_conf())
-	{
-		can_devices_mapping_ = conf_file_.get_devices_name();
-
-		if(can_devices_mapping_.empty())
-		{
-			AFB_ERROR("No mapping found in config file: '%s'. Check it that it have a CANbus-mapping section.",
-				conf_file_.filepath().c_str());
-		}
-	}
-}
-
-
 /// @brief Return the CAN device index from the map
 /// map are sorted so index depend upon alphabetical sorting.
 int can_bus_t::get_can_device_index(const std::string& bus_name) const