X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fcan%2Fcan-decoder.cpp;h=566266913beb91b6dba71ca1f290ec120b821fc0;hb=refs%2Fchanges%2F94%2F23194%2F6;hp=7d6ae2a117ddc6947073f4f8b351551b9b060836;hpb=96232f8f7cf8b93f1a3ef3ed9a4816c575cefe87;p=apps%2Fagl-service-can-low-level.git

diff --git a/low-can-binding/can/can-decoder.cpp b/low-can-binding/can/can-decoder.cpp
index 7d6ae2a1..56626691 100644
--- a/low-can-binding/can/can-decoder.cpp
+++ b/low-can-binding/can/can-decoder.cpp
@@ -36,56 +36,122 @@ float decoder_t::parse_signal_bitfield(signal_t& signal, std::shared_ptr<message
 {
 	const std::vector<uint8_t> data = message->get_data_vector();
 	std::vector<uint8_t> data_signal;
-	uint32_t bit_size = signal.get_bit_size();
+	uint8_t bit_size = (uint8_t) signal.get_bit_size();
 	uint32_t bit_position = signal.get_bit_position();
 
 	int new_start_byte = 0;
 	int new_end_byte = 0;
-	int new_start_bit = 0;
-	int new_end_bit = 0;
+	uint8_t new_start_bit = 0;
+	uint8_t new_end_bit = 0;
 
 	converter_t::signal_to_bits_bytes(bit_position, bit_size, new_start_byte, new_end_byte, new_start_bit, new_end_bit);
 
 	for(int i=new_start_byte;i<=new_end_byte;i++)
-	{
 		data_signal.push_back(data[i]);
-	}
 
-	uint8_t new_bit_size = 0;
+//	if(bit_size > 255)
+//		AFB_ERROR("Error signal %s to long bit size",signal.get_name().c_str());
+
+//	if(new_start_bit > 255)
+//		AFB_ERROR("Too long signal offset %d", new_start_bit);
+
+	if(data_signal.size() > 65535)
+		AFB_ERROR("Too long data signal %s",signal.get_name().c_str());
+
+	return bitfield_parse_float(data_signal.data(), (uint16_t) data_signal.size(),
+			new_start_bit, bit_size, signal.get_factor(),
+			signal.get_offset());
+}
+
+
+/// @brief Decode and return string bytes (hex) for a CAN signal's.
+///
+/// This is an implementation of the Signal type signature, and can be
+/// used directly in the signal_t.decoder field.
+///
+/// @param[in] signal  - The details of the signal.
+/// @param[in] message - The message with data to decode.
+/// @param[out] send - An output argument that will be set to false if the value should
+///     not be sent for any reason.
+///
+/// @return Returns a DynamicField with a string value of bytes (hex)
+///
+openxc_DynamicField decoder_t::decode_bytes(signal_t& signal, std::shared_ptr<message_t> message, bool* send)
+{
+	int i=0;
+	openxc_DynamicField decoded_value;
+	std::vector<uint8_t> data = message->get_data_vector();
+	uint32_t length = message->get_length();
+	uint32_t bit_position = signal.get_bit_position();
+	uint32_t bit_size = signal.get_bit_size();
+	std::vector<uint8_t> new_data = std::vector<uint8_t>();
+	new_data.reserve(bit_size << 3);
+
+	int new_start_byte = 0;
+	int new_end_byte = 0;
+	uint8_t new_start_bit = 0;
+	uint8_t new_end_bit = 0;
+
+	converter_t::signal_to_bits_bytes(bit_position, bit_size, new_start_byte, new_end_byte, new_start_bit, new_end_bit);
+
+	if(new_end_byte >= length)
+	{
+		new_end_byte = length-1;
+	}
 
-	if(bit_size > 255)
+	if(new_start_byte >= length)
 	{
-		AFB_ERROR("Error signal %s to long bit size",signal.get_name().c_str());
+		AFB_ERROR("Error in description of signals");
+		return decoded_value;
 	}
-	else
+
+	uint8_t first = data[new_start_byte];
+	int mask_first = 0;
+	for(i=new_start_bit;i<8;i++)
 	{
-		new_bit_size = (uint8_t) bit_size;
+		mask_first = mask_first | (1 << i);
 	}
 
-	uint8_t bit_offset = 0;
-	if(new_start_bit > 255)
+	uint8_t mask_first_v = 0;
+	if(mask_first > 255)
 	{
-		AFB_ERROR("Too long signal offset %d", new_start_bit);
+		AFB_ERROR("Error mask decode bytes");
 	}
 	else
 	{
-		bit_offset = (uint8_t) new_start_bit;
+		mask_first_v = (uint8_t)mask_first;
 	}
 
-	uint16_t length = 0;
+	data[new_start_byte]=first&mask_first_v;
 
-	if(data_signal.size() > 65535)
+	uint8_t last = data[new_end_byte];
+	int mask_last = 0;
+	for(i=0;i<=new_end_bit;i++)
 	{
-		AFB_ERROR("Too long data signal %s",signal.get_name().c_str());
+		mask_last = mask_last | (1 << (7-i));
+	}
+
+	uint8_t mask_last_v = 0;
+	if(mask_last > 255)
+	{
+		AFB_ERROR("Error mask decode bytes");
 	}
 	else
 	{
-		length = (uint16_t) data_signal.size();
+		mask_last_v = (uint8_t)mask_last;
 	}
 
-	return bitfield_parse_float(data_signal.data(), length,
-			bit_offset, new_bit_size, signal.get_factor(),
-			signal.get_offset());
+	data[new_end_byte]=last&mask_last_v;
+
+
+	for(i=new_start_byte;i<=new_end_byte;i++)
+	{
+		new_data.push_back(data[i]);
+	}
+
+	decoded_value = build_DynamicField(new_data);
+
+	return decoded_value;
 }
 
 /// @brief Wraps a raw CAN signal value in a DynamicField without modification.