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
Restore /etc/dev-mapping.conf support
[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
6354127
..
051c2d3
100644
(file)
--- a/
low-can-binding/can/message-definition.cpp
+++ b/
low-can-binding/can/message-definition.cpp
@@
-23,7
+23,6
@@
message_definition_t::message_definition_t(
const std::string bus,
uint32_t id,
uint32_t flags,
const std::string bus,
uint32_t id,
uint32_t flags,
- bool frame_layout_is_little,
frequency_clock_t frequency_clock,
bool force_send_changed,
const vect_ptr_signal_t& signals)
frequency_clock_t frequency_clock,
bool force_send_changed,
const vect_ptr_signal_t& signals)
@@
-31,7
+30,6
@@
message_definition_t::message_definition_t(
bus_{bus},
id_{id},
flags_{flags},
bus_{bus},
id_{id},
flags_{flags},
- frame_layout_is_little_{frame_layout_is_little},
frequency_clock_{frequency_clock},
force_send_changed_{force_send_changed},
last_value_{CAN_MESSAGE_SIZE},
frequency_clock_{frequency_clock},
force_send_changed_{force_send_changed},
last_value_{CAN_MESSAGE_SIZE},
@@
-43,7
+41,6
@@
message_definition_t::message_definition_t(const std::string bus,
const std::string name,
uint32_t length,
uint32_t flags,
const std::string name,
uint32_t length,
uint32_t flags,
- bool frame_layout_is_little,
frequency_clock_t frequency_clock,
bool force_send_changed,
const vect_ptr_signal_t& signals)
frequency_clock_t frequency_clock,
bool force_send_changed,
const vect_ptr_signal_t& signals)
@@
-53,13
+50,16
@@
message_definition_t::message_definition_t(const std::string bus,
name_{name},
length_{length},
flags_{flags},
name_{name},
length_{length},
flags_{flags},
- frame_layout_is_little_{frame_layout_is_little},
frequency_clock_{frequency_clock},
force_send_changed_{force_send_changed},
last_value_{CAN_MESSAGE_SIZE},
signals_{signals}
{}
frequency_clock_{frequency_clock},
force_send_changed_{force_send_changed},
last_value_{CAN_MESSAGE_SIZE},
signals_{signals}
{}
+const std::string message_definition_t::get_bus_name() const{
+ return bus_;
+}
+
const std::string message_definition_t::get_bus_device_name() const
{
return application_t::instance().get_can_bus_manager()
const std::string message_definition_t::get_bus_device_name() const
{
return application_t::instance().get_can_bus_manager()
@@
-72,9
+72,8
@@
const std::string message_definition_t::get_name() const{
uint32_t message_definition_t::get_id() const
{
uint32_t message_definition_t::get_id() const
{
- return id_ & CAN_EFF_MASK ?
- id_ | CAN_EFF_FLAG :
- 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
@@
-89,7
+88,7
@@
bool message_definition_t::is_j1939() const
bool message_definition_t::is_isotp() const
{
bool message_definition_t::is_isotp() const
{
- return (flags_
&
ISOTP_PROTOCOL);
+ return (flags_
&
ISOTP_PROTOCOL);
}
vect_ptr_signal_t& message_definition_t::get_signals()
}
vect_ptr_signal_t& message_definition_t::get_signals()
@@
-117,6
+116,6
@@
uint32_t message_definition_t::get_flags() const
return flags_;
}
return flags_;
}
-bool message_definition_t::frame_layout_is_
little
() const{
- return
frame_layout_is_little_
;
+bool message_definition_t::frame_layout_is_
bigendian
() const{
+ return
(flags_ & BYTE_FRAME_IS_BIG_ENDIAN)
;
}
}