summaryrefslogtreecommitdiffstats
path: root/CAN-binder
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-05-11 01:13:07 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-05-11 01:13:07 +0200
commitc05bff0624d853be52c7ff6d65209c776f8b504e (patch)
tree3185a605c4ba85f18d0f7fb2dfaa16809d8058ff /CAN-binder
parent6222973c39ee02ad52a5d0b4b400024157ff2eeb (diff)
Resolv include circular dependencies.
Change-Id: I038677d688c64e87ae86dd2af245f87f5c40e317 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'CAN-binder')
-rw-r--r--CAN-binder/low-can-binding/can/can-decoder.cpp2
-rw-r--r--CAN-binder/low-can-binding/can/can-message-definition.hpp2
-rw-r--r--CAN-binder/low-can-binding/can/can-message.hpp1
3 files changed, 2 insertions, 3 deletions
diff --git a/CAN-binder/low-can-binding/can/can-decoder.cpp b/CAN-binder/low-can-binding/can/can-decoder.cpp
index eae4ef2..b0d7bb8 100644
--- a/CAN-binder/low-can-binding/can/can-decoder.cpp
+++ b/CAN-binder/low-can-binding/can/can-decoder.cpp
@@ -19,7 +19,7 @@
#include "canutil/read.h"
#include "../utils/openxc-utils.hpp"
-
+#include "can-message-definition.hpp"
#include "../binding/low-can-hat.hpp"
/// @brief Parse the signal's bitfield from the given data and return the raw
diff --git a/CAN-binder/low-can-binding/can/can-message-definition.hpp b/CAN-binder/low-can-binding/can/can-message-definition.hpp
index 612ce35..87c48ac 100644
--- a/CAN-binder/low-can-binding/can/can-message-definition.hpp
+++ b/CAN-binder/low-can-binding/can/can-message-definition.hpp
@@ -28,8 +28,8 @@
#include <vector>
#include <memory>
-#include "can-message.hpp"
#include "can-signals.hpp"
+#include "can-message.hpp"
#include "../utils/timer.hpp"
class can_message_set_t;
diff --git a/CAN-binder/low-can-binding/can/can-message.hpp b/CAN-binder/low-can-binding/can/can-message.hpp
index a7c7452..954fdc3 100644
--- a/CAN-binder/low-can-binding/can/can-message.hpp
+++ b/CAN-binder/low-can-binding/can/can-message.hpp
@@ -23,7 +23,6 @@
#include <linux/can.h>
#include "../utils/timer.hpp"
-#include "can-message-set.hpp"
#define CAN_MESSAGE_SIZE 8