From fee3b49099fb39731e15f9e26ad5a873bc109f59 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Tue, 26 Nov 2019 16:19:35 +0100 Subject: 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 Signed-off-by: Romain Forlot --- low-can-binding/utils/socketcan-j1939/socketcan-j1939.cpp | 2 +- low-can-binding/utils/socketcan.hpp | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) (limited to 'low-can-binding/utils') diff --git a/low-can-binding/utils/socketcan-j1939/socketcan-j1939.cpp b/low-can-binding/utils/socketcan-j1939/socketcan-j1939.cpp index bb74c766..fdcfe3be 100644 --- a/low-can-binding/utils/socketcan-j1939/socketcan-j1939.cpp +++ b/low-can-binding/utils/socketcan-j1939/socketcan-j1939.cpp @@ -256,7 +256,7 @@ namespace utils */ int socketcan_j1939_t::write_j1939_message(pgn_t pgn, std::vector &data, uint32_t len_data) { - j1939_message_t msg = j1939_message_t(J1939_MAX_DLEN, len_data, message_format_t::J1939, data, 0, 0, pgn, 0); + j1939_message_t msg = j1939_message_t(len_data, data, 0, 0, pgn, 0); msg.set_sockname(pgn,J1939_NO_NAME,J1939_NO_ADDR); return write_message(msg); } diff --git a/low-can-binding/utils/socketcan.hpp b/low-can-binding/utils/socketcan.hpp index 2a7077eb..6391d011 100644 --- a/low-can-binding/utils/socketcan.hpp +++ b/low-can-binding/utils/socketcan.hpp @@ -28,17 +28,6 @@ #define INVALID_SOCKET -1 -/** - * @enum socket_type - * @brief The type of socket - */ -enum class socket_type { - BCM, ///< BCM - Socket BCM - J1939_ADDR_CLAIM, ///< J1939 - Socket J1939 - J1939, ///< J1939 - Socket J1939 - INVALID -}; - namespace utils { -- cgit 1.2.3-korg