diff options
author | Romain Forlot <romain.forlot@iot.bzh> | 2017-05-04 14:24:33 +0200 |
---|---|---|
committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-05-04 14:28:24 +0200 |
commit | 0895cac1b9eae5c8701ba416eda1f43aa0016921 (patch) | |
tree | e61b7569776de2522de8a206fce379445000cbc4 /CAN-binder/low-can-binding/binding | |
parent | 9e86564a58a0f9c83edc5bb76fd8ab4c7e7a63ee (diff) |
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>
Diffstat (limited to 'CAN-binder/low-can-binding/binding')
4 files changed, 14 insertions, 14 deletions
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 --- 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 --- 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 --- 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 --- 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" { |