remove whitespace

src/modm/driver/display/ili9341.hpp

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2019, Mike Wolfram
+ * Copyright (c) 2021, Thomas Sommer
  *
  * This file is part of the modm project.
  *
@@ -15,7 +16,11 @@
 #include <modm/architecture/interface/register.hpp>
 #include <modm/platform/gpio/base.hpp>
 #include <modm/processing/resumable.hpp>
-#include <modm/ui/graphic.hpp>
+
+#include <modm/ui/graphic/display.hpp>
+#include <modm/ui/graphic/buffer.hpp>
+#include <modm/ui/graphic/buffer_bool.hpp>
+// #include <modm/ui/graphic/painter_remote.hpp>
 
 #include "ili9341_interface_parallel.hpp"
 #include "ili9341_interface_spi.hpp"
@@ -28,8 +33,9 @@ namespace modm
 /// @ingroup modm_driver_ili9341
 template<class Interface, class Reset, typename RB = Resolution<32, 32>>
 class Ili9341
-	: public Interface, public Display<color::Rgb565<true>, Resolution<320, 240>>,
-	public ShapePainter<Resolution<320, 240>, true>,
+	: public Interface,
+	// : public RemotePainter<Resolution<320, 240>, Interface>,
+	public Display<color::Rgb565<true>, Resolution<320, 240>>,
 	public FlashPainter<true>
 // TODO LocalPainter must be available so we can Paint directly on ili9341
 // class Ili9341 : public Interface, public Display<color::Rgb565<true>, 320, 240>, public LocalPainter<320, 240>
@@ -43,7 +49,8 @@ class Ili9341
 
 public:
 	template<typename... Args>
-	Ili9341(Args &&...args) : Interface(std::forward<Args>(args)...),
+	Ili9341(Args &&...args) :
+		Interface(std::forward<Args>(args)...),
 		Display<color::Rgb565<true>, Resolution<320, 240>>(color::html::White)
 	{ Reset::setOutput(modm::Gpio::High); }
 
@@ -119,7 +126,7 @@ class Ili9341
 	modm::ResumableResult<void> setClipping(Point point);
 	modm::ResumableResult<void> setClipping(Area area);
 
-	// TODO add final
+	// TODO Add final as soon as RemotePainter is connected
 	// Hardware accelerated drawing directly on the screen
 	modm::ResumableResult<void> drawFast(Point point);
 	modm::ResumableResult<void> drawFast(HLine hline);
@@ -133,8 +140,7 @@ class Ili9341
 		uint16_t buff_cmd16[3];
 		ili9341_register::MemoryAccessCtrl_t madCtrl;
 
-		// Parallel use in resumable function
-		// No overlap permitted!
+		// Parallel use in resumable function: don't overlap!
 		struct {
 			// Buffer for color conversion
 			modm::Buffer<modm::color::Rgb565<true>, RB> bufferRgb565;

src/modm/driver/display/ili9341_interface_spi.hpp

@@ -28,7 +28,7 @@ template<class SpiMaster, class Cs, class Dc>
 class Ili9341InterfaceSpi : public ili9341_register, public modm::SpiDevice< SpiMaster >, protected modm::NestedResumable<4>
 {
 	uint8_t read;
-public:
+protected:
 	Ili9341InterfaceSpi()
 	{
 		this->attachConfigurationHandler([]() {

src/modm/driver/display/ili9341_register.hpp

@@ -1,3 +1,14 @@
+/*
+ * Copyright (c) 2019, Mike Wolfram
+ * Copyright (c) 2021, Thomas Sommer
+ *
+ * This file is part of the modm project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
 #pragma once
 
 #include <modm/math/utils/bit_constants.hpp>
@@ -24,7 +35,8 @@ struct ili9341_register
 		ContentAdaptiveBrightnessCtrl = 0x55,
 		CabcMinimumBrightness = 0x5E,
 	};
-protected:
+
+// protected:
 	enum class Command : uint8_t
 	{
 		Nop = 0x00,

src/modm/driver/display/ssd1306.hpp

@@ -17,7 +17,9 @@
 #include <modm/architecture/interface/i2c_device.hpp>
 #include <modm/architecture/utils.hpp>
 #include <modm/processing/timer.hpp>
-#include <modm/ui/graphic.hpp>
+
+#include <modm/ui/graphic/display.hpp>
+#include <modm/ui/graphic/buffer_bool.hpp>
 
 #include "ssd1306_register.hpp"
 

src/modm/ui/graphic/buffer.hpp

@@ -12,7 +12,7 @@
 #ifndef MODM_BUFFER_HPP
 #define MODM_BUFFER_HPP
 
-#include "painter_shape.hpp"
+#include "painter_local.hpp"
 #include "painter_text.hpp"
 #include "../color.hpp"
 
@@ -25,7 +25,7 @@ namespace modm
  * Colored Graphic buffer
  *
  * @tparam	C	Pixelcolor
- * @tparam	R	Pixels Width and Height
+ * @tparam	R	Resolution with Pixels horizontal and vertical
  *
  * @author		Thomas Sommer
  * @ingroup		modm_ui_graphic
@@ -34,7 +34,7 @@ namespace modm
 // May inherit on modm::Matrix<..> or provide a conversion constructor for modm::Matrix<..>
 template<typename C, typename R>
 requires C::isColor or std::is_same_v<C, bool>
-class Buffer : public ShapePainter<R, false>, public TextPainter<R>
+class Buffer : public LocalPainter<R>, public TextPainter<R>
 {
 public:
 	C color = html::White;

src/modm/ui/graphic/buffer_bool.hpp

@@ -14,22 +14,23 @@
 
 #include <algorithm>
 
-#include "painter_shape.hpp"
+#include "painter_local.hpp"
 #include "painter_text.hpp"
 namespace modm
 {
 
 /**
  * Monochrome Graphic buffer
  *
- * @tparam	R	Pixels Width and Height
+ * @tparam	R	Resolution with Pixels horizontal and vertical
  *
  * @author		Thomas Sommer
  * @ingroup		modm_ui_graphic
  */
 template<typename R>
-class Buffer<bool, R> : public ShapePainter<R, false>, public TextPainter<R>
+class Buffer<bool, R> : public LocalPainter<R>, public TextPainter<R>
 {
+	// Buffer stacks up to 8 pixels in one byte
 	static constexpr size_t HB = (R::H + 7) / 8;
 public:
 	bool color = true;

src/modm/ui/graphic/buffer_bool_impl.hpp

@@ -230,7 +230,7 @@ template<typename R>
 void
 modm::Buffer<bool, R>::drawFast(Point point)
 {
-	// OPTIMIZE evaluate color in ShapePainter ?
+	// OPTIMIZE Switch color in LocalPainter ?
 	if (color)
 		this->buffer[point.y / 8][point.x] |= (1 << point.y % 8);
 	else
@@ -246,7 +246,7 @@ modm::Buffer<bool, R>::drawFast(HLine hline)
 
 	size_t x = hline.start.x;
 
-	// OPTIMIZE evaluate color in ShapePainter ?
+	// OPTIMIZE Switch color in LocalPainter ?
 	if(color)
 		while (x < hline.end_x)
 			buffer[yb][x++] |= byte;
@@ -262,7 +262,7 @@ modm::Buffer<bool, R>::drawFast(VLine vline)
 	size_t yb = vline.start.y / 8;
 	const size_t yb_max = vline.end_y / 8;
 
-	// OPTIMIZE evaluate color in ShapePainter ?
+	// OPTIMIZE Switch color in LocalPainter ?
 	if (color)
 	{
 		uint8_t byte = 0xFF << vline.start.y % 8;  // Mask out top end
@@ -298,7 +298,7 @@ modm::Buffer<bool, R>::drawFast(Area area)
 	const size_t yb_max = area.bottomRight.y / 8;
 	size_t yb = area.topLeft.y / 8;
 
-	// OPTIMIZE evaluate color in ShapePainter
+	// OPTIMIZE Switch color in LocalPainter
 	if (color)
 	{
 		uint8_t byte = 0xFF << area.topLeft.y % 8;  // Mask out top end

src/modm/ui/graphic/canvas.hpp

@@ -34,7 +34,7 @@ struct Resolution{
 /**
  * Baseclass for 2D Graphic Objects like Display and Buffer
  *
- * @tparam	R	Pixels Width and Height
+ * @tparam	R	Resolution with Pixels horizontal and vertical
  *
  * @author		Thomas Sommer
  * @ingroup		modm_ui_graphic