aboutsummaryrefslogtreecommitdiffstats
path: root/low-can-binding
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2019-12-04 11:39:33 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2020-01-09 16:25:36 +0100
commit400c1a26178870a1cc94cbcab44efa949e76e955 (patch)
tree1e0571ba449100da586155f37d8fd372b17a81b9 /low-can-binding
parent24bb25c9f16ecace05b64142493dce596f5a9e37 (diff)
msg_definition: integrate frame layout as a flag
Integrate frame layout as a flag instead of a separate boolean Change-Id: I0fe32fd8a80238006ef89152af25001ecdf018c9 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'low-can-binding')
-rw-r--r--low-can-binding/can/message-definition.cpp6
-rw-r--r--low-can-binding/can/message-definition.hpp4
-rw-r--r--low-can-binding/can/message/message.hpp1
3 files changed, 2 insertions, 9 deletions
diff --git a/low-can-binding/can/message-definition.cpp b/low-can-binding/can/message-definition.cpp
index 5977fb49..5935f726 100644
--- 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,
- bool frame_layout_is_little,
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},
- frame_layout_is_little_{frame_layout_is_little},
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,
- bool frame_layout_is_little,
frequency_clock_t frequency_clock,
bool force_send_changed,
const vect_ptr_signal_t& signals)
@@ -53,7 +50,6 @@ message_definition_t::message_definition_t(const std::string bus,
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},
@@ -116,5 +112,5 @@ uint32_t message_definition_t::get_flags() const
}
bool message_definition_t::frame_layout_is_little() const{
- return frame_layout_is_little_;
+ return (flags_ & FRAME_LAYOUT_IS_LE);
}
diff --git a/low-can-binding/can/message-definition.hpp b/low-can-binding/can/message-definition.hpp
index ab6b4be8..b0866d39 100644
--- a/low-can-binding/can/message-definition.hpp
+++ b/low-can-binding/can/message-definition.hpp
@@ -46,8 +46,6 @@ private:
std::string name_; ///< name_ - J1939 PGN name
uint32_t length_; ///< length_ - Message data length in bytes. For J1939 message, this is the expected data size
uint32_t flags_; ///< format_ - the format of the message's ID.*/
- bool frame_layout_is_little_; ///<frame_layout_is_little_ Defines if the can frame layout is little endian or big endian.
- /// Default is true;
frequency_clock_t frequency_clock_; ///< clock_ - an optional frequency clock to control the output of this
/// message, if sent raw, or simply to mark the max frequency for custom
/// handlers to retrieve.*/
@@ -66,7 +64,6 @@ public:
message_definition_t(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);
@@ -75,7 +72,6 @@ public:
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);
diff --git a/low-can-binding/can/message/message.hpp b/low-can-binding/can/message/message.hpp
index af34615a..9a074e31 100644
--- a/low-can-binding/can/message/message.hpp
+++ b/low-can-binding/can/message/message.hpp
@@ -44,6 +44,7 @@
#define ISOTP_SEND 0x0020
#define ISOTP_RECEIVE 0x0040
#define CAN_PROTOCOL_WITH_FD_FRAME 0x0080
+#define FRAME_LAYOUT_IS_LE 0x0100
/// @class message_t
///