X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fcan%2Fsignals.cpp;h=da8df9880bcd549082459244ebee243a5f56060b;hb=e8c14d2baa8841f13beefaa1fb662a280ea8eb96;hp=e843bedb01d4dccf36511a05a74cbcd67af24cba;hpb=2f60d294b3fa4e243fa67a738f9b82a0b428a7fc;p=apps%2Fagl-service-can-low-level.git

diff --git a/low-can-binding/can/signals.cpp b/low-can-binding/can/signals.cpp
old mode 100644
new mode 100755
index e843bedb..da8df988
--- a/low-can-binding/can/signals.cpp
+++ b/low-can-binding/can/signals.cpp
@@ -22,7 +22,6 @@
 #include "../binding/application.hpp"
 #include "../utils/signals.hpp"
 #include "can-decoder.hpp"
-#include "message/can-message.hpp"
 #include "can-bus.hpp"
 #include "../diagnostic/diagnostic-message.hpp"
 #include "canutil/write.h"
@@ -31,8 +30,8 @@ std::string signal_t::prefix_ = "messages";
 
 signal_t::signal_t(
 	std::string generic_name,
-	uint8_t bit_position,
-	uint8_t bit_size,
+	uint32_t bit_position,
+	uint32_t bit_size,
 	float factor,
 	float offset,
 	float min_value,
@@ -45,9 +44,10 @@ signal_t::signal_t(
 	signal_decoder decoder,
 	signal_encoder encoder,
 	bool received,
-	std::pair<bool,int> multiplex,
+	std::pair<bool, int> multiplex,
 	bool is_big_endian,
-	bool is_signed,
+	sign_t sign,
+	int32_t bit_sign_position,
 	std::string unit)
 	: parent_{nullptr},
 	 generic_name_{ generic_name }
@@ -68,14 +68,15 @@ signal_t::signal_t(
 	, last_value_{.0f}
 	, multiplex_{multiplex}
 	, is_big_endian_{is_big_endian}
-	, is_signed_{is_signed}
+	, sign_{sign}
+	, bit_sign_position_{bit_sign_position}
 	, unit_{unit}
 {}
 
 signal_t::signal_t(
 	std::string generic_name,
-	uint8_t bit_position,
-	uint8_t bit_size,
+	uint32_t bit_position,
+	uint32_t bit_size,
 	float factor,
 	float offset,
 	float min_value,
@@ -120,12 +121,12 @@ const std::string signal_t::get_name() const
 	return prefix_ + "." + generic_name_;
 }
 
-uint8_t signal_t::get_bit_position() const
+uint32_t signal_t::get_bit_position() const
 {
 	return bit_position_;
 }
 
-uint8_t signal_t::get_bit_size() const
+uint32_t signal_t::get_bit_size() const
 {
 	return bit_size_;
 }
@@ -162,7 +163,7 @@ uint64_t signal_t::get_states(const std::string& value) const
 	uint64_t ret = -1;
 	for( const auto& state: states_)
 	{
-		if(state.second == value)
+		if(caseInsCompare(state.second, value))
 		{
 			ret = (uint64_t)state.first;
 			break;
@@ -221,6 +222,11 @@ void signal_t::set_timestamp(uint64_t timestamp)
 	frequency_.tick(timestamp);
 }
 
+void signal_t::set_bit_position(uint32_t bit_position)
+{
+	bit_position_=bit_position;
+}
+
 std::pair<bool,int> signal_t::get_multiplex() const
 {
 	return multiplex_;
@@ -231,9 +237,14 @@ bool signal_t::get_is_big_endian() const
 	return is_big_endian_;
 }
 
-bool signal_t::get_is_signed() const
+sign_t signal_t::get_sign() const
+{
+	return sign_;
+}
+
+int32_t signal_t::get_bit_sign_position() const
 {
-	return is_signed_;
+	return bit_sign_position_;
 }
 
 const std::string signal_t::get_unit() const