Follow rename operation in CMakeLists.txt

Rename has been made with filter-branch using utility
git-mv-with-history, so file history follow the rename operation.
This is a commit to fix include and CMake file.

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 962b41b..cf95ab0 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -81,7 +81,7 @@ message(STATUS "Creation of ${PROJECT_NAME} binding for AFB-DAEMON")
 ###########################################################################
 add_library(${PROJECT_NAME} MODULE ${PROJECT_NAME}.cpp configuration.cpp configuration-generated.cpp
        can/can-bus.cpp can/can-bus-dev.cpp can/can-message-set.cpp can/can-message-definition.cpp can/can-message.cpp can/can-signals.cpp can/can-decoder.cpp
-       obd2/obd2-signals.cpp obd2/diagnostic-manager.cpp obd2/active-diagnostic-request.cpp
+       diagnostic/diagnostic-message.cpp diagnostic/diagnostic-manager.cpp diagnostic/active-diagnostic-request.cpp
        utils/signals.cpp utils/openxc-utils.cpp utils/timer.cpp utils/socket.cpp)
 target_link_libraries(${PROJECT_NAME} pthread bitfield uds isotp openxc)
 

diff --git a/src/can/can-bus.hpp b/src/can/can-bus.hpp
index bedc05e..13a7830 100644 (file)
--- a/src/can/can-bus.hpp
+++ b/src/can/can-bus.hpp
@@ -29,7 +29,7 @@
 #include "can-signals.hpp"
 #include "can-message.hpp"
 #include "can-bus-dev.hpp"
-#include "../obd2/active-diagnostic-request.hpp"
+#include "../diagnostic/active-diagnostic-request.hpp"
 
 #include "../low-can-binding.hpp"
 

diff --git a/src/can/can-signals.cpp b/src/can/can-signals.cpp
index 41949fc..0dcc629 100644 (file)
--- a/src/can/can-signals.cpp
+++ b/src/can/can-signals.cpp
@@ -22,7 +22,7 @@
 #include "../configuration.hpp"
 #include "../utils/signals.hpp"
 #include "can-decoder.hpp"
-#include "../obd2/obd2-signals.hpp"
+#include "../diagnostic/diagnostic-message.hpp"
 #include "../low-can-binding.hpp"
 
 std::string can_signal_t::prefix_ = "messages";

diff --git a/src/can/can-signals.hpp b/src/can/can-signals.hpp
index 9a07f66..b22bf7a 100644 (file)
--- a/src/can/can-signals.hpp
+++ b/src/can/can-signals.hpp
@@ -28,7 +28,7 @@
 #include "can-bus.hpp"
 #include "can-message.hpp"
 #include "can-message-definition.hpp"
-#include "../obd2/obd2-signals.hpp"
+#include "../diagnostic/diagnostic-message.hpp"
 
 extern "C"
 {

diff --git a/src/configuration.hpp b/src/configuration.hpp
index 266f219..25c29b9 100644 (file)
--- a/src/configuration.hpp
+++ b/src/configuration.hpp
@@ -23,7 +23,7 @@
 #include "can/can-bus.hpp"
 #include "can/can-signals.hpp"
 #include "can/can-message.hpp"
-#include "obd2/diagnostic-manager.hpp"
+#include "diagnostic/diagnostic-manager.hpp"
 
 #include "low-can-binding.hpp"
 

diff --git a/src/diagnostic/diagnostic-message.cpp b/src/diagnostic/diagnostic-message.cpp
index b7c5d45..7473e7b 100644 (file)
--- a/src/diagnostic/diagnostic-message.cpp
+++ b/src/diagnostic/diagnostic-message.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "obd2-signals.hpp"
+#include "diagnostic-message.hpp"
 
 #include "../configuration.hpp"
 #include "../utils/signals.hpp"

diff --git a/src/low-can-binding.cpp b/src/low-can-binding.cpp
index 53d34c7..520d319 100644 (file)
--- a/src/low-can-binding.cpp
+++ b/src/low-can-binding.cpp
@@ -33,7 +33,7 @@
 #include "can/can-message.hpp"
 #include "utils/timer.hpp"
 #include "utils/signals.hpp"
-#include "obd2/obd2-signals.hpp"
+#include "diagnostic/diagnostic-message.hpp"
 #include "utils/openxc-utils.hpp"
 
 extern "C"

diff --git a/src/utils/openxc-utils.hpp b/src/utils/openxc-utils.hpp
index f9ccf79..d36b359 100644 (file)
--- a/src/utils/openxc-utils.hpp
+++ b/src/utils/openxc-utils.hpp
@@ -23,7 +23,7 @@
 #include <sys/timeb.h>
 
 #include "openxc.pb.h"
-#include "../obd2/active-diagnostic-request.hpp"
+#include "../diagnostic/active-diagnostic-request.hpp"
 
 openxc_VehicleMessage build_VehicleMessage(active_diagnostic_request_t* request, const DiagnosticResponse& response, float parsed_value);
 openxc_VehicleMessage build_VehicleMessage(const openxc_SimpleMessage& message);

diff --git a/src/utils/signals.hpp b/src/utils/signals.hpp
index f68f566..e941756 100644 (file)
--- a/src/utils/signals.hpp
+++ b/src/utils/signals.hpp
@@ -24,7 +24,7 @@
 #include "openxc.pb.h"
 #include "../configuration.hpp"
 #include "../can/can-signals.hpp"
-#include "../obd2/obd2-signals.hpp"
+#include "../diagnostic/diagnostic-message.hpp"
 
 #include "../low-can-binding.hpp"