[display] Swap x/y data buffer of monochrome display

Author: TomSaw

src/modm/driver/display/max7219_matrix_horizontal.hpp

@@ -95,7 +95,7 @@ Max7219MatrixHorizontal<SPI, CS, COLUMNS, ROWS>::update()
             // a group of eight pixels horizontal
             for (uint8_t col = 0; col < COLUMNS; ++col)
             {
-                buf[--idx] = this->buffer[row * 8 + ledCol][col];
+                buf[--idx] = this->buffer[col][row * 8 + ledCol];
             }
         }
 

src/modm/ui/display/monochrome_graphic_display.hpp

@@ -76,7 +76,7 @@ class MonochromeGraphicDisplay : public GraphicDisplay
 	clear() final;
 
 protected:
-	uint8_t buffer[BufferWidth][BufferHeight];
+	uint8_t buffer[BufferHeight][BufferWidth];
 };
 }  // namespace modm
 

src/modm/ui/display/monochrome_graphic_display_impl.hpp

@@ -22,6 +22,6 @@ template<int16_t Width, int16_t Height, std::size_t BufferWidth, std::size_t Buf
 void
 modm::MonochromeGraphicDisplay<Width, Height, BufferWidth, BufferHeight>::clear()
 {
-	std::fill(&buffer[0][0], &buffer[BufferWidth][BufferHeight], 0);
-	this->cursor = glcd::Point(0, 0);
+	std::fill(&buffer[0][0], &buffer[0][0] + sizeof(buffer), 0);
+	this->cursor = {0, 0};
 }

src/modm/ui/display/monochrome_graphic_display_vertical_impl.hpp

@@ -25,23 +25,11 @@ modm::MonochromeGraphicDisplayVertical<Width, Height>::drawHorizontalLine(glcd::
 	{
 		const int16_t y = start.y / 8;
 
-		// TODO Implement draw / clear pixels for monochrome displays
-		// if (draw mode)
-		// {
 		const uint8_t byte = 1 << (start.y % 8);
 		for (int_fast16_t x = start.x; x < static_cast<int16_t>(start.x + length); ++x)
 		{
-			if (x < Width) { this->buffer[x][y] |= byte; }
+			if (x < Width) { this->buffer[y][x] |= byte; }
 		}
-		// } else
-		// {
-		// 	const uint8_t byte = ~(1 << (start.y % 8));
-		// 	for (int_fast16_t x = start.x; x < static_cast<int16_t>(start.x + length);
-		// ++x)
-		// 	{
-		// 		if (x < Width and y < Height) { this->buffer[x][y] &= byte; }
-		// 	}
-		// }
 	}
 }
 
@@ -62,7 +50,7 @@ modm::MonochromeGraphicDisplayVertical<Width, Height>::drawVerticalLine(glcd::Po
 		{
 			if (y < Height / 8)
 			{
-				this->buffer[start.x][y] |= byte;
+				this->buffer[y][start.x] |= byte;
 				byte = 0xFF;
 			}
 			y++;
@@ -71,7 +59,7 @@ modm::MonochromeGraphicDisplayVertical<Width, Height>::drawVerticalLine(glcd::Po
 		if (y < Height / 8)
 		{
 			byte &= 0xFF >> (8 - end_y % 8);
-			this->buffer[start.x][y] |= byte;
+			this->buffer[y][start.x] |= byte;
 		}
 	}
 }
@@ -97,7 +85,7 @@ modm::MonochromeGraphicDisplayVertical<Width, Height>::drawImageRaw(
 
 					if (x < Width and y < Height)
 					{
-						this->buffer[x][y] = data[i + k * width];
+						this->buffer[y][x] = data[i + k * width];
 					}
 				}
 			}
@@ -112,14 +100,14 @@ template<int16_t Width, int16_t Height>
 void
 modm::MonochromeGraphicDisplayVertical<Width, Height>::setPixel(int16_t x, int16_t y)
 {
-	if (x < Width and y < Height) { this->buffer[x][y / 8] |= (1 << y % 8); }
+	if (x < Width and y < Height) { this->buffer[y / 8][x] |= (1 << y % 8); }
 }
 
 template<int16_t Width, int16_t Height>
 void
 modm::MonochromeGraphicDisplayVertical<Width, Height>::clearPixel(int16_t x, int16_t y)
 {
-	if (x < Width and y < Height) { this->buffer[x][y / 8] &= ~(1 << y % 8); }
+	if (x < Width and y < Height) { this->buffer[y / 8][x] &= ~(1 << y % 8); }
 }
 
 template<int16_t Width, int16_t Height>
@@ -128,7 +116,7 @@ modm::MonochromeGraphicDisplayVertical<Width, Height>::getPixel(int16_t x, int16
 {
 	if (x < Width and y < Height)
 	{
-		return (this->buffer[x][y / 8] & (1 << y % 8));
+		return (this->buffer[y / 8][x] & (1 << y % 8));
 	} else
 	{
 		return false;