concept

Author: TomSaw

src/modm/architecture/interface/spi.hpp

@@ -19,6 +19,18 @@
 
 namespace modm
 {
+namespace spi
+{
+
+template<class Spi>
+concept Support_DataSize_Bit16 = requires
+{ Spi::DataSize::Bit16; };
+
+template<class Spi>
+concept Support_DataSize_Bit32 = requires
+{ Spi::DataSize::Bit32; };
+
+}  // namespace spi
 
 /// @ingroup modm_architecture_spi
 struct Spi
@@ -43,6 +55,7 @@ struct Spi
 		MsbFirst = 0b0,
 		LsbFirst = 0b1,
 	};
+
 };
 
 } // namespace modm

src/modm/driver/display/ili9341_spi.hpp

@@ -13,12 +13,6 @@
 
 #include <modm/architecture/interface/spi_device.hpp>
 
-// TODO Prototype
-template<class Spi>
-concept SupportsBit16 = requires() {
-	Spi::setDataSize(Spi::DataSize::Bit16);
-};
-
 namespace modm
 {
 
@@ -41,7 +35,7 @@ class Ili9341SPIInterface: public ili9341, public modm::SpiDevice<SPI>
 	__attribute__((noinline)) void
 	writeCommand(Command command)
 	{
-		if constexpr ( SupportsBit16<SPI> )
+		if constexpr ( spi::Support_DataSize_Bit16<SPI> )
 			SPI::setDataSize(SPI::DataSize::Bit8);
 		Dc::reset(); // enable command
 		SPI::transferBlocking(i(command));
@@ -50,7 +44,7 @@ class Ili9341SPIInterface: public ili9341, public modm::SpiDevice<SPI>
 	__attribute__((noinline)) void
 	writeCommand(Command command, uint8_t const *args, std::size_t length)
 	{
-		if constexpr ( SupportsBit16<SPI> )
+		if constexpr ( spi::Support_DataSize_Bit16<SPI> )
 			SPI::setDataSize(SPI::DataSize::Bit8);
 		Dc::reset(); // enable command
 		SPI::transferBlocking(i(command));
@@ -63,39 +57,39 @@ class Ili9341SPIInterface: public ili9341, public modm::SpiDevice<SPI>
 	void
 	writeData(uint8_t const *data, std::size_t length)
 	{
-		if constexpr ( SupportsBit16<SPI> )
+		if constexpr ( spi::Support_DataSize_Bit16<SPI> )
 			SPI::setDataSize(SPI::DataSize::Bit8);
 		SPI::transferBlocking(data, nullptr, length);
 	}
 
 	void
 	writeData(color::Rgb565 rgb565)
 	{
-		if constexpr ( SupportsBit16<SPI> )
+		if constexpr ( spi::Support_DataSize_Bit16<SPI> )
 			SPI::setDataSize(SPI::DataSize::Bit16);
 		SPI::transferBlocking(rgb565.color);
 	}
 
 	void
 	writeDataRepeat(color::Rgb565 rgb565, std::size_t repeat)
 	{
-		if constexpr ( SupportsBit16<SPI> )
+		if constexpr ( spi::Support_DataSize_Bit16<SPI> )
 			SPI::setDataSize(SPI::DataSize::Bit16);
 		SPI::transferBlocking16(rgb565.color, repeat);
 	}
 
 	void
 	writeData(color::Rgb565 const *data, std::size_t length)
 	{
-		if constexpr ( SupportsBit16<SPI> )
+		if constexpr ( spi::Support_DataSize_Bit16<SPI> )
 			SPI::setDataSize(SPI::DataSize::Bit16);
 		SPI::transferBlocking16(reinterpret_cast<const uint16_t*>(data), nullptr, length);
 	}
 
 	void
 	writeCommandValue8(Command command, uint8_t value)
 	{
-		if constexpr ( SupportsBit16<SPI> )
+		if constexpr ( spi::Support_DataSize_Bit16<SPI> )
 			SPI::setDataSize(SPI::DataSize::Bit8);
 		writeCommand(command, &value, 1);
 	}
@@ -105,7 +99,7 @@ class Ili9341SPIInterface: public ili9341, public modm::SpiDevice<SPI>
 	{
 		uint8_t b[4];
 
-		if constexpr ( SupportsBit16<SPI> )
+		if constexpr ( spi::Support_DataSize_Bit16<SPI> )
 			SPI::setDataSize(SPI::DataSize::Bit8);
 		Dc::reset();
 		SPI::transferBlocking(i(command) << 1);
@@ -115,7 +109,7 @@ class Ili9341SPIInterface: public ili9341, public modm::SpiDevice<SPI>
 	uint8_t
 	readData(Command command)
 	{
-		if constexpr ( SupportsBit16<SPI> )
+		if constexpr ( spi::Support_DataSize_Bit16<SPI> )
 			SPI::setDataSize(SPI::DataSize::Bit8);
 		writeCommand(command);
 		return SPI::transferBlocking(0);

src/modm/platform/spi/at90_tiny_mega/spi.hpp.in

@@ -9,9 +9,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 // ----------------------------------------------------------------------------
-
-#ifndef MODM_AVR_SPI_HPP
-#define MODM_AVR_SPI_HPP
+#pragma once
 
 #include <avr/io.h>
 
@@ -51,10 +49,7 @@
 %% endif
 /// @endcond
 
-namespace modm
-{
-
-namespace platform
+namespace modm::platform
 {
 
 /// @ingroup	modm_platform_spi
@@ -87,8 +82,4 @@ struct Spi
 	typedef Value<State_t, 2> Type_t;
 };
 
-} // namespace platform
-
-} // namespace modm
-
-#endif	// MODM_AVR_SPI_HPP
+} // namespace modm::platform