Follow the moving binding and configuration files.

Change include statement to refer the correct new path to the files.
Also change CMakeLists.txt.

Change-Id: I66a0bccab02e9fce10072a275a6580d61b4ddfbe
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>

diff --git a/CAN-binder/low-can-binding/CMakeLists.txt b/CAN-binder/low-can-binding/CMakeLists.txt
index ec69c84..6a871df 100644 (file)
--- a/CAN-binder/low-can-binding/CMakeLists.txt
+++ b/CAN-binder/low-can-binding/CMakeLists.txt
@@ -22,9 +22,9 @@ PROJECT_TARGET_ADD(low-can-binding)
 
        # Define project Targets
        add_library(${TARGET_NAME} MODULE
-               ${TARGET_NAME}.cpp
-               configuration.cpp
-               configuration-generated.cpp
+               binding/${TARGET_NAME}.cpp
+               binding/configuration.cpp
+               binding/configuration-generated.cpp
                can/can-bus.cpp
                can/can-bus-dev.cpp
                can/can-message-set.cpp

diff --git a/CAN-binder/low-can-binding/binding/configuration-generated.cpp b/CAN-binder/low-can-binding/binding/configuration-generated.cpp
index c3cecc5..c96a103 100644 (file)
--- a/CAN-binder/low-can-binding/binding/configuration-generated.cpp
+++ b/CAN-binder/low-can-binding/binding/configuration-generated.cpp
@@ -1,5 +1,5 @@
 #include "configuration.hpp"
-#include "can/can-decoder.hpp"
+#include "../can/can-decoder.hpp"
 
 configuration_t::configuration_t()
        :can_bus_manager_{utils::config_parser_t{"/etc/dev-mapping.conf"}}

diff --git a/CAN-binder/low-can-binding/binding/configuration.cpp b/CAN-binder/low-can-binding/binding/configuration.cpp
index 05d3696..40d6c11 100644 (file)
--- a/CAN-binder/low-can-binding/binding/configuration.cpp
+++ b/CAN-binder/low-can-binding/binding/configuration.cpp
@@ -17,8 +17,8 @@
 
 #include "configuration.hpp"
 
-#include "utils/signals.hpp"
-#include "utils/openxc-utils.hpp"
+#include "../utils/signals.hpp"
+#include "../utils/openxc-utils.hpp"
 
 /// @brief Return singleton instance of configuration object.
 configuration_t& configuration_t::instance()

diff --git a/CAN-binder/low-can-binding/binding/configuration.hpp b/CAN-binder/low-can-binding/binding/configuration.hpp
index a3ab8ca..ab799e8 100644 (file)
--- a/CAN-binder/low-can-binding/binding/configuration.hpp
+++ b/CAN-binder/low-can-binding/binding/configuration.hpp
@@ -22,10 +22,10 @@
 #include <string>
 #include <fcntl.h>
 
-#include "can/can-bus.hpp"
-#include "can/can-signals.hpp"
-#include "can/can-message.hpp"
-#include "diagnostic/diagnostic-manager.hpp"
+#include "../can/can-bus.hpp"
+#include "../can/can-signals.hpp"
+#include "../can/can-message.hpp"
+#include "../diagnostic/diagnostic-manager.hpp"
 
 #include "low-can-binding.hpp"
 

diff --git a/CAN-binder/low-can-binding/binding/low-can-binding.cpp b/CAN-binder/low-can-binding/binding/low-can-binding.cpp
index 484bb5c..99d1471 100644 (file)
--- a/CAN-binder/low-can-binding/binding/low-can-binding.cpp
+++ b/CAN-binder/low-can-binding/binding/low-can-binding.cpp
@@ -29,13 +29,13 @@
 
 #include "openxc.pb.h"
 #include "configuration.hpp"
-#include "can/can-bus.hpp"
-#include "can/can-signals.hpp"
-#include "can/can-message.hpp"
-#include "utils/timer.hpp"
-#include "utils/signals.hpp"
-#include "diagnostic/diagnostic-message.hpp"
-#include "utils/openxc-utils.hpp"
+#include "../can/can-bus.hpp"
+#include "../can/can-signals.hpp"
+#include "../can/can-message.hpp"
+#include "../utils/timer.hpp"
+#include "../utils/signals.hpp"
+#include "../diagnostic/diagnostic-message.hpp"
+#include "../utils/openxc-utils.hpp"
 
 extern "C"
 {

diff --git a/CAN-binder/low-can-binding/can/can-bus-dev.cpp b/CAN-binder/low-can-binding/can/can-bus-dev.cpp
index 99cad71..7155a72 100644 (file)
--- a/CAN-binder/low-can-binding/can/can-bus-dev.cpp
+++ b/CAN-binder/low-can-binding/can/can-bus-dev.cpp
@@ -24,7 +24,7 @@
 
 #include "can-bus.hpp"
 #include "can-message.hpp"
-#include "../low-can-binding.hpp"
+#include "../binding/low-can-binding.hpp"
 #include "canutil/write.h"
 #include "bitfield/bitfield.h"
 

diff --git a/CAN-binder/low-can-binding/can/can-bus.cpp b/CAN-binder/low-can-binding/can/can-bus.cpp
index 5f45624..d9703f2 100644 (file)
--- a/CAN-binder/low-can-binding/can/can-bus.cpp
+++ b/CAN-binder/low-can-binding/can/can-bus.cpp
@@ -29,7 +29,7 @@
 
 #include "can-signals.hpp"
 #include "can-decoder.hpp"
-#include "../configuration.hpp"
+#include "../binding/configuration.hpp"
 #include "../utils/signals.hpp"
 #include "../utils/openxc-utils.hpp"
 

diff --git a/CAN-binder/low-can-binding/can/can-bus.hpp b/CAN-binder/low-can-binding/can/can-bus.hpp
index 94aa042..3fcc29f 100644 (file)
--- a/CAN-binder/low-can-binding/can/can-bus.hpp
+++ b/CAN-binder/low-can-binding/can/can-bus.hpp
@@ -30,7 +30,7 @@
 #include "can-signals.hpp"
 #include "../utils/config-parser.hpp"
 #include "../diagnostic/diagnostic-manager.hpp"
-#include "../low-can-binding.hpp"
+#include "../binding/low-can-binding.hpp"
 
 // TODO actual max is 32 but dropped to 24 for memory considerations
 #define MAX_ACCEPTANCE_FILTERS 24

diff --git a/CAN-binder/low-can-binding/can/can-decoder.cpp b/CAN-binder/low-can-binding/can/can-decoder.cpp
index e01e43b..9a38111 100644 (file)
--- a/CAN-binder/low-can-binding/can/can-decoder.cpp
+++ b/CAN-binder/low-can-binding/can/can-decoder.cpp
@@ -20,7 +20,7 @@
 #include "canutil/read.h"
 #include "../utils/openxc-utils.hpp"
 
-#include "../low-can-binding.hpp"
+#include "../binding/low-can-binding.hpp"
 
 /// @brief Parse the signal's bitfield from the given data and return the raw
 /// value.

diff --git a/CAN-binder/low-can-binding/can/can-message.cpp b/CAN-binder/low-can-binding/can/can-message.cpp
index 3575348..b6e4458 100644 (file)
--- a/CAN-binder/low-can-binding/can/can-message.cpp
+++ b/CAN-binder/low-can-binding/can/can-message.cpp
@@ -19,7 +19,7 @@
 
 #include <cstring>
 
-#include "../low-can-binding.hpp"
+#include "../binding/low-can-binding.hpp"
 
 ///
 /// @brief Class constructor

diff --git a/CAN-binder/low-can-binding/can/can-signals.cpp b/CAN-binder/low-can-binding/can/can-signals.cpp
index 6211fa1..82c6285 100644 (file)
--- a/CAN-binder/low-can-binding/can/can-signals.cpp
+++ b/CAN-binder/low-can-binding/can/can-signals.cpp
@@ -19,7 +19,7 @@
 
 #include "can-signals.hpp"
 
-#include "../configuration.hpp"
+#include "../binding/configuration.hpp"
 #include "../utils/signals.hpp"
 #include "can-decoder.hpp"
 #include "../diagnostic/diagnostic-message.hpp"

diff --git a/CAN-binder/low-can-binding/diagnostic/active-diagnostic-request.cpp b/CAN-binder/low-can-binding/diagnostic/active-diagnostic-request.cpp
index 7ddf1d5..932edae 100644 (file)
--- a/CAN-binder/low-can-binding/diagnostic/active-diagnostic-request.cpp
+++ b/CAN-binder/low-can-binding/diagnostic/active-diagnostic-request.cpp
@@ -20,7 +20,7 @@
 
 #include "active-diagnostic-request.hpp"
 
-#include "../configuration.hpp"
+#include "../binding/configuration.hpp"
 
 #define ERROR_PID 0xFF
 

diff --git a/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp b/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp
index ec6ec58..75cc551 100644 (file)
--- a/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp
+++ b/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp
@@ -22,7 +22,7 @@
 
 #include "../utils/openxc-utils.hpp"
 #include "../utils/signals.hpp"
-#include "../configuration.hpp"
+#include "../binding/configuration.hpp"
 
 #define MAX_RECURRING_DIAGNOSTIC_FREQUENCY_HZ 10
 #define MAX_SIMULTANEOUS_DIAG_REQUESTS 50

diff --git a/CAN-binder/low-can-binding/diagnostic/diagnostic-message.cpp b/CAN-binder/low-can-binding/diagnostic/diagnostic-message.cpp
index 6f61557..a7207ae 100644 (file)
--- a/CAN-binder/low-can-binding/diagnostic/diagnostic-message.cpp
+++ b/CAN-binder/low-can-binding/diagnostic/diagnostic-message.cpp
@@ -18,7 +18,7 @@
 
 #include "diagnostic-message.hpp"
 
-#include "../configuration.hpp"
+#include "../binding/configuration.hpp"
 #include "../utils/signals.hpp"
 
 const char *UNIT_NAMES[10] = {

diff --git a/CAN-binder/low-can-binding/utils/config-parser.cpp b/CAN-binder/low-can-binding/utils/config-parser.cpp
index c2528e0..60ea118 100644 (file)
--- a/CAN-binder/low-can-binding/utils/config-parser.cpp
+++ b/CAN-binder/low-can-binding/utils/config-parser.cpp
@@ -17,7 +17,7 @@
 
 #include "config-parser.hpp"
 
-#include "../low-can-binding.hpp"
+#include "../binding/low-can-binding.hpp"
 
 namespace utils
 {

diff --git a/CAN-binder/low-can-binding/utils/openxc-utils.cpp b/CAN-binder/low-can-binding/utils/openxc-utils.cpp
index a597f1c..d77a0a3 100644 (file)
--- a/CAN-binder/low-can-binding/utils/openxc-utils.cpp
+++ b/CAN-binder/low-can-binding/utils/openxc-utils.cpp
@@ -18,7 +18,7 @@
 
 #include "openxc-utils.hpp"
 
-#include "../configuration.hpp"
+#include "../binding/configuration.hpp"
 
 ///
 /// @brief Build a specific VehicleMessage containing a DiagnosticResponse.

diff --git a/CAN-binder/low-can-binding/utils/signals.hpp b/CAN-binder/low-can-binding/utils/signals.hpp
index 2eae7e9..88b9875 100644 (file)
--- a/CAN-binder/low-can-binding/utils/signals.hpp
+++ b/CAN-binder/low-can-binding/utils/signals.hpp
@@ -22,11 +22,11 @@
 #include <fnmatch.h>
 
 #include "openxc.pb.h"
-#include "../configuration.hpp"
+#include "../binding/configuration.hpp"
 #include "../can/can-signals.hpp"
 #include "../diagnostic/diagnostic-message.hpp"
 
-#include "../low-can-binding.hpp"
+#include "../binding/low-can-binding.hpp"
 
 namespace utils
 {

diff --git a/CAN-binder/low-can-binding/utils/socketcan.hpp b/CAN-binder/low-can-binding/utils/socketcan.hpp
index 3c02a4f..3dcc277 100644 (file)
--- a/CAN-binder/low-can-binding/utils/socketcan.hpp
+++ b/CAN-binder/low-can-binding/utils/socketcan.hpp
@@ -24,7 +24,7 @@
 #include <string.h>
 
 #include "../can/can-message.hpp"
-#include "../low-can-binding.hpp"
+#include "../binding/low-can-binding.hpp"
 
 #define INVALID_SOCKET -1