From f9b67aecdc07d31def64175e0f58e9c0a113f94c Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Tue, 25 Jun 2019 16:23:02 +0200 Subject: Minor improvements - Remove now unused forward declaration of active_diagnostic_request_t - Factorize calling the signals_manager at binding initialization. - retab... Bug-AGL: SPEC-2386 Change-Id: I418fddd80ef8b856c198dc697760a6edf0918012 Signed-off-by: Stephane Desneux Signed-off-by: Romain Forlot --- low-can-binding/can/message/j1939-message.cpp | 3 +-- low-can-binding/can/message/j1939-message.hpp | 7 +++---- low-can-binding/can/signals.cpp | 1 - low-can-binding/can/signals.hpp | 2 -- 4 files changed, 4 insertions(+), 9 deletions(-) (limited to 'low-can-binding/can') diff --git a/low-can-binding/can/message/j1939-message.cpp b/low-can-binding/can/message/j1939-message.cpp index 147ab735..dad8e7f1 100644 --- a/low-can-binding/can/message/j1939-message.cpp +++ b/low-can-binding/can/message/j1939-message.cpp @@ -15,10 +15,9 @@ * limitations under the License. */ -#include "./j1939-message.hpp" #include #include "../../binding/low-can-hat.hpp" - +#include "j1939-message.hpp" /// /// @brief Class constructor diff --git a/low-can-binding/can/message/j1939-message.hpp b/low-can-binding/can/message/j1939-message.hpp index b0f0b090..482f167d 100644 --- a/low-can-binding/can/message/j1939-message.hpp +++ b/low-can-binding/can/message/j1939-message.hpp @@ -16,9 +16,10 @@ */ #pragma once -#include + #include -#include "./message.hpp" +#include "message.hpp" +#include "../../utils/socketcan-j1939.hpp" #define J1939_MAX_MULTIPACKETS 255 #define J1939_MAX_DLEN J1939_MAX_MULTIPACKETS * CAN_MAX_DLEN @@ -69,5 +70,3 @@ class j1939_message_t : public message_t struct bcm_msg get_bcm_msg(); void set_bcm_msg(struct bcm_msg bcm_msg); }; - - diff --git a/low-can-binding/can/signals.cpp b/low-can-binding/can/signals.cpp index e843bedb..b47001bd 100644 --- a/low-can-binding/can/signals.cpp +++ b/low-can-binding/can/signals.cpp @@ -22,7 +22,6 @@ #include "../binding/application.hpp" #include "../utils/signals.hpp" #include "can-decoder.hpp" -#include "message/can-message.hpp" #include "can-bus.hpp" #include "../diagnostic/diagnostic-message.hpp" #include "canutil/write.h" diff --git a/low-can-binding/can/signals.hpp b/low-can-binding/can/signals.hpp index 2507fd2a..cefd8b81 100644 --- a/low-can-binding/can/signals.hpp +++ b/low-can-binding/can/signals.hpp @@ -26,8 +26,6 @@ #include "openxc.pb.h" #include "message-definition.hpp" #include "../utils/timer.hpp" -#include "../utils/socketcan-bcm.hpp" -#include "message/can-message.hpp" #include "../diagnostic/diagnostic-message.hpp" #define MESSAGE_SET_ID 0 -- cgit 1.2.3-korg