summaryrefslogtreecommitdiffstats
path: root/src/can
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-03-09 16:56:56 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2017-03-16 17:10:40 +0100
commit8871f8ae696035877afcbb3b089fc06219c2ba3a (patch)
treec06b629ad775ae362a9e05430bb5fea64bb64049 /src/can
parent9099177556d598676e4d6322ae49d22bb2f0c59e (diff)
Fix: include statement with wrong path.
And minor fixes. Change-Id: Ica55c0708edd86d0aa37e7117b3c3fad551a0167 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'src/can')
-rw-r--r--src/can/can-bus-dev.cpp2
-rw-r--r--src/can/can-bus.hpp11
-rw-r--r--src/can/can-message.cpp4
-rw-r--r--src/can/can-message.hpp3
-rw-r--r--src/can/can-signals.hpp8
5 files changed, 14 insertions, 14 deletions
diff --git a/src/can/can-bus-dev.cpp b/src/can/can-bus-dev.cpp
index 87d7bf5..3f3dc1c 100644
--- a/src/can/can-bus-dev.cpp
+++ b/src/can/can-bus-dev.cpp
@@ -29,7 +29,7 @@
#include "can-bus.hpp"
#include "can-message.hpp"
-#include "low-can-binding.hpp"
+#include "../low-can-binding.hpp"
/// @brief Class constructor
/// @param dev_name String representing the device name into the linux /dev tree
diff --git a/src/can/can-bus.hpp b/src/can/can-bus.hpp
index 154822f..17e60d2 100644
--- a/src/can/can-bus.hpp
+++ b/src/can/can-bus.hpp
@@ -25,14 +25,13 @@
#include <condition_variable>
#include "openxc.pb.h"
-#include "utils/timer.hpp"
-#include "can/can-signals.hpp"
-#include "can/can-message.hpp"
-
-#include "low-can-binding.hpp"
-
+#include "../utils/timer.hpp"
+#include "can-signals.hpp"
+#include "can-message.hpp"
#include "can-bus-dev.hpp"
+#include "../low-can-binding.hpp"
+
// TODO actual max is 32 but dropped to 24 for memory considerations
#define MAX_ACCEPTANCE_FILTERS 24
// TODO this takes up a ton of memory
diff --git a/src/can/can-message.cpp b/src/can/can-message.cpp
index b9a2d1a..592f5e5 100644
--- a/src/can/can-message.cpp
+++ b/src/can/can-message.cpp
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-#include "can/can-message.hpp"
+#include "can-message.hpp"
#include <cstring>
-#include "low-can-binding.hpp"
+#include "../low-can-binding.hpp"
/********************************************************************************
*
diff --git a/src/can/can-message.hpp b/src/can/can-message.hpp
index f7e445d..730e9f9 100644
--- a/src/can/can-message.hpp
+++ b/src/can/can-message.hpp
@@ -22,7 +22,8 @@
#include <cstdint>
#include <linux/can.h>
-#include "utils/timer.hpp"
+#include "../utils/timer.hpp"
+#include "can-message-set.hpp"
#define CAN_MESSAGE_SIZE 8
diff --git a/src/can/can-signals.hpp b/src/can/can-signals.hpp
index 63903bd..e906d26 100644
--- a/src/can/can-signals.hpp
+++ b/src/can/can-signals.hpp
@@ -24,10 +24,10 @@
#include <string>
#include "openxc.pb.h"
-#include "utils/timer.hpp"
-#include "can/can-bus.hpp"
-#include "can/can-message.hpp"
-#include "obd2/obd2-signals.hpp"
+#include "../utils/timer.hpp"
+#include "can-bus.hpp"
+#include "can-message.hpp"
+#include "../obd2/obd2-signals.hpp"
extern "C"
{