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
Implement a new socket type CAN for j1939 protocol
[apps/agl-service-can-low-level.git]
/
low-can-binding
/
can
/
can-signals.cpp
diff --git
a/low-can-binding/can/can-signals.cpp
b/low-can-binding/can/can-signals.cpp
index
fe74115
..
14881e8
100644
(file)
--- a/
low-can-binding/can/can-signals.cpp
+++ b/
low-can-binding/can/can-signals.cpp
@@
-42,8
+42,8
@@
can_signal_t::can_signal_t(
bool force_send_changed,
std::map<uint8_t, std::string> states,
bool writable,
bool force_send_changed,
std::map<uint8_t, std::string> states,
bool writable,
-
SignalD
ecoder decoder,
-
SignalE
ncoder encoder,
+
signal_d
ecoder decoder,
+
signal_e
ncoder encoder,
bool received)
: parent_{nullptr},
generic_name_{ generic_name }
bool received)
: parent_{nullptr},
generic_name_{ generic_name }
@@
-79,11
+79,6
@@
const std::string can_signal_t::get_name() const
return prefix_ + "." + generic_name_;
}
return prefix_ + "." + generic_name_;
}
-const std::string can_signal_t::get_prefix() const
-{
- return prefix_;
-}
-
uint8_t can_signal_t::get_bit_position() const
{
return bit_position_;
uint8_t can_signal_t::get_bit_position() const
{
return bit_position_;
@@
-104,16
+99,6
@@
float can_signal_t::get_offset() const
return offset_;
}
return offset_;
}
-float can_signal_t::get_min_value() const
-{
- return min_value_;
-}
-
-float can_signal_t::get_max_value() const
-{
- return max_value_;
-}
-
frequency_clock_t& can_signal_t::get_frequency()
{
return frequency_;
frequency_clock_t& can_signal_t::get_frequency()
{
return frequency_;
@@
-124,26
+109,25
@@
bool can_signal_t::get_send_same() const
return send_same_;
}
return send_same_;
}
-bool can_signal_t::get_force_send_changed() const
-{
- return force_send_changed_;
-}
-
-const std::map<uint8_t, std::string>& can_signal_t::get_states() const
-{
- return states_;
-}
-
const std::string can_signal_t::get_states(uint8_t value)
{
const std::string can_signal_t::get_states(uint8_t value)
{
- if (
value < states_.size()
)
+ if (
states_.count(value) > 0
)
return states_[value];
return std::string();
}
return states_[value];
return std::string();
}
-
size_t can_signal_t::get_state_count(
) const
+
uint64_t can_signal_t::get_states(const std::string& value
) const
{
{
- return states_.size();
+ uint64_t ret = -1;
+ for( const auto& state: states_)
+ {
+ if(state.second == value)
+ {
+ ret = (uint64_t)state.first;
+ break;
+ }
+ }
+ return ret;
}
bool can_signal_t::get_writable() const
}
bool can_signal_t::get_writable() const
@@
-151,12
+135,12
@@
bool can_signal_t::get_writable() const
return writable_;
}
return writable_;
}
-
SignalD
ecoder& can_signal_t::get_decoder()
+
signal_d
ecoder& can_signal_t::get_decoder()
{
return decoder_;
}
{
return decoder_;
}
-
SignalE
ncoder& can_signal_t::get_encoder()
+
signal_e
ncoder& can_signal_t::get_encoder()
{
return encoder_;
}
{
return encoder_;
}
@@
-181,11
+165,6
@@
void can_signal_t::set_parent(can_message_definition_t* parent)
parent_ = parent;
}
parent_ = parent;
}
-void can_signal_t::set_prefix(std::string val)
-{
- prefix_ = val;
-}
-
void can_signal_t::set_received(bool r)
{
received_ = r;
void can_signal_t::set_received(bool r)
{
received_ = r;