From 07b5fd34cac77b61e16598b31759998e0fe077c6 Mon Sep 17 00:00:00 2001 From: Federico Terraneo <fede.tft@miosix.org> Date: Sun, 14 May 2017 17:09:46 +0200 Subject: [PATCH] Renamed generic DMA/DMA.h in spi/SensorSpi.h --- sbs.conf | 2 +- src/entrypoints/dma-lowlevel-test.cpp | 4 ++-- src/shared/BusTemplate.h | 2 +- src/shared/boards/AnakinBoard.h | 4 ++-- src/shared/sensors/Sensor.h | 2 +- src/shared/{DMA => sensors}/SensorSampling.h | 2 +- src/shared/{DMA/DMA.cpp => spi/SensorSpi.cpp} | 2 +- src/shared/{DMA/DMA.h => spi/SensorSpi.h} | 6 +++--- 8 files changed, 12 insertions(+), 12 deletions(-) rename src/shared/{DMA => sensors}/SensorSampling.h (98%) rename src/shared/{DMA/DMA.cpp => spi/SensorSpi.cpp} (99%) rename src/shared/{DMA/DMA.h => spi/SensorSpi.h} (98%) diff --git a/sbs.conf b/sbs.conf index f78b8b937..1cfeef6fa 100644 --- a/sbs.conf +++ b/sbs.conf @@ -68,7 +68,7 @@ Files: src/shared/canbus/CanManager.cpp [shared] Type: srcfiles Files: src/shared/events/Scheduler.cpp - src/shared/DMA/DMA.cpp + src/shared/spi/SensorSpi.cpp src/shared/diagnostic/CpuMeter.cpp [i2c] diff --git a/src/entrypoints/dma-lowlevel-test.cpp b/src/entrypoints/dma-lowlevel-test.cpp index a77a1d25b..511c0cc73 100644 --- a/src/entrypoints/dma-lowlevel-test.cpp +++ b/src/entrypoints/dma-lowlevel-test.cpp @@ -28,8 +28,8 @@ #include <sensors/MAX21105.h> #include <sensors/MS580301BA07.h> -#include <DMA/DMA.h> -#include <DMA/SensorSampling.h> +#include <spi/SensorSpi.h> +#include <sensors/SensorSampling.h> using namespace miosix; diff --git a/src/shared/BusTemplate.h b/src/shared/BusTemplate.h index 2a52ea031..34353da60 100644 --- a/src/shared/BusTemplate.h +++ b/src/shared/BusTemplate.h @@ -32,7 +32,7 @@ #include <Singleton.h> #include "i2c/stm32f2_f4_i2c.h" #include <util/software_i2c.h> -#include <DMA/DMA.h> +#include <spi/SensorSpi.h> static const int csDelay=20; diff --git a/src/shared/boards/AnakinBoard.h b/src/shared/boards/AnakinBoard.h index 1d4929f79..10e4025f5 100644 --- a/src/shared/boards/AnakinBoard.h +++ b/src/shared/boards/AnakinBoard.h @@ -33,8 +33,8 @@ #include <sensors/MAX21105.h> #include <sensors/MS580301BA07.h> -#include <DMA/DMA.h> -#include <DMA/SensorSampling.h> +#include <spi/SensorSpi.h> +#include <sensors/SensorSampling.h> typedef miosix::Gpio<GPIOA_BASE, 5> GpioSck; typedef miosix::Gpio<GPIOA_BASE, 6> GpioMiso; diff --git a/src/shared/sensors/Sensor.h b/src/shared/sensors/Sensor.h index a6a57c526..a9f0f21cf 100644 --- a/src/shared/sensors/Sensor.h +++ b/src/shared/sensors/Sensor.h @@ -27,7 +27,7 @@ #include <Common.h> #include <math/Vec3.h> #include <math/Quaternion.h> -#include <DMA/DMA.h> +#include <spi/SensorSpi.h> /** Sensors class diagram * ________ diff --git a/src/shared/DMA/SensorSampling.h b/src/shared/sensors/SensorSampling.h similarity index 98% rename from src/shared/DMA/SensorSampling.h rename to src/shared/sensors/SensorSampling.h index 1a741f633..1015ad49f 100644 --- a/src/shared/DMA/SensorSampling.h +++ b/src/shared/sensors/SensorSampling.h @@ -23,7 +23,7 @@ #define SENSOR_SAMPLING_H #include <Common.h> -#include <DMA/DMA.h> +#include <spi/SensorSpi.h> #include <diagnostic/Log.h> class Sensor; diff --git a/src/shared/DMA/DMA.cpp b/src/shared/spi/SensorSpi.cpp similarity index 99% rename from src/shared/DMA/DMA.cpp rename to src/shared/spi/SensorSpi.cpp index bd2ae0e51..843cc4b82 100644 --- a/src/shared/DMA/DMA.cpp +++ b/src/shared/spi/SensorSpi.cpp @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -#include "DMA.h" +#include "SensorSpi.h" #include <kernel/scheduler/scheduler.h> using namespace std; diff --git a/src/shared/DMA/DMA.h b/src/shared/spi/SensorSpi.h similarity index 98% rename from src/shared/DMA/DMA.h rename to src/shared/spi/SensorSpi.h index dbaba8eba..8c71a1a38 100644 --- a/src/shared/DMA/DMA.h +++ b/src/shared/spi/SensorSpi.h @@ -20,8 +20,8 @@ * THE SOFTWARE. */ -#ifndef SPI_DRIVER_H -#define SPI_DRIVER_H +#ifndef SENSOR_SPI_H +#define SENSOR_SPI_H #include <Common.h> @@ -145,4 +145,4 @@ private: std::vector<uint8_t> fromPeripheral; }; -#endif //SPI_DRIVER_H +#endif //SENSOR_SPI_H -- GitLab