X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fcan%2Fsignals.cpp;h=57aefa555b147a536e4ff3b2a36c67aeb2fe45cd;hb=9b17d0359dedbf92de95c1150f7e576d58e0331c;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..57aefa55 --- 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,7 +44,7 @@ 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, std::string unit) @@ -73,8 +73,8 @@ signal_t::signal_t( 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 +119,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 +161,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,7 +220,7 @@ void signal_t::set_timestamp(uint64_t timestamp) frequency_.tick(timestamp); } -std::pair signal_t::get_multiplex() const +std::pair signal_t::get_multiplex() const { return multiplex_; }