improved driver::ili9341 using Spi::transfer<16>

Author: TomSaw

src/modm/driver/display/ili9341_impl.hpp

@@ -202,10 +202,9 @@ void
 Ili9341<Interface, Reset, Backlight, BufferSize>::drawHorizontalLine(
 		glcd::Point start, uint16_t length)
 {
-	uint16_t const pixelValue { modm::toBigEndian(foregroundColor.color) };
 	auto minLength { std::min(std::size_t(length), BufferSize) };
 	uint16_t *buffer16 { reinterpret_cast<uint16_t *>(buffer) };
-	std::fill(buffer16, buffer16+minLength, pixelValue);
+	std::fill(buffer16, buffer16+minLength, foregroundColor.color);
 
 	BatchHandle h(*this);
 
@@ -223,10 +222,9 @@ void
 Ili9341<Interface, Reset, Backlight, BufferSize>::drawVerticalLine(
 		glcd::Point start, uint16_t length)
 {
-	uint16_t const pixelValue { modm::toBigEndian(foregroundColor.color) };
 	auto minLength { std::min(std::size_t(length), BufferSize) };
 	uint16_t *buffer16 { reinterpret_cast<uint16_t *>(buffer) };
-	std::fill(buffer16, buffer16+minLength, pixelValue);
+	std::fill(buffer16, buffer16+minLength, foregroundColor.color);
 
 	BatchHandle h(*this);
 
@@ -248,10 +246,9 @@ Ili9341<Interface, Reset, Backlight, BufferSize>::fillRectangle(
 	auto const y { upperLeft.getY() };
 	std::size_t pixelCount { std::size_t(width) * std::size_t(height) };
 
-	uint16_t const pixelValue { modm::toBigEndian(foregroundColor.color) };
 	auto minLength { std::min(std::size_t(pixelCount), BufferSize) };
 	uint16_t *buffer16 { reinterpret_cast<uint16_t *>(buffer) };
-	std::fill(buffer16, buffer16+minLength, pixelValue);
+	std::fill(buffer16, buffer16+minLength, foregroundColor.color);
 
 	BatchHandle h(*this);
 
@@ -270,9 +267,6 @@ void
 Ili9341<Interface, Reset, Backlight, BufferSize>::fillCircle(
 		glcd::Point center, uint16_t radius)
 {
-	uint8_t const setColor[] { uint8_t((foregroundColor.color >> 8) & 0xff),
-			uint8_t(foregroundColor.color & 0xff) };
-
 	int16_t f = 1 - radius;
 	int16_t ddF_x = 0;
 	int16_t ddF_y = -2 * radius;
@@ -283,7 +277,7 @@ Ili9341<Interface, Reset, Backlight, BufferSize>::fillCircle(
 
 	setClipping(center.getX() - radius, center.getY(), 2 * radius, 1);
 	for (std::size_t i = 0; i < 2 * radius; ++i)
-		this->writeData(setColor, 2);
+		this->writeData(foregroundColor.color);
 
 	while(x < y)
 	{
@@ -299,16 +293,16 @@ Ili9341<Interface, Reset, Backlight, BufferSize>::fillCircle(
 
 		setClipping(center.getX() - x, center.getY() - y, 2 * x, 1);
 		for (std::size_t i = 0; i < 2 * x; ++i)
-			this->writeData(setColor, 2);
+			this->writeData(foregroundColor.color);
 		setClipping(center.getX() - y, center.getY() - x, 2 * y, 1);
 		for (std::size_t i = 0; i < 2 * y; ++i)
-			this->writeData(setColor, 2);
+			this->writeData(foregroundColor.color);
 		setClipping(center.getX() - x, center.getY() + y, 2 * x, 1);
 		for (std::size_t i = 0; i < 2 * x; ++i)
-			this->writeData(setColor, 2);
+			this->writeData(foregroundColor.color);
 		setClipping(center.getX() - y, center.getY() + x, 2 * y, 1);
 		for (std::size_t i = 0; i < 2 * y; ++i)
-			this->writeData(setColor, 2);
+			this->writeData(foregroundColor.color);
 	}
 }
 
@@ -317,11 +311,6 @@ void
 Ili9341<Interface, Reset, Backlight, BufferSize>::drawImageRaw(glcd::Point upperLeft,
 		uint16_t width, uint16_t height, modm::accessor::Flash<uint8_t> data)
 {
-	uint8_t const setColor[] { uint8_t((foregroundColor.color >> 8) & 0xff),
-			uint8_t(foregroundColor.color & 0xff) };
-	uint8_t const clearColor[] { uint8_t((backgroundColor.color >> 8) & 0xff),
-			uint8_t(backgroundColor.color & 0xff) };
-
 	BatchHandle h(*this);
 
 	setClipping(upperLeft.getX(), upperLeft.getY(), width, height);
@@ -333,9 +322,9 @@ Ili9341<Interface, Reset, Backlight, BufferSize>::drawImageRaw(glcd::Point upper
 		{
 			uint8_t byte = data[(r / 8) * width + w];
 			if (byte & bit)
-				this->writeData(setColor, 2);
+				this->writeData(foregroundColor.color);
 			else
-				this->writeData(clearColor, 2);
+				this->writeData(backgroundColor.color);
 		}
 		// TODO: optimize, use ROL (rotate left)
 		bit <<= 1;
@@ -351,13 +340,8 @@ Ili9341<Interface, Reset, Backlight, BufferSize>::drawRaw(glcd::Point upperLeft,
 {
 	BatchHandle h(*this);
 
-	uint16_t* buffer = (uint16_t*)data;
-	for(size_t i = 0; i < size_t(width*height); i++) {
-		buffer[i] = modm::fromBigEndian(buffer[i]);
-	}
-
 	setClipping(upperLeft.getX(), upperLeft.getY(), width, height);
-	this->writeData((uint8_t*)buffer, width * height * 2);
+	this->writeData(data, width * height);
 }
 
 template <class Interface, class Reset, class Backlight, std::size_t BufferSize>
@@ -391,13 +375,10 @@ void
 Ili9341<Interface, Reset, Backlight, BufferSize>::setColoredPixel(
 		int16_t x, int16_t y, color::Rgb565 const &color)
 {
-	auto const pixelColor { color };
-	uint8_t const setColor[] { uint8_t((pixelColor.color >> 8) & 0xff), uint8_t(pixelColor.color & 0xff) };
-
 	BatchHandle h(*this);
 
 	this->setClipping(x, y, 1, 1);
-	this->writeData(setColor, 2);
+	this->writeData(foregroundColor.color);
 }
 
 template <class Interface, class Reset, class Backlight, std::size_t BufferSize>

src/modm/driver/display/ili9341_spi.hpp

@@ -55,6 +55,17 @@ class Ili9341SPIInterface: public ili9341, public modm::SpiDevice<SPI>
 	{
 		SPI::transferBlocking(const_cast<unsigned char *>(data), nullptr, length);
 	}
+
+	writeData(color::Rgb565 data)
+	{
+		SPI::template transferBlocking<16>(data.value);
+	}
+
+	writeData(color::Rgb565 const *data, std::size_t length)
+	{
+		SPI::template transferBlocking<16>((uint16_t*)(data), nullptr, length);
+	}
+
 	void
 	writeCommandValue8(Command command, uint8_t value)
 	{