X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fcan%2Fcan-encoder.cpp;h=1a5dcdc9001d8ae016714e4bee2f41b9450d609c;hb=8a4792aa20a7b8fa9efc0fce558ac341ee46486f;hp=627cec3e0020c5a1fecb3d8a1d00ebe5ec6734d4;hpb=5912e67b3fe1366089102d1860c9f8ae01f8aec4;p=apps%2Fagl-service-can-low-level.git

diff --git a/low-can-binding/can/can-encoder.cpp b/low-can-binding/can/can-encoder.cpp
index 627cec3e..1a5dcdc9 100644
--- a/low-can-binding/can/can-encoder.cpp
+++ b/low-can-binding/can/can-encoder.cpp
@@ -47,7 +47,7 @@ void encoder_t::encode_data(std::shared_ptr<signal_t> sig, std::vector<uint8_t>
 	uint8_t len_signal_bytes = 0;
 	if(len_signal_bytes_tmp > 255)
 	{
-		AFB_ERROR("Error signal %s too long",sig->get_name().c_str());
+		AFB_ERROR("Error signal %s too long", sig->get_name().c_str());
 	}
 	else
 	{
@@ -56,13 +56,13 @@ void encoder_t::encode_data(std::shared_ptr<signal_t> sig, std::vector<uint8_t>
 /*
 	if(new_start_bit > 255)
 	{
-		AFB_ERROR("Error signal %s too long",sig->get_name().c_str());
+		AFB_ERROR("Error signal %s too long", sig->get_name().c_str());
 	}
 */
 	uint8_t new_bit_size = 0;
 	if(bit_size > 255)
 	{
-		AFB_ERROR("Error signal %s to long bit size",sig->get_name().c_str());
+		AFB_ERROR("Error signal %s to long bit size", sig->get_name().c_str());
 	}
 	else
 	{
@@ -148,7 +148,7 @@ message_t* encoder_t::build_frame(const std::shared_ptr<signal_t>& signal, uint6
 
 	for(const auto& sig: signal->get_message()->get_signals())
 	{
-		encode_data(sig,data,false,factor,offset);
+		encode_data(sig, data, false, factor, offset);
 	}
 	message->set_data(data);
 	return message;
@@ -177,7 +177,7 @@ message_t* encoder_t::build_message(const std::shared_ptr<signal_t>& signal, uin
 									 data,
 									 0);
 
-		return build_frame(signal,value,message, factor, offset);
+		return build_frame(signal, value, message, factor, offset);
 	}
 #ifdef USE_FEATURE_J1939
 	else if(signal->get_message()->is_j1939())
@@ -188,7 +188,7 @@ message_t* encoder_t::build_message(const std::shared_ptr<signal_t>& signal, uin
 									   J1939_NO_NAME,
 									   signal->get_message()->get_id(),
 									   J1939_NO_ADDR);
-		return build_frame(signal,value,message, factor, offset);
+		return build_frame(signal, value, message, factor, offset);
 	}
 #endif
 	else
@@ -200,7 +200,7 @@ message_t* encoder_t::build_message(const std::shared_ptr<signal_t>& signal, uin
 									signal->get_message()->get_flags(),
 									data,
 									0);
-		return build_frame(signal,value,message, factor, offset);
+		return build_frame(signal, value, message, factor, offset);
 	}
 }
 
@@ -299,20 +299,37 @@ message_t* encoder_t::build_message(const std::shared_ptr<signal_t>& signal, uin
 	std::vector<uint8_t> data;
 	if(signal->get_message()->is_fd())
 	{
-		message = new can_message_t(CANFD_MAX_DLEN,signal->get_message()->get_id(),CANFD_MAX_DLEN,signal->get_message()->get_format(),false,0,data,0);
-		return build_one_frame_message(signal,value,message);
+		message = new can_message_t(CANFD_MAX_DLEN,
+					    signal->get_message()->get_id(),
+					    CANFD_MAX_DLEN,
+					    false,
+					    signal->get_message()->get_flags(),
+					    data,
+					    0);
+		return build_one_frame_message(signal, value, message);
 	}
 #ifdef USE_FEATURE_J1939
 	else if(signal->get_message()->is_j1939())
 	{
-		message = new j1939_message_t(J1939_MAX_DLEN,signal->get_message()->get_length(),signal->get_message()->get_format(),data,0,J1939_NO_NAME,signal->get_message()->get_id(),J1939_NO_ADDR);
-		return build_multi_frame_message(signal,value,message);
+		message = new j1939_message_t(signal->get_message()->get_length(),
+					      data,
+					      0,
+					      J1939_NO_NAME,
+					      signal->get_message()->get_id(),
+					      J1939_NO_ADDR);
+		return build_multi_frame_message(signal, value, message);
 	}
 #endif
 	else
 	{
-		message = new can_message_t(CAN_MAX_DLEN,signal->get_message()->get_id(),CAN_MAX_DLEN,signal->get_message()->get_format(),false,0,data,0);
-		return build_one_frame_message(signal,value,message);
+		message = new can_message_t(CAN_MAX_DLEN,
+					    signal->get_message()->get_id(),
+					    CAN_MAX_DLEN,
+					    false,
+					    signal->get_message()->get_flags(),
+					    data,
+					    0);
+		return build_one_frame_message(signal, value, message);
 	}
 }