summaryrefslogtreecommitdiffstats
path: root/low-can-binding/can
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2019-06-25 16:23:02 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2019-06-27 09:33:12 +0200
commitf9b67aecdc07d31def64175e0f58e9c0a113f94c (patch)
tree74a0baa6ca5d12a60f2c87893ccc086fe44fa0ce /low-can-binding/can
parentb8261a3b218de8c07173e3a0eaeb09cad10445b3 (diff)
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 <stephane.desneux@iot.bzh> Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'low-can-binding/can')
-rw-r--r--low-can-binding/can/message/j1939-message.cpp3
-rw-r--r--low-can-binding/can/message/j1939-message.hpp7
-rw-r--r--low-can-binding/can/signals.cpp1
-rw-r--r--low-can-binding/can/signals.hpp2
4 files changed, 4 insertions, 9 deletions
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 <cstring>
#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 <linux/can.h>
+
#include <linux/can/j1939.h>
-#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