X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fcan%2Fsignals.cpp;h=da8df9880bcd549082459244ebee243a5f56060b;hb=74acfee2361a04f5ea389b31c4defecc30d8fc6b;hp=b47001bd20ef1458708be3229c6dea52761a9751;hpb=f9b67aecdc07d31def64175e0f58e9c0a113f94c;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 b47001bd..da8df988 --- a/low-can-binding/can/signals.cpp +++ b/low-can-binding/can/signals.cpp @@ -30,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, @@ -44,9 +44,10 @@ signal_t::signal_t( signal_decoder decoder, signal_encoder encoder, bool received, - std::pair multiplex, + std::pair 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 } @@ -67,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, @@ -119,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_; } @@ -161,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; @@ -220,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 signal_t::get_multiplex() const { return multiplex_; @@ -230,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