Merge branch 'moononournation:master' into master

Author: mathertel

examples/PDQgraphicstest/Arduino_GFX_dev_device.h

@@ -48,6 +48,7 @@
 // #define XIAO_ESP32C3_ROUND_DISPLAY
 // #define XIAO_ESP32S3_ROUND_DISPLAY
 // #define WAVESHARE_ESP32_S3_LCD_2_8
+// #define WAVESHARE_ESP32_C6_LCD_1_47
 // #define WAVESHARE_RP2040_LCD_0_96
 // #define WZ8048C050 // or called "Elecrow Wizee-ESP32"
 // #define ZX2D10GE10R_V4848
@@ -684,6 +685,12 @@ Arduino_RGB_Display *gfx = new Arduino_RGB_Display(
 Arduino_DataBus *bus = new Arduino_HWSPI(41 /* DC */, 42 /* CS */, 40 /* SCK */, 45 /* MOSI */, 46 /* MISO */);
 Arduino_GFX *gfx = new Arduino_ST7789(bus, 39 /* RST */, 0 /* rotation */, true /* IPS */);
 
+#elif defined(WAVESHARE_ESP32_C6_LCD_1_47)
+#define GFX_DEV_DEVICE WAVESHARE_ESP32_C6_LCD_1_47
+#define GFX_BL 22
+Arduino_DataBus *bus = new Arduino_HWSPI(15 /* DC */, 14 /* CS */, 7 /* SCK */, 6 /* MOSI */, 5 /* MISO */);
+Arduino_GFX *gfx = new Arduino_ST7789(bus, 21 /* RST */, 0 /* rotation */, true /* IPS */, 172 /* width */, 320 /* height */, 34 /* col offset 1 */, 0 /* row offset 1 */, 34 /* col offset 2 */, 0 /* row offset 2 */);
+
 #elif defined(WAVESHARE_RP2040_LCD_0_96)
 #define GFX_DEV_DEVICE WAVESHARE_RP2040_LCD_0_96
 #define GFX_BL 25

src/Arduino_DataBus.cpp

@@ -197,11 +197,11 @@ void Arduino_DataBus::writeYCbCrPixels(uint8_t *yData, uint8_t *cbData, uint8_t
       pxB = CB2B16[pxCb];
 
       pxY = Y2I16[*yData++];
-      _data16.value = CLIPRBE[pxY + pxCr] | CLIPGBE[pxY + pxG] | CLIPBBE[pxY + pxB];
+      _data16.value = CLIPRBE[pxY + pxR] | CLIPGBE[pxY + pxG] | CLIPBBE[pxY + pxB];
       write(_data16.lsb);
       write(_data16.msb);
       pxY = Y2I16[*yData++];
-      _data16.value = CLIPRBE[pxY + pxCr] | CLIPGBE[pxY + pxG] | CLIPBBE[pxY + pxB];
+      _data16.value = CLIPRBE[pxY + pxR] | CLIPGBE[pxY + pxG] | CLIPBBE[pxY + pxB];
       write(_data16.lsb);
       write(_data16.msb);
     }

src/databus/Arduino_ESP32RGBPanel.cpp

@@ -72,7 +72,7 @@ uint16_t *Arduino_ESP32RGBPanel::getFrameBuffer(int16_t w, int16_t h)
 #else
       .bits_per_pixel = 16,
       .num_fbs = 1,
-      .bounce_buffer_size_px = 40 * w,
+      .bounce_buffer_size_px = (size_t)(w * 40),
 #endif
       .sram_trans_align = 8,
       .psram_trans_align = 64,

src/display/Arduino_RGB_Display.cpp

@@ -518,7 +518,6 @@ void Arduino_RGB_Display::drawYCbCrBitmap(int16_t x, int16_t y, uint8_t *yData,
   }
   else
   {
-    int cols = w >> 1;
     int rows = h >> 1;
 
     uint16_t *dest = _framebuffer;