Cleanups

Author: TomSaw

src/modm/driver/display/ili9341.hpp

@@ -19,6 +19,10 @@
 #include <modm/platform/gpio/base.hpp>
 #include <modm/processing/resumable.hpp>
 
+#include <modm/ui/color/rgb_stacked.hpp>
+#include <modm/ui/shape/point.hpp>
+#include <modm/ui/shape/line.hpp>
+#include <modm/ui/shape/section.hpp>
 #include <modm/ui/graphic/style.hpp>
 
 #include <modm/ui/graphic/display.hpp>
@@ -38,7 +42,7 @@ namespace modm
 template<class Interface, class Reset, size_t BC = 512>
 // requires std::derived_from<Painter, RemotePainter<R>>
 class Ili9341 : public Interface,
-	public Display<color::Rgb565, Resolution(320, 240), true>
+	public Display<color::Rgb565, Size(320, 240), true>
 {
 	// OPTIMIZE determine good contraints 
 	static_assert(BC >= 32, "Conversion Buffer < 64 pixels produces too much overhead.");
@@ -59,7 +63,7 @@ class Ili9341 : public Interface,
 	template<typename... Args>
 	Ili9341(Args &&...args)
 		: Interface(std::forward<Args>(args)...),
-		  Display<Rgb565, Resolution(320, 240), true>(color::html::White)
+		  Display<Rgb565, Size(320, 240), true>(color::html::White)
 	{ Reset::setOutput(modm::Gpio::High); }
 
 	~Ili9341(){};

src/modm/driver/display/ili9341_impl.hpp

@@ -154,7 +154,7 @@ modm::Ili9341<Interface, Reset, BC>::setOrientation(
 	this->orientation = orientation;
 
 	using MemoryAccessCtrl = ili9341_register::MemoryAccessCtrl;
-	using OrientationFlags = modm::graphic::OrientationFlags;
+	using OrientationFlags = graphic::OrientationFlags;
 
 	madCtrl = MemoryAccessCtrl::PIXEL_DIR;
 
@@ -268,33 +268,33 @@ template<class Interface, class Reset, size_t BC>
 template<Color C, template<typename> class Accessor>
 modm::ResumableResult<void>
 modm::Ili9341<Interface, Reset, BC>::writeImage(ImageAccessor<C, Accessor> accessor, Point origin) {
-	// Found no cast for d share the memory between all of the writeImage()-methods.
+	// Found no cast for a share the memory between all of the writeImage()-methods.
 	// This waste of RAM will be history once Resumable Functions become history.
-	static ImageAccessor<C, Accessor> d;
+	static ImageAccessor<C, Accessor> a;
 
 	RF_BEGIN();
 
-	d = accessor;
+	a = accessor;
 
-	this->clipping = this->getIntersection(Rectangle(origin, d.getSize()));
+	this->clipping = this->getIntersection(Rectangle(origin, a.getSize()));
 	RF_CALL(updateClipping());
 
 	// FIXME store image locally
-	d.initialize(origin);
+	a.initialize(origin);
 	p.scanner = this->clipping.topLeft;
 
  	while (p.pixels)
 	{
 		// Fill buffer
 		for(p.i = 0; p.i < std::min<uint32_t>(p.pixels, BC); p.i++) {
 			if constexpr (ColorGrayBase2<C>)
-				p.buffer[p.i] = colormap[d.nextPixel().getValue()];
+				p.buffer[p.i] = colormap[a.nextPixel().getValue()];
 			else
-				p.buffer[p.i] = d.nextPixel();
+				p.buffer[p.i] = a.nextPixel();
 
 			if (++p.scanner.y == this->clipping.bottomRight.y) {
 				scannerincrementRow();
-				d.incrementRow();
+				a.incrementRow();
 			}
 		}
 		// Transfer buffer
@@ -310,34 +310,34 @@ template<template<typename> class Accessor>
 modm::ResumableResult<void>
 modm::Ili9341<Interface, Reset, BC>::writeImage(ImageAccessor<ColorType, Accessor> accessor, Point origin)
 {
-	// Found no cast for d share the memory between all of the writeImage()-methods.
+	// Found no cast for a share the memory between all of the writeImage()-methods.
 	// This waste of RAM will be history once Resumable Functions become history.
-	static ImageAccessor<ColorType, Accessor> d;
+	static ImageAccessor<ColorType, Accessor> a;
 
 	RF_BEGIN();
 
-	d = accessor;
+	a = accessor;
 
-	this->clipping = this->getIntersection(Rectangle(origin, d.size));
+	this->clipping = this->getIntersection(Rectangle(origin, a.getSize()));
 	RF_CALL(updateClipping());
 
-	d.initialize(origin);
+	a.initialize(origin);
 
 	// Check if display is exceeded vertically
-	if (origin.y < 0 or origin.y + d.size.y >= this->getHeight())
+	if (origin.y < 0 or origin.y + a.size.y >= this->getHeight())
 	{
  		// Continuous transfer not possible, send row by row
 		p.pixels_bulk = this->clipping.getHeight();
 
 		while(p.pixels >= p.pixels_bulk) {
-			RF_CALL(this->writeData(d.getPointer() + 1, p.pixels_bulk));
-			d.incrementRow();
+			RF_CALL(this->writeData(a.getPointer() + 1, p.pixels_bulk));
+			a.incrementRow();
 			p.pixels -= p.pixels_bulk;
 		}
 	} else
 	{
 		// Transfer buffer in one shot
-		RF_CALL(this->writeData(d.getPointer() + 1, p.pixels));
+		RF_CALL(this->writeData(a.getPointer() + 1, p.pixels));
 	}
 	RF_END();
 }

src/modm/driver/display/ssd1306.hpp

@@ -94,16 +94,16 @@ struct ssd1306 : public ssd1306_register
  */
 template<class I2cMaster, uint16_t H = 64>
 class Ssd1306 : public ssd1306,
-				public graphic::Display<Monochrome, Resolution(128, H), false>,
+				public graphic::Display<Monochrome, Size(128, H), false>,
 				public I2cDevice<I2cMaster, 3, ssd1306::Ssd1306_I2cWriteTransaction>
 {
 	static_assert((H == 64) or (H == 32), "Display height must be either 32 or 64 pixel!");
 public:	
 	using ColorType = Monochrome;
-	using Buffer = graphic::Buffer<ColorType, Resolution(128, H)>;
+	using Buffer = graphic::Buffer<ColorType, Size(128, H)>;
 
 	Ssd1306(uint8_t address = 0x3C)
-		: Display<Monochrome, Resolution(128, H), false>(true), I2cDevice<I2cMaster, 3, ssd1306::Ssd1306_I2cWriteTransaction>(address)
+		: Display<Monochrome, Size(128, H), false>(true), I2cDevice<I2cMaster, 3, ssd1306::Ssd1306_I2cWriteTransaction>(address)
 	{}
 
 	/// Pings the display

src/modm/driver/touch/touch2046.hpp

@@ -11,17 +11,17 @@
  */
 // ----------------------------------------------------------------------------
 
-#ifndef MODM_TOUCH2046_HPP
-#define MODM_TOUCH2046_HPP
+#pragma once
+
+#include <array>
+#include <tuple>
 
 #include <modm/architecture/interface/spi_device.hpp>
 #include <modm/architecture/interface/gpio.hpp>
 #include <modm/processing/resumable.hpp>
-
-#include <array>
-#include <tuple>
 #include <modm/ui/graphic/display.hpp>
-#include <modm/ui/shape/point.hpp>
+
+using namespace modm::shape;
 
 namespace modm
 {
@@ -120,7 +120,7 @@ struct touch2046 {
  *
  * Datasheet TSC2046: https://www.ti.com/lit/ds/symlink/tsc2046.pdf
  */
-template < class SpiMaster, class Cs, Resolution R>
+template < class SpiMaster, class Cs, Size R>
 class Touch2046 : public touch2046, public modm::SpiDevice< SpiMaster >, protected modm::NestedResumable<3>
 {
 public:
@@ -197,9 +197,6 @@ class Touch2046 : public touch2046, public modm::SpiDevice< SpiMaster >, protect
 
 	Orientation orientation = Orientation::Portrait90;
 };
+} // namespace modm
 
-} // modm namespace
-
-#include "touch2046_impl.hpp"
-
-#endif // MODM_TOUCH2046_HPP
+#include "touch2046_impl.hpp"

src/modm/driver/touch/touch2046_impl.hpp

@@ -16,7 +16,7 @@
 
 #include <modm/math/utils/endianness.hpp>
 
-template<class SpiMaster, class Cs, Resolution R>
+template<class SpiMaster, class Cs, Size R>
 modm::ResumableResult<void>
 modm::Touch2046<SpiMaster, Cs, R>::updateZ()
 {
@@ -35,7 +35,7 @@ modm::Touch2046<SpiMaster, Cs, R>::updateZ()
 	RF_END_RETURN();
 }
 
-template<class SpiMaster, class Cs, Resolution R>
+template<class SpiMaster, class Cs, Size R>
 modm::ResumableResult<void>
 modm::Touch2046<SpiMaster, Cs, R>::updateXY()
 {
@@ -59,7 +59,7 @@ modm::Touch2046<SpiMaster, Cs, R>::updateXY()
 	RF_END_RETURN();
 }
 
-template<class SpiMaster, class Cs, Resolution R>
+template<class SpiMaster, class Cs, Size R>
 modm::ResumableResult<bool>
 modm::Touch2046<SpiMaster, Cs, R>::isTouched()
 {
@@ -68,7 +68,7 @@ modm::Touch2046<SpiMaster, Cs, R>::isTouched()
 	RF_END_RETURN(z > cal.ThresholdZ);
 }
 
-template<class SpiMaster, class Cs, Resolution R>
+template<class SpiMaster, class Cs, Size R>
 modm::ResumableResult<modm::shape::Point>
 modm::Touch2046<SpiMaster, Cs, R>::getTouchPoint()
 {
@@ -85,7 +85,7 @@ modm::Touch2046<SpiMaster, Cs, R>::getTouchPoint()
 	RF_END();
 }
 
-template<class SpiMaster, class Cs, Resolution R>
+template<class SpiMaster, class Cs, Size R>
 modm::ResumableResult<std::tuple<uint16_t, uint16_t>>
 modm::Touch2046<SpiMaster, Cs, R>::getTouchPosition()
 {

src/modm/ui/graphic/accessor_image.hpp

@@ -16,11 +16,9 @@
 #include <modm/architecture/interface/accessor.hpp>
 #include <modm/math/utils/bit_constants.hpp>
 
-#include <modm/ui/color.hpp>
+#include <modm/ui/color/concepts.hpp>
 #include <modm/ui/shape/point.hpp>
 
-using namespace modm::color;
-
 namespace modm::graphic
 {
 template<class C, template<typename> class>
@@ -32,13 +30,13 @@ class ImageAccessor;
  * @tparam C 			colormodel
  * @tparam Accessor 	Ram or Flash accessor
  */
-template<Color C, template<typename> class Accessor>
+template<color::Color C, template<typename> class Accessor>
 class ImageAccessor<C, Accessor> : public Accessor<C>
 {
 public:
 	ImageAccessor() = default;
 
-	ImageAccessor(const C* addr, modm::shape::Point size) : Accessor<C>(addr), size(size) {}
+	ImageAccessor(const C* addr, shape::Size size) : Accessor<C>(addr), size(size) {}
 
 	ImageAccessor(const C* addr) : Accessor<C>(addr + 2) {
 		auto flash = modm::accessor::asFlash(addr);
@@ -50,14 +48,14 @@ class ImageAccessor<C, Accessor> : public Accessor<C>
 	{}
 
 	void
-	initialize(const modm::shape::Point origin)
+	initialize(const shape::Point origin)
 	{
-		const Point topLeft = {origin.x < 0 ? -origin.x : 0, origin.y < 0 ? -origin.y : 0};
+		const shape::Point topLeft = {origin.x < 0 ? -origin.x : 0, origin.y < 0 ? -origin.y : 0};
 		this->address += topLeft.x * size.y + topLeft.y - 1;
 		addr_top = this->address;
 	}
 
-	modm::shape::Point getSize() const {
+	shape::Size getSize() const {
 		return size;
 	}
 
@@ -76,7 +74,7 @@ class ImageAccessor<C, Accessor> : public Accessor<C>
 	}
 
 private:
-	modm::shape::Point size;
+	shape::Size size;
 	const C* addr_top;
 };
 

src/modm/ui/graphic/accessor_image_gray.hpp

@@ -12,9 +12,8 @@
 #pragma once
 #include "accessor_image.hpp"
 
-#include <modm/ui/color/gray.hpp>
-
-using namespace modm::color;
+#include <modm/ui/color/concepts.hpp>
+#include <modm/ui/shape/point.hpp>
 
 namespace modm::graphic
 {
@@ -23,35 +22,35 @@ namespace modm::graphic
  * @brief		Image accessor for stackked grayscale image data
  * 
  */
-template<ColorGrayBase2 G, template<typename> class Accessor>
-class ImageAccessor<G, Accessor> : public Accessor<typename G::ValueType>
+template<color::ColorGrayBase2 C, template<typename> class Accessor>
+class ImageAccessor<C, Accessor> : public Accessor<typename C::ValueType>
 {
 public:
 	ImageAccessor() = default;
 
-	ImageAccessor(const G::ValueType* addr, modm::shape::Point size) : Accessor<typename G::ValueType>(addr), size(size) {}
+	ImageAccessor(const C::ValueType* addr, shape::Point size) : Accessor<typename C::ValueType>(addr), size(size) {}
 
-	ImageAccessor(const G::ValueType* addr) : Accessor<typename G::ValueType>(addr + 2)
+	ImageAccessor(const C::ValueType* addr) : Accessor<typename C::ValueType>(addr + 2)
 	{
 		auto flash = modm::accessor::asFlash(addr);
 		size = {flash[0], flash[1]};
 	}
 
-	ImageAccessor(const BufferInterface<G>* buffer)
-		: Accessor<typename G::ValueType>(buffer->getBuffer()), size(buffer->getSize())
+	ImageAccessor(const BufferInterface<C>* buffer)
+		: Accessor<typename C::ValueType>(buffer->getBuffer()), size(buffer->getSize())
 	{}
 
 	inline void
-	initialize(const modm::shape::Point origin)
+	initialize(const shape::Point origin)
 	{
-		const Point topLeft = {origin.x < 0 ? -origin.x : 0, origin.y < 0 ? -origin.y : 0};
+		const shape::Point topLeft = {origin.x < 0 ? -origin.x : 0, origin.y < 0 ? -origin.y : 0};
 
-		addr_top = this->address + (topLeft.y * G::Digits / 8) * size.x + topLeft.x;
-		rotl_top = topLeft.y * G::Digits % 8;
+		addr_top = this->address + (topLeft.y * C::Digits / 8) * size.x + topLeft.x;
+		rotl_top = topLeft.y * C::Digits % 8;
 		incrementRow();
 	}
 
-	modm::shape::Point getSize() const {
+	shape::Size getSize() const {
 		return size;
 	}
 
@@ -64,33 +63,33 @@ class ImageAccessor<G, Accessor> : public Accessor<typename G::ValueType>
 		// if (rotl_top == digits)
 		// 	this->address -= size.x;
 
-		byte = std::rotr(Accessor<uint8_t>::operator*(), rotl_top - G::Digits);
+		byte = std::rotr(Accessor<uint8_t>::operator*(), rotl_top - C::Digits);
 	}
 
-	inline G
+	inline C
 	nextPixel()
 	{
-		rotl += G::Digits;
- 		if (rotl > numeric_limits<typename G::ValueType>::digits)
+		rotl += C::Digits;
+ 		if (rotl > numeric_limits<typename C::ValueType>::digits)
 		{
 			this->address += size.x;
 			byte = Accessor<uint8_t>::operator*();
-			rotl = G::Digits;
+			rotl = C::Digits;
 		} else {
-			byte = std::rotr(byte, G::Digits);
+			byte = std::rotr(byte, C::Digits);
 		}
 
-		return byte & G::max;
+		return byte & C::max;
 	}
 private:
-	modm::shape::Point size;
+	shape::Size size;
 
 	// init state
-	const G::ValueType* addr_top;
+	const C::ValueType* addr_top;
 	int8_t rotl_top;
 
 	// reader state
-	G::ValueType byte;
+	C::ValueType byte;
 	int8_t rotl;
 };
 }  // namespace modm::graphic