Code Review
/
apps
/
agl-service-can-low-level.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
decoder: Add new decoders: ascii, date, time
[apps/agl-service-can-low-level.git]
/
low-can-binding
/
can
/
signals.cpp
diff --git
a/low-can-binding/can/signals.cpp
b/low-can-binding/can/signals.cpp
old mode 100644
(file)
new mode 100755
(executable)
index
e843bed
..
da8df98
--- 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 "../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"
#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,
signal_t::signal_t(
std::string generic_name,
- uint
8
_t bit_position,
- uint
8
_t bit_size,
+ uint
32
_t bit_position,
+ uint
32
_t bit_size,
float factor,
float offset,
float min_value,
float factor,
float offset,
float min_value,
@@
-45,9
+44,10
@@
signal_t::signal_t(
signal_decoder decoder,
signal_encoder encoder,
bool received,
signal_decoder decoder,
signal_encoder encoder,
bool received,
- std::pair<bool,int> multiplex,
+ std::pair<bool,
int> multiplex,
bool is_big_endian,
bool is_big_endian,
- bool is_signed,
+ sign_t sign,
+ int32_t bit_sign_position,
std::string unit)
: parent_{nullptr},
generic_name_{ generic_name }
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}
, 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,
, unit_{unit}
{}
signal_t::signal_t(
std::string generic_name,
- uint
8
_t bit_position,
- uint
8
_t bit_size,
+ uint
32
_t bit_position,
+ uint
32
_t bit_size,
float factor,
float offset,
float min_value,
float factor,
float offset,
float min_value,
@@
-120,12
+121,12
@@
const std::string signal_t::get_name() const
return prefix_ + "." + generic_name_;
}
return prefix_ + "." + generic_name_;
}
-uint
8
_t signal_t::get_bit_position() const
+uint
32
_t signal_t::get_bit_position() const
{
return bit_position_;
}
{
return bit_position_;
}
-uint
8
_t signal_t::get_bit_size() const
+uint
32
_t signal_t::get_bit_size() const
{
return bit_size_;
}
{
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_)
{
uint64_t ret = -1;
for( const auto& state: states_)
{
- if(
state.second == value
)
+ if(
caseInsCompare(state.second, value)
)
{
ret = (uint64_t)state.first;
break;
{
ret = (uint64_t)state.first;
break;
@@
-221,6
+222,11
@@
void signal_t::set_timestamp(uint64_t timestamp)
frequency_.tick(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_;
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_;
}
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
}
const std::string signal_t::get_unit() const