X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fcan_decode_message.cpp;h=8b087cfc029596c0587f3b2ba0ff563cc6d9a823;hb=b0975e4bfa534153657a7ee8acaee0f950056e97;hp=46b2977f43a4f2038818b7e564996c9de913a52a;hpb=dae58e000ef198f7fa09718c60d7a7f2250fc2ce;p=apps%2Fagl-service-can-low-level.git

diff --git a/src/can_decode_message.cpp b/src/can_decode_message.cpp
index 46b2977f..8b087cfc 100644
--- a/src/can_decode_message.cpp
+++ b/src/can_decode_message.cpp
@@ -20,38 +20,38 @@
 
 void can_decode_message(can_bus_t &can_bus)
 {
-	can_message_t can_message(interface) ;
+	can_message_t can_message(can_bus.interface_) ;
 	std::vector <CanSignal> signals;
 	std::vector <CanSignal>::iterator signals_i;
 	openxc_VehicleMessage vehicle_message;
 	openxc_DynamicField search_key, ret;
 	bool send = true;
 
-	decoder_t decoder();
+	decoder_t decoder;
 
-	while(true)
+	while(can_bus.has_can_message())
 	{
-		if(can_message = can_bus.next_can_message(interface))
-		{
-			/* First we have to found which CanSignal is */
-			search_key = build_DynamicField((double)can_message.get_id())
-			signals = find_can_signals(search_key);
+		can_message = can_bus.next_can_message();
+
+		/* First we have to found which CanSignal is */
+		search_key = build_DynamicField((double)can_message.get_id());
+		signals = find_can_signals(can_bus.interface_, search_key);
+		
+		/* Decoding the message ! Don't kill the messenger ! */
+		for(const auto& sig : signals)
+		{	
+			std::map<std::string, struct afb_event> subscribed_signals = get_subscribed_signals();
+			const auto& it_event = subscribed_signals.find(sig.genericName);
 			
-			/* Decoding the message ! Don't kill the messenger ! */
-			for(const auto& sig : signals)
-			{	
-				subscribed_signals_i = subscribed_signals.find(sig.genericName);
-				
-				if(subscribed_signals_i != subscribed_signals.end() &&
-					afb_event_is_valid(subscribed_signals_i->second))
-				{
-					ret = decoder.decodeSignal(sig, can_message, getSignals(), &send);
+			if(it_event != subscribed_signals.end() &&
+				afb_event_is_valid(it_event->second))
+			{
+				ret = decoder.decodeSignal(sig, can_message, getSignals(), &send);
+
+				openxc_SimpleMessage s_message = build_SimpleMessage(sig.genericName, ret);
 
-					s_message = build_SimpleMessage(sig.genericName, ret);
-						
-					vehicle_message = build_VehicleMessage_with_SimpleMessage(openxc_DynamicField_Type::openxc_DynamicField_Type_NUM, s_message);
-					vehicle_message_q.push(vehicle_message);
-				}
+				vehicle_message = build_VehicleMessage_with_SimpleMessage(openxc_DynamicField_Type::openxc_DynamicField_Type_NUM, s_message);
+				can_bus.push_new_vehicle_message(vehicle_message);
 			}
 		}
 	}