diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2019-11-26 16:19:35 +0100 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2019-11-28 16:11:47 +0100 |
| commit | fee3b49099fb39731e15f9e26ad5a873bc109f59 (patch) | |
| tree | f925b8b2a744d9e94cedbd460e47ba533717c36c /low-can-binding/can/message/j1939-message.cpp | |
| parent | a8d5f5d3018da0b051dad4c143c6257b2fba9fac (diff) | |
Replace all enum types with masks
This commit allows to change all enum types by masks.
Now to implement new protocol you don't need to add
more attribute in class. All can be contained in
the flags field.
Bug-AGL : SPEC-2779
Bug-AGL: SPEC-2976
Change-Id: I814d0052139be5d5efefc9ff1b4b558f46b85e90
Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh>
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'low-can-binding/can/message/j1939-message.cpp')
| -rw-r--r-- | low-can-binding/can/message/j1939-message.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/low-can-binding/can/message/j1939-message.cpp b/low-can-binding/can/message/j1939-message.cpp index 2d600a1e..ec65cba4 100644 --- a/low-can-binding/can/message/j1939-message.cpp +++ b/low-can-binding/can/message/j1939-message.cpp @@ -45,13 +45,12 @@ j1939_message_t::j1939_message_t(): * @param addr The address of the message */ j1939_message_t::j1939_message_t(uint32_t length, - message_format_t format, std::vector<uint8_t>& data, uint64_t timestamp, name_t name, pgn_t pgn, uint8_t addr): - message_t(J1939_MAX_DLEN,length, format, data, timestamp, 0), + message_t(J1939_MAX_DLEN, length, J1939_PROTOCOL, data, timestamp), name_{name}, pgn_{pgn}, addr_{addr} @@ -99,18 +98,13 @@ std::shared_ptr<j1939_message_t> j1939_message_t::convert_from_addr(struct socka { int i; uint32_t length = 0; - message_format_t format; + uint32_t flags; std::vector<uint8_t> data_vector; if(nbytes > J1939_MAX_DLEN) { AFB_DEBUG("Unsupported j1939 frame"); - format = message_format_t::INVALID; - } - else - { - //AFB_DEBUG("Got a j1939 frame"); - format = message_format_t::J1939; + return std::make_shared<j1939_message_t>(j1939_message_t()); } length = (uint32_t) nbytes; @@ -126,10 +120,10 @@ std::shared_ptr<j1939_message_t> j1939_message_t::convert_from_addr(struct socka data_vector.push_back(data[i]); }; - AFB_DEBUG("Found pgn: %X, format: %X, length: %X, data %s", - addr.can_addr.j1939.pgn, (uint8_t)format, length, data_string.c_str()); + AFB_DEBUG("Found pgn: %X, length: %X, data %s", + addr.can_addr.j1939.pgn, length, data_string.c_str()); - return std::make_shared<j1939_message_t>(j1939_message_t(J1939_MAX_DLEN,length, format, data_vector, timestamp,addr.can_addr.j1939.name,addr.can_addr.j1939.pgn,addr.can_addr.j1939.addr)); + return std::make_shared<j1939_message_t>(j1939_message_t(length, data_vector, timestamp,addr.can_addr.j1939.name,addr.can_addr.j1939.pgn,addr.can_addr.j1939.addr)); } /// @brief Test if members pgn_ and length are set. |