From 8a5f5a77a94cd773c07696480ac9d881c6dc65c1 Mon Sep 17 00:00:00 2001
From: Alberto Nidasio <alberto.nidasio@skywarder.eu>
Date: Sun, 15 May 2022 23:19:19 +0200
Subject: [PATCH] [MOCK_PERIPHERALS] Fixed wrong includes
---
src/shared/drivers/spi/SPI.h | 2 +-
src/shared/drivers/spi/SPIBus.h | 8 ++++----
src/shared/drivers/spi/SPIBusInterface.h | 6 +++---
src/shared/drivers/usart/USART.h | 1 +
src/shared/utils/TestUtils/FakeSpiTypedef.h | 2 ++
5 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/shared/drivers/spi/SPI.h b/src/shared/drivers/spi/SPI.h
index 8d2077fca..07761041f 100644
--- a/src/shared/drivers/spi/SPI.h
+++ b/src/shared/drivers/spi/SPI.h
@@ -30,7 +30,7 @@
using SPIType = SPI_TypeDef;
#else
#include <utils/TestUtils/FakeSpiTypedef.h>
-using SPIType = FakeSpiTypedef;
+using SPIType = Boardcore::FakeSpiTypedef;
#endif
namespace Boardcore
diff --git a/src/shared/drivers/spi/SPIBus.h b/src/shared/drivers/spi/SPIBus.h
index 0d5b0c0b7..ae6ff1910 100644
--- a/src/shared/drivers/spi/SPIBus.h
+++ b/src/shared/drivers/spi/SPIBus.h
@@ -29,8 +29,8 @@
#ifndef USE_MOCK_PERIPHERALS
using SPIType = SPI_TypeDef;
#else
-#include <test/FakeSpiTypedef.h>
-using SPIType = FakeSpiTypedef;
+#include <utils/TestUtils/FakeSpiTypedef.h>
+using SPIType = Boardcore::FakeSpiTypedef;
#endif
namespace Boardcore
@@ -46,10 +46,10 @@ public:
SPIBus(SPIType* spi);
///< Delete copy/move contructors/operators.
- SPIBus(const SPIBus&) = delete;
+ SPIBus(const SPIBus&) = delete;
SPIBus& operator=(const SPIBus&) = delete;
SPIBus(SPIBus&&) = delete;
- SPIBus& operator=(SPIBus&&) = delete;
+ SPIBus& operator=(SPIBus&&) = delete;
/**
* @brief Configures and enables the bus with the provided configuration.
diff --git a/src/shared/drivers/spi/SPIBusInterface.h b/src/shared/drivers/spi/SPIBusInterface.h
index f10a7e332..32bc057ca 100644
--- a/src/shared/drivers/spi/SPIBusInterface.h
+++ b/src/shared/drivers/spi/SPIBusInterface.h
@@ -30,7 +30,7 @@
using GpioType = miosix::GpioPin;
#else
#include <utils/TestUtils/MockGpioPin.h>
-using GpioType = MockGpioPin;
+using GpioType = Boardcore::MockGpioPin;
#endif
namespace Boardcore
@@ -93,10 +93,10 @@ public:
SPIBusInterface() {}
///< Delete copy/move contructors/operators.
- SPIBusInterface(const SPIBusInterface&) = delete;
+ SPIBusInterface(const SPIBusInterface&) = delete;
SPIBusInterface& operator=(const SPIBusInterface&) = delete;
SPIBusInterface(SPIBusInterface&&) = delete;
- SPIBusInterface& operator=(SPIBusInterface&&) = delete;
+ SPIBusInterface& operator=(SPIBusInterface&&) = delete;
/**
* @brief Configures the bus with the provided configuration parameters.
diff --git a/src/shared/drivers/usart/USART.h b/src/shared/drivers/usart/USART.h
index 14faf77c8..b06b19ea9 100644
--- a/src/shared/drivers/usart/USART.h
+++ b/src/shared/drivers/usart/USART.h
@@ -34,6 +34,7 @@
using USARTType = USART_TypeDef;
#else
// TODO: Create test utils
+using USARTType = USART_TypeDef;
#endif
#ifdef STM32F429xx
diff --git a/src/shared/utils/TestUtils/FakeSpiTypedef.h b/src/shared/utils/TestUtils/FakeSpiTypedef.h
index dae48554a..eccb4a17b 100644
--- a/src/shared/utils/TestUtils/FakeSpiTypedef.h
+++ b/src/shared/utils/TestUtils/FakeSpiTypedef.h
@@ -86,6 +86,8 @@ struct FakeSpiTypedef
MockGpioPin cs;
FakeSpiTypedef() : DR(*this) { cs.high(); }
+
+ FakeSpiTypedef(SPI_TypeDef* spi) : DR(*this) { cs.high(); }
};
} // namespace Boardcore
--
GitLab