remove whitespace

TomSaw · TomSaw · commit 8f9a708ce6fd · 2021-07-29T18:47:30.000+02:00
diff --git a/src/modm/driver/display/ili9341_impl.hpp b/src/modm/driver/display/ili9341_impl.hpp
@@ -52,7 +52,7 @@ modm::Ili9341<Interface, Reset, RB>::initialize()
 	RF_CALL(this->writeCommand(Command::VComCtrl2, 0xb7));
 	// constexpr uint8_t pumpRatioCtrl[] { 0x20 };
 	RF_CALL(this->writeCommand(Command::PixelFormatSet, 0x55));
-	
+
 	MODM_INIT_BUFFER({0x00, 0x1a})
 	RF_CALL(this->writeCommand(Command::FrameCtrlNormalMode, buff_cmd8, 2));
 
@@ -247,7 +247,7 @@ modm::Ili9341<Interface, Reset, RB>::writeBuffer(
 
  	if constexpr(std::max(RB::W, RB::H) > 240) {
 		if(R::W > this->getWidth() ) {
-			// writeBuffer(buffer, origin) can handle off-canvas drawing 
+			// writeBuffer(buffer, origin) can handle off-canvas drawing
 			RF_CALL(writeBuffer(buffer, {0, 0}));
 			RF_RETURN();
 		}
@@ -272,7 +272,7 @@ modm::Ili9341<Interface, Reset, RB>::writeBuffer(
 	RF_BEGIN();
 
 	p.intersection = this->getIntersection(Rectangle(origin, R::asPoint()));
-	
+
 	RF_CALL(setClipping(p.intersection));
 	// FIXME involve p.intersection
 	RF_CALL(this->writeData(this->getPlainBuffer(buffer), p.intersection.getPixels() * 2));
@@ -298,7 +298,7 @@ modm::Ili9341<Interface, Reset, RB>::writeBuffer(
 	{
 		// Convert tile
 		p.bufferRgb565.writeBuffer(buffer, -p.bufferRgb565_pos);
-		
+
 		// Transfer tile
 		RF_CALL(writeBuffer(p.bufferRgb565, origin + p.bufferRgb565_pos));
 		// Transfer tile alternative:
@@ -325,13 +325,13 @@ modm::ResumableResult<void>
 modm::Ili9341<Interface, Reset, RB>::drawFlash(modm::accessor::Flash<uint8_t> data,
 		uint16_t width, uint16_t height, shape::Point origin) {
 	RF_BEGIN();
-	
+
 	(void)data;
 	(void)width;
 	(void)height;
-	(void)origin;	
+	(void)origin;
 
-	RF_END();	
+	RF_END();
 }
 
 // ---------------------------------------------------------------------------
@@ -369,7 +369,7 @@ modm::ResumableResult<void>
 modm::Ili9341<Interface, Reset, RB>::drawFast(Area area)
 {
 	RF_BEGIN();
-	
+
 	p.write_pixels = area.getPixels();
 	RF_CALL(setClipping(area));
 
diff --git a/src/modm/driver/display/ili9341_interface_spi.hpp b/src/modm/driver/display/ili9341_interface_spi.hpp
@@ -138,7 +138,7 @@ class Ili9341InterfaceSpi : public ili9341_register, public modm::SpiDevice< Spi
 	readData(Command command)
 	{
 		RF_BEGIN();
-		
+
 		RF_WAIT_UNTIL(this->acquireMaster());
 		Cs::reset();
 
@@ -147,7 +147,7 @@ class Ili9341InterfaceSpi : public ili9341_register, public modm::SpiDevice< Spi
 		Dc::set();
 
 		read = RF_CALL(SpiMaster::transfer(0x00)).getResult();
-		
+
 		if (this->releaseMaster())
 			Cs::set();
 
diff --git a/src/modm/driver/display/ili9341_register.hpp b/src/modm/driver/display/ili9341_register.hpp
@@ -29,7 +29,7 @@ struct ili9341_register
 	{
 		Nop = 0x00,
 		SwReset = 0x01,
-		
+
 		GammaSet = 0x26,
 		ColumnAddressSet = 0x2A,
 		PageAddressSet = 0x2B,
@@ -39,7 +39,7 @@ struct ili9341_register
 
 		PartialMode = 0x12,
 		NormalMode = 0x13,
-		
+
 		PartialArea = 0x30,
 		VerticalScrollDefinition = 0x33,
 		MemoryAccessCtrl = 0x36,
@@ -50,7 +50,7 @@ struct ili9341_register
 		ReadMemoryContinue = 0x3E,
 		SetTearScanLine = 0x44,
 		GetScanLine = 0x45,
-	
+
 		// Extended
 		RgbInterfaceSignalCtrl = 0xB0,
 		FrameCtrlNormalMode = 0xB1,
@@ -90,7 +90,7 @@ struct ili9341_register
 	enum class ReadCommand : uint8_t {
 		// TODO got 0s only for each of ReadId*
 		Id = 0x04,				// returns 4 bytes
-		Id1 = 0xDA,				
+		Id1 = 0xDA,
 		Id2 = 0xDB,
 		Id3 = 0xDC,
 		Id4 = 0xD3,
diff --git a/src/modm/driver/display/ssd1306.hpp b/src/modm/driver/display/ssd1306.hpp
@@ -159,7 +159,7 @@ class Ssd1306 : public ssd1306,
 	/* pos.y rounds to multiples of 8
 	 * Arbitrary pos.y must be concidered whilst drawing into buffer
 	 */
-	
+
 	// Write monochrome Buffer - uses {0, 0} as position
 	template <typename R_>
 	modm::ResumableResult<bool>
@@ -172,7 +172,7 @@ class Ssd1306 : public ssd1306,
 
 protected:
 	shape::Point bottom_right;
-	
+
 	virtual modm::ResumableResult<bool>
 	setClipping(shape::Area area);
 
diff --git a/src/modm/driver/display/ssd1306_impl.hpp b/src/modm/driver/display/ssd1306_impl.hpp
@@ -196,7 +196,7 @@ modm::Ssd1306<I2cMaster, H>::writeBuffer(Buffer<bool, R_> &buffer)
 {
 	// TODO substitute static_assert with concept, so this implementation would be omitted
 	static_assert(R_::W <= 128, "Buffer to wide to be written fast. Use writeBuffer(buffer, {0, 0} instead)");
-	
+
 	RF_BEGIN();
 
 	static constexpr uint16_t Wclip = R_::W <= 128 ? R_::W : 128;
diff --git a/src/modm/ui/graphic/buffer.hpp b/src/modm/ui/graphic/buffer.hpp
@@ -103,7 +103,7 @@ class Buffer : public ShapePainter<R, false>, public TextPainter<R>
 	void
 	writeBuffer(const Buffer<bool, R_> &other,
 		shape::Point origin = {0, 0});
-		
+
 	void
 	drawFlash(modm::accessor::Flash<uint8_t> data, uint16_t width, uint16_t height,
 		shape::Point origin) final;
@@ -121,7 +121,7 @@ class Buffer : public ShapePainter<R, false>, public TextPainter<R>
 	void drawFast(HLine hline) final;
 	void drawFast(VLine vline) final;
 	void drawFast(Area area) final;
-	
+
 private:
 	template<typename C_>
 	void
diff --git a/src/modm/ui/graphic/buffer_impl.hpp b/src/modm/ui/graphic/buffer_impl.hpp
@@ -89,7 +89,7 @@ modm::Buffer<C, R>::writeBuffer(
 
 	Point scanner = intersection.topLeft;
 	size_t x_other = otherTopLeft.x;
-	
+
 	while (scanner.x < intersection.bottomRight.x)
 	{
 		uint8_t bit = bit_top;
diff --git a/src/modm/ui/graphic/canvas.hpp b/src/modm/ui/graphic/canvas.hpp
@@ -81,7 +81,7 @@ class Canvas
 			origin.y < 0 ? -origin.y : 0
 		};
 	}
-	
+
 protected:
 	bool
 	xInCanvas(int16_t x) const
diff --git a/src/modm/ui/graphic/display.hpp b/src/modm/ui/graphic/display.hpp
@@ -36,7 +36,7 @@ enum Orientation : uint8_t
 
 /**
  * Baseclass for Graphic Display
- * 
+ *
  * @tparam		C	Resolution: Pixel-color. Pass one of modm::ui::color::* or bool for a monochrome buffer
  * @tparam		R	Resolution: Pixel-count in horizontal and vertical direction
  *
diff --git a/src/modm/ui/graphic/painter_flash.hpp b/src/modm/ui/graphic/painter_flash.hpp
@@ -20,7 +20,7 @@ namespace modm
 
 /**
  * Painter for Images stored in flash-memory
- * 
+ *
  * @tparam	RF	true: Resumable Functions, false: Normal functions
  *
  * @author		Thomas Sommer
diff --git a/src/modm/ui/graphic/painter_shape.hpp b/src/modm/ui/graphic/painter_shape.hpp
@@ -55,7 +55,7 @@ template<typename R, bool RF>
 class ShapePainter : protected std::conditional_t<RF, ResumableShapePainter, NullClass>, virtual public Canvas<R>
 {
 	using returnType = std::conditional_t<RF, modm::ResumableResult<void>, void>;
-	
+
 protected:
 	ShapePainter() = default;
 
diff --git a/src/modm/ui/graphic/painter_shape_impl.hpp b/src/modm/ui/graphic/painter_shape_impl.hpp
@@ -61,10 +61,10 @@ modm::ShapePainter<R, RF>::draw(Line line)
 
 			drawFast(VLine(line));
 		}
-	} else 
+	} else
 	{
 		line.clip(this->asArea());
-		
+
 		// Bresenham algorithm
 		const Point delta = line.end - line.start;
 		const bool steep = std::abs(delta.y) > std::abs(delta.x);
@@ -181,7 +181,7 @@ modm::ShapePainter<R, RF>::draw(Rectangle rectangle, uint16_t radius, Style styl
 			// OPTIMIZE There's potential for more recycling
 			if (this->yInCanvas(rectangle.origin.y))
 				drawFast(HLine({center.x - circle_off.x, rectangle.origin.y}, center.x + circle_off.x));
-			
+
 			if (this->yInCanvas(rectangle.getBottomRight().y))
 				drawFast(HLine({center.x - circle_off.x, rectangle.getBottomRight().y}, center.x + circle_off.x));
 
diff --git a/src/modm/ui/graphic/painter_text.hpp b/src/modm/ui/graphic/painter_text.hpp
@@ -79,7 +79,7 @@ class TextPainter : public FlashPainter<false>, public IOStream, virtual public
 	 */
 	static uint16_t
 	getStringWidth(const char *s, const modm::accessor::Flash<uint8_t> *font);
-    
+
 private:
 	// Interface class for the IOStream
 	class Writer : public IODevice
diff --git a/src/modm/ui/shape/circle.hpp b/src/modm/ui/shape/circle.hpp
@@ -27,7 +27,7 @@ class Circle : public Shape
 
 	/**
 	 * @brief Construct a new Circle object
-	 * 
+	 *
 	 * @param center 	Center of the circle
 	 * @param radius 	Radius of the circle
 	 */
diff --git a/src/modm/ui/shape/line.hpp b/src/modm/ui/shape/line.hpp
@@ -22,7 +22,7 @@ class Line : public Shape
 
 	/**
 	 * @brief Construct a new Line object
-	 * 
+	 *
 	 * @param start		Start point of the line
 	 * @param end 		End point of the line
 	 */
@@ -79,7 +79,7 @@ class HLine
 public:
 	Point start;
 	uint16_t end_x;
-	
+
 	HLine(Point start, uint16_t end_x) : start(start), end_x(end_x) {}
 
 	HLine(Line line) : start(line.start), end_x(line.end.x) {}
@@ -90,9 +90,9 @@ class VLine
 public:
 	Point start;
 	uint16_t end_y;
-	
+
 	VLine(Point start, uint16_t end_y) : start(start), end_y(end_y) {}
-	
+
 	VLine(Line line) : start(line.start), end_y(line.end.y) {}
 };
 }  // namespace modm
diff --git a/src/modm/ui/shape/rectangle.hpp b/src/modm/ui/shape/rectangle.hpp
@@ -29,15 +29,15 @@ class Rectangle : public Shape
 {
 public:
 	Point origin, size;
-	
+
 	/**
 	 * @brief Construct a new Rectangle object
-	 * 
+	 *
 	 * @param origin 	Top left corner of the Rectangle
 	 * @param size 		Size x and y of the Rectangle
 	 */
 	Rectangle(Point origin, Point size) : origin(origin), size(size) {}
-	
+
 	// Conversion from other shapes
 	Rectangle(Area area);
 	Rectangle(Circle circle);
@@ -46,7 +46,7 @@ class Rectangle : public Shape
 	getBottomRight() const {
 		return origin + size;
 	}
-	
+
 	Point
 	getCenter() const {
 		return origin + size / 2;
diff --git a/src/modm/ui/shape/triangle.hpp b/src/modm/ui/shape/triangle.hpp
@@ -19,7 +19,7 @@ class Triangle : public Shape
 {
 public:
 	Point a, b, c;
-    
+
 	Triangle(Point a, Point b, Point c) : a(a), b(b), c(c) {}
 };
 }  // namespace modm

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ modm::Ssd1306<I2cMaster, H>::writeBuffer(Buffer<bool, R_> &buffer)`
`196`	`196`	`{`
`197`	`197`	`// TODO substitute static_assert with concept, so this implementation would be omitted`
`198`	`198`	`static_assert(R_::W <= 128, "Buffer to wide to be written fast. Use writeBuffer(buffer, {0, 0} instead)");`
`199`		`-`
	`199`	`+`
`200`	`200`	`RF_BEGIN();`
`201`	`201`
`202`	`202`	`static constexpr uint16_t Wclip = R_::W <= 128 ? R_::W : 128;`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ modm::Buffer<C, R>::writeBuffer(`
`89`	`89`
`90`	`90`	`Point scanner = intersection.topLeft;`
`91`	`91`	`size_t x_other = otherTopLeft.x;`
`92`		`-`
	`92`	`+`
`93`	`93`	`while (scanner.x < intersection.bottomRight.x)`
`94`	`94`	`{`
`95`	`95`	`uint8_t bit = bit_top;`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ class Canvas`
`81`	`81`	`origin.y < 0 ? -origin.y : 0`
`82`	`82`	`};`
`83`	`83`	`}`
`84`		`-`
	`84`	`+`
`85`	`85`	`protected:`
`86`	`86`	`bool`
`87`	`87`	`xInCanvas(int16_t x) const`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ enum Orientation : uint8_t`
`36`	`36`
`37`	`37`	`/**`
`38`	`38`	`* Baseclass for Graphic Display`
`39`		`- *`
	`39`	`+ *`
`40`	`40`	`* @tparam C Resolution: Pixel-color. Pass one of modm::ui::color::* or bool for a monochrome buffer`
`41`	`41`	`* @tparam R Resolution: Pixel-count in horizontal and vertical direction`
`42`	`42`	`*`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ namespace modm`
`20`	`20`
`21`	`21`	`/**`
`22`	`22`	`* Painter for Images stored in flash-memory`
`23`		`- *`
	`23`	`+ *`
`24`	`24`	`* @tparam RF true: Resumable Functions, false: Normal functions`
`25`	`25`	`*`
`26`	`26`	`* @author Thomas Sommer`