From 8871f8ae696035877afcbb3b089fc06219c2ba3a Mon Sep 17 00:00:00 2001
From: Romain Forlot <romain.forlot@iot.bzh>
Date: Thu, 9 Mar 2017 16:56:56 +0100
Subject: Fix: include statement with wrong path. And minor fixes.

Change-Id: Ica55c0708edd86d0aa37e7117b3c3fad551a0167
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
---
 src/can/can-bus-dev.cpp |  2 +-
 src/can/can-bus.hpp     | 11 +++++------
 src/can/can-message.cpp |  4 ++--
 src/can/can-message.hpp |  3 ++-
 src/can/can-signals.hpp |  8 ++++----
 5 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/can')

diff --git a/src/can/can-bus-dev.cpp b/src/can/can-bus-dev.cpp
index 87d7bf5b..3f3dc1c4 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 154822fc..17e60d24 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 b9a2d1a1..592f5e57 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 f7e445dd..730e9f90 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 63903bd8..e906d26d 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"
 {
-- 
cgit 1.2.3-korg