From 940b95a05bbd6fd97a29b48fdbb2bbf94c2278b7 Mon Sep 17 00:00:00 2001 From: Federico Terraneo <fede.tft@miosix.org> Date: Sun, 14 May 2017 18:21:58 +0200 Subject: [PATCH] Moved BusTemplate.h to drivers --- src/entrypoints/anakin-accel.cpp | 2 +- src/entrypoints/anakin-demo-board.cpp | 2 +- src/entrypoints/anakin-test-canbus.cpp | 2 +- src/entrypoints/anakin-test-suite.cpp | 2 +- src/entrypoints/test-scheduler.cpp | 2 +- src/entrypoints/test_i2c.cpp | 2 +- src/shared/boards/Board.h | 2 +- src/shared/{ => drivers}/BusTemplate.h | 0 src/shared/sensors/FXAS21002.h | 2 +- src/shared/sensors/LPS331AP.h | 2 +- src/shared/sensors/MAX21105.h | 2 +- src/shared/sensors/MAX31856.h | 2 +- src/shared/sensors/MPL3115.h | 2 +- src/shared/sensors/MPU9250.h | 2 +- src/shared/sensors/MS580301BA07.h | 2 +- src/shared/sensors/Si7021.h | 2 +- src/shared/sensors/iNemo.h | 2 +- 17 files changed, 16 insertions(+), 16 deletions(-) rename src/shared/{ => drivers}/BusTemplate.h (100%) diff --git a/src/entrypoints/anakin-accel.cpp b/src/entrypoints/anakin-accel.cpp index 9b4ab8854..432484574 100644 --- a/src/entrypoints/anakin-accel.cpp +++ b/src/entrypoints/anakin-accel.cpp @@ -21,7 +21,7 @@ */ #include <Common.h> -#include <BusTemplate.h> +#include <drivers/BusTemplate.h> #include <sensors/MAX21105.h> #include <sensors/MPU9250.h> #include <sensors/iNemo.h> diff --git a/src/entrypoints/anakin-demo-board.cpp b/src/entrypoints/anakin-demo-board.cpp index a49c8e5a0..53ffa8b51 100644 --- a/src/entrypoints/anakin-demo-board.cpp +++ b/src/entrypoints/anakin-demo-board.cpp @@ -21,7 +21,7 @@ */ #include <Common.h> -#include <BusTemplate.h> +#include <drivers/BusTemplate.h> #include <Leds.h> #include <sensors/FXAS21002.h> #include <sensors/LPS331AP.h> diff --git a/src/entrypoints/anakin-test-canbus.cpp b/src/entrypoints/anakin-test-canbus.cpp index 2ef66cd10..40be8b507 100644 --- a/src/entrypoints/anakin-test-canbus.cpp +++ b/src/entrypoints/anakin-test-canbus.cpp @@ -23,7 +23,7 @@ */ #include <Common.h> -#include <BusTemplate.h> +#include <drivers/BusTemplate.h> #include <drivers/canbus/CanManager.h> #include <drivers/canbus/CanSocket.h> #include <drivers/canbus/CanUtils.h> diff --git a/src/entrypoints/anakin-test-suite.cpp b/src/entrypoints/anakin-test-suite.cpp index 1c076777f..a2a8b0f0b 100644 --- a/src/entrypoints/anakin-test-suite.cpp +++ b/src/entrypoints/anakin-test-suite.cpp @@ -21,7 +21,7 @@ */ #include <Common.h> -#include <BusTemplate.h> +#include <drivers/BusTemplate.h> #include <sensors/FXAS21002.h> #include <sensors/MAX21105.h> #include <sensors/MPU9250.h> diff --git a/src/entrypoints/test-scheduler.cpp b/src/entrypoints/test-scheduler.cpp index a628d9561..ac5c1972f 100644 --- a/src/entrypoints/test-scheduler.cpp +++ b/src/entrypoints/test-scheduler.cpp @@ -21,7 +21,7 @@ */ #include <Common.h> -#include <BusTemplate.h> +#include <drivers/BusTemplate.h> #include "drivers/stm32f2_f4_i2c.h" #include <events/Scheduler.h> diff --git a/src/entrypoints/test_i2c.cpp b/src/entrypoints/test_i2c.cpp index 464602e75..66f558eda 100644 --- a/src/entrypoints/test_i2c.cpp +++ b/src/entrypoints/test_i2c.cpp @@ -21,7 +21,7 @@ */ #include <Common.h> -#include <BusTemplate.h> +#include <drivers/BusTemplate.h> #include <sensors/MPL3115.h> #include <Leds.h> #include <drivers/stm32f2_f4_i2c.h> diff --git a/src/shared/boards/Board.h b/src/shared/boards/Board.h index 89020e9a0..1b42f1337 100644 --- a/src/shared/boards/Board.h +++ b/src/shared/boards/Board.h @@ -24,7 +24,7 @@ #define BOARD_H #include <Common.h> -#include <BusTemplate.h> +#include <drivers/BusTemplate.h> #include <Singleton.h> #include <sensors/Sensor.h> #include <diagnostic/Log.h> diff --git a/src/shared/BusTemplate.h b/src/shared/drivers/BusTemplate.h similarity index 100% rename from src/shared/BusTemplate.h rename to src/shared/drivers/BusTemplate.h diff --git a/src/shared/sensors/FXAS21002.h b/src/shared/sensors/FXAS21002.h index 3e2d1d32d..46608ceef 100644 --- a/src/shared/sensors/FXAS21002.h +++ b/src/shared/sensors/FXAS21002.h @@ -26,7 +26,7 @@ #define FXAS21002_H #include "Sensor.h" -#include "BusTemplate.h" +#include <drivers/BusTemplate.h> template <typename Bus> class FXAS21002 : public GyroSensor { diff --git a/src/shared/sensors/LPS331AP.h b/src/shared/sensors/LPS331AP.h index 5af67789b..938daf33d 100644 --- a/src/shared/sensors/LPS331AP.h +++ b/src/shared/sensors/LPS331AP.h @@ -26,7 +26,7 @@ #define LPS331AP_H #include "Sensor.h" -#include <BusTemplate.h> +#include <drivers/BusTemplate.h> template <typename Bus> class LPS331AP : public PressureSensor, public TemperatureSensor diff --git a/src/shared/sensors/MAX21105.h b/src/shared/sensors/MAX21105.h index 0df5c4f16..711fb65b3 100644 --- a/src/shared/sensors/MAX21105.h +++ b/src/shared/sensors/MAX21105.h @@ -24,7 +24,7 @@ #include "Sensor.h" #include "interfaces/endianness.h" -#include <BusTemplate.h> +#include <drivers/BusTemplate.h> template<class Bus> class MAX21105 : public AccelSensor, public GyroSensor, diff --git a/src/shared/sensors/MAX31856.h b/src/shared/sensors/MAX31856.h index 36032eefc..275958b46 100644 --- a/src/shared/sensors/MAX31856.h +++ b/src/shared/sensors/MAX31856.h @@ -25,7 +25,7 @@ #define MAX31856_H #include "Sensor.h" -#include <BusTemplate.h> +#include <drivers/BusTemplate.h> /** This is a thermocouple reading chip */ diff --git a/src/shared/sensors/MPL3115.h b/src/shared/sensors/MPL3115.h index 5262c5b42..717dec752 100644 --- a/src/shared/sensors/MPL3115.h +++ b/src/shared/sensors/MPL3115.h @@ -26,7 +26,7 @@ #define MPL3115_H #include "Sensor.h" -#include <BusTemplate.h> +#include <drivers/BusTemplate.h> template <typename BusType> class MPL3115 : public PressureSensor, public TemperatureSensor, diff --git a/src/shared/sensors/MPU9250.h b/src/shared/sensors/MPU9250.h index 076b77cc1..a474b56de 100644 --- a/src/shared/sensors/MPU9250.h +++ b/src/shared/sensors/MPU9250.h @@ -25,7 +25,7 @@ #ifndef MAX9250_H #define MAX9250_H #include "Sensor.h" -#include <BusTemplate.h> +#include <drivers/BusTemplate.h> // TODO: fix normalizeTemp() (is /512.0f correct?) // TODO: Self-Test diff --git a/src/shared/sensors/MS580301BA07.h b/src/shared/sensors/MS580301BA07.h index 7dfeafd97..b9d897100 100644 --- a/src/shared/sensors/MS580301BA07.h +++ b/src/shared/sensors/MS580301BA07.h @@ -26,7 +26,7 @@ #define MS580301BA07_H #include "Sensor.h" -#include <BusTemplate.h> +#include <drivers/BusTemplate.h> // TODO second order temperature compensation template<class Bus> diff --git a/src/shared/sensors/Si7021.h b/src/shared/sensors/Si7021.h index 7ea6bc168..147f2db02 100644 --- a/src/shared/sensors/Si7021.h +++ b/src/shared/sensors/Si7021.h @@ -26,7 +26,7 @@ #define SI7021_H #include "Sensor.h" -#include <BusTemplate.h> +#include <drivers/BusTemplate.h> template <typename BusType> class Si7021 : public HumiditySensor, public TemperatureSensor { diff --git a/src/shared/sensors/iNemo.h b/src/shared/sensors/iNemo.h index eabf311cf..3dc3dda00 100644 --- a/src/shared/sensors/iNemo.h +++ b/src/shared/sensors/iNemo.h @@ -27,7 +27,7 @@ #define INEMO_H #include "Sensor.h" -#include "BusTemplate.h" +#include <drivers/BusTemplate.h> #include "Common.h" template <typename BusG,typename BusXM> -- GitLab