X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fcan%2Fcan-bus.cpp;h=40e080f8b4388194e1cbae1bfdf6a8501966a8f4;hb=refs%2Fchanges%2F72%2F23472%2F2;hp=cbe3cda7be9ef43efa8f688412c2a3eadc25e64f;hpb=04b7efcdd1a8dfdf461c78d083aabee5445e54bd;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 cbe3cda7..40e080f8 100644
--- a/low-can-binding/can/can-bus.cpp
+++ b/low-can-binding/can/can-bus.cpp
@@ -110,17 +110,39 @@ void can_bus_t::process_signals(std::shared_ptr<message_t> message, map_subscrip
 	{
 		bool send = true;
 		// First we have to found which signal_t it is
-		std::shared_ptr<low_can_subscription_t> sig = s[subscription_id];
+		std::shared_ptr<low_can_subscription_t> subscription = s[subscription_id];
+		openxc_SimpleMessage s_message;
 
-		decoded_message = decoder_t::translate_signal(*sig->get_signal(), message, &send);
-		openxc_SimpleMessage s_message = build_SimpleMessage(sig->get_name(), decoded_message);
+		// messages
+		if(subscription->get_message_definition() != nullptr)
+		{
+			openxc_DynamicField dynamicField_tmp;
+			json_object *signal_json_tmp;
+			decoded_message = build_DynamicField_json(json_object_new_array());
+			for(std::shared_ptr<signal_t> sig : subscription->get_message_definition()->get_signals())
+			{
+				signal_json_tmp = json_object_new_object();
+				dynamicField_tmp = decoder_t::translate_signal(*sig, message, &send);
+				json_object_object_add(signal_json_tmp,"name", json_object_new_string(sig->get_name().c_str()));
+				jsonify_DynamicField(dynamicField_tmp,signal_json_tmp);
+				if(sig != nullptr && sig->get_unit() != "")
+					json_object_object_add(signal_json_tmp, "unit", json_object_new_string(sig->get_unit().c_str()));
+				json_object_array_add(decoded_message.json_value,signal_json_tmp);
+			}
+		}
+		else // signal
+		{
+			decoded_message = decoder_t::translate_signal(*subscription->get_signal(), message, &send);
+		}
+
+		s_message = build_SimpleMessage(subscription->get_name(), decoded_message);
 		vehicle_message = build_VehicleMessage(s_message, message->get_timestamp());
 
-		if(send && apply_filter(vehicle_message, sig))
+		if(send && apply_filter(vehicle_message, subscription))
 		{
 			std::lock_guard<std::mutex> decoded_can_message_lock(decoded_can_message_mutex_);
 			push_new_vehicle_message(subscription_id, vehicle_message);
-			AFB_DEBUG("%s CAN signals processed.", sig->get_name().c_str());
+			AFB_DEBUG("%s CAN signals processed.", subscription->get_name().c_str());
 		}
 	}
 }
@@ -181,9 +203,7 @@ 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);
 			}
@@ -215,7 +235,7 @@ void can_bus_t::can_event_push()
 				if(s.find(v_message.first) != s.end() && afb_event_is_valid(s[v_message.first]->get_event()))
 				{
 					jo = json_object_new_object();
-					jsonify_vehicle(v_message.second, jo);
+					jsonify_vehicle(v_message.second, s[v_message.first]->get_signal(), jo);
 					if(afb_event_push(s[v_message.first]->get_event(), jo) == 0)
 					{
 						if(v_message.second.has_diagnostic_response)