summaryrefslogtreecommitdiffstats
path: root/src/can
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-03-16 15:54:22 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2017-03-16 18:17:24 +0100
commit20336cf43a6b312cd03f76dbe68333db18122bd6 (patch)
tree430b78250ef7bdfe65ba5b59a01f0d333877f800 /src/can
parentd952c0f8dd36acf9a072603237975b7ff2e915de (diff)
Include cleaning
Change-Id: I5df96540400b833e684001f8fc5fa33ff1892bae Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'src/can')
-rw-r--r--src/can/can-bus-dev.cpp5
-rw-r--r--src/can/can-bus.cpp1
-rw-r--r--src/can/can-bus.hpp2
-rw-r--r--src/can/can-decoder.cpp1
-rw-r--r--src/can/can-decoder.hpp4
-rw-r--r--src/can/can-signals.cpp1
6 files changed, 7 insertions, 7 deletions
diff --git a/src/can/can-bus-dev.cpp b/src/can/can-bus-dev.cpp
index dd2f51f7..85bed4ad 100644
--- a/src/can/can-bus-dev.cpp
+++ b/src/can/can-bus-dev.cpp
@@ -16,15 +16,14 @@
* limitations under the License.
*/
-
+#include <map>
+#include <mutex>
#include <unistd.h>
#include <string.h>
#include <net/if.h>
#include <sys/ioctl.h>
#include <linux/can/raw.h>
-#include <mutex>
-
#include "can-bus-dev.hpp"
#include "can-bus.hpp"
diff --git a/src/can/can-bus.cpp b/src/can/can-bus.cpp
index 07a2f770..29e63b7e 100644
--- a/src/can/can-bus.cpp
+++ b/src/can/can-bus.cpp
@@ -29,6 +29,7 @@
#include "can-bus.hpp"
+#include "can-signals.hpp"
#include "can-decoder.hpp"
#include "../configuration.hpp"
#include "../utils/signals.hpp"
diff --git a/src/can/can-bus.hpp b/src/can/can-bus.hpp
index 13a78305..9370d3b8 100644
--- a/src/can/can-bus.hpp
+++ b/src/can/can-bus.hpp
@@ -25,8 +25,6 @@
#include <condition_variable>
#include "openxc.pb.h"
-#include "../utils/timer.hpp"
-#include "can-signals.hpp"
#include "can-message.hpp"
#include "can-bus-dev.hpp"
#include "../diagnostic/active-diagnostic-request.hpp"
diff --git a/src/can/can-decoder.cpp b/src/can/can-decoder.cpp
index fce43fc6..866434e0 100644
--- a/src/can/can-decoder.cpp
+++ b/src/can/can-decoder.cpp
@@ -16,6 +16,7 @@
*/
#include "can-decoder.hpp"
+
#include "canutil/read.h"
#include "../utils/openxc-utils.hpp"
diff --git a/src/can/can-decoder.hpp b/src/can/can-decoder.hpp
index ee601c6f..0507a6bd 100644
--- a/src/can/can-decoder.hpp
+++ b/src/can/can-decoder.hpp
@@ -17,7 +17,9 @@
#pragma once
-#include "can-bus.hpp"
+#include "can-signals.hpp"
+#include "can-message.hpp"
+#include "openxc.pb.h"
class decoder_t
{
diff --git a/src/can/can-signals.cpp b/src/can/can-signals.cpp
index 72c93013..6211fa1d 100644
--- a/src/can/can-signals.cpp
+++ b/src/can/can-signals.cpp
@@ -23,7 +23,6 @@
#include "../utils/signals.hpp"
#include "can-decoder.hpp"
#include "../diagnostic/diagnostic-message.hpp"
-#include "../low-can-binding.hpp"
std::string can_signal_t::prefix_ = "messages";