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
/
message-definition.cpp
diff --git
a/low-can-binding/can/message-definition.cpp
b/low-can-binding/can/message-definition.cpp
index
407ad75
..
8184e98
100644
(file)
--- a/
low-can-binding/can/message-definition.cpp
+++ b/
low-can-binding/can/message-definition.cpp
@@
-25,7
+25,7
@@
message_definition_t::message_definition_t(
uint32_t flags,
frequency_clock_t frequency_clock,
bool force_send_changed,
uint32_t flags,
frequency_clock_t frequency_clock,
bool force_send_changed,
- const
std::vector<std::shared_ptr<signal_t> >
& signals)
+ const
vect_ptr_signal_t
& signals)
: parent_{nullptr},
bus_{bus},
id_{id},
: parent_{nullptr},
bus_{bus},
id_{id},
@@
-43,7
+43,7
@@
message_definition_t::message_definition_t(const std::string bus,
uint32_t flags,
frequency_clock_t frequency_clock,
bool force_send_changed,
uint32_t flags,
frequency_clock_t frequency_clock,
bool force_send_changed,
- const
std::vector<std::shared_ptr<signal_t> >
& signals)
+ const
vect_ptr_signal_t
& signals)
: parent_{nullptr},
bus_{bus},
id_{id},
: parent_{nullptr},
bus_{bus},
id_{id},
@@
-62,22
+62,32
@@
const std::string message_definition_t::get_bus_device_name() const
.get_can_device_name(bus_);
}
.get_can_device_name(bus_);
}
+const std::string message_definition_t::get_name() const{
+ return name_;
+}
+
uint32_t message_definition_t::get_id() const
{
uint32_t message_definition_t::get_id() const
{
- return id_;
+ return is_j1939() || ((id_ & CAN_SFF_MASK) == id_) ?
+ id_ : id_ | CAN_EFF_FLAG ;
}
bool message_definition_t::is_fd() const
{
}
bool message_definition_t::is_fd() const
{
- return (flags_
&
FD_FRAME);
+ return (flags_
& CAN_PROTOCOL_WITH_
FD_FRAME);
}
bool message_definition_t::is_j1939() const
{
}
bool message_definition_t::is_j1939() const
{
- return (flags_&J1939_PROTOCOL);
+ return (flags_ & J1939_PROTOCOL);
+}
+
+bool message_definition_t::is_isotp() const
+{
+ return (flags_ & ISOTP_PROTOCOL);
}
}
-
std::vector<std::shared_ptr<signal_t>>
& message_definition_t::get_signals()
+
vect_ptr_signal_t
& message_definition_t::get_signals()
{
return signals_;
}
{
return signals_;
}
@@
-100,4
+110,8
@@
uint32_t message_definition_t::get_length() const
uint32_t message_definition_t::get_flags() const
{
return flags_;
uint32_t message_definition_t::get_flags() const
{
return flags_;
-}
\ No newline at end of file
+}
+
+bool message_definition_t::frame_layout_is_bigendian() const{
+ return (flags_ & FRAME_LAYOUT_IS_BIGENDIAN);
+}