From cd4fda5dbb452e715c3e1f5584b7c769a0627364 Mon Sep 17 00:00:00 2001 From: Liz <23021834+BlitzCityDIY@users.noreply.github.com> Date: Thu, 26 Jun 2025 09:59:29 -0400 Subject: [PATCH] add inits for new 2.9 tricolor (#60) * add inits for new 2.9 tricolor * rp2040 CI fix * clang * clang again --- Adafruit_ImageReader.cpp | 16 ++++++++-------- Adafruit_ImageReader_EPD.cpp | 16 ++++++++-------- examples/BreakoutSSD1331/BreakoutSSD1331.ino | 2 +- examples/BreakoutSSD1351/BreakoutSSD1351.ino | 2 +- .../BreakoutST7735-128x128.ino | 2 +- .../BreakoutST7735-160x128.ino | 2 +- .../BreakoutST7735-160x80.ino | 2 +- .../BreakoutST7789-170x320.ino | 2 +- .../BreakoutST7789-172x320.ino | 2 +- .../BreakoutST7789-240x135.ino | 2 +- .../BreakoutST7789-240x240.ino | 2 +- .../BreakoutST7789-280x240.ino | 2 +- .../BreakoutST7789-320x240.ino | 2 +- examples/EInkBreakouts/EInkBreakouts.ino | 2 +- examples/EInkFeatherWing/EInkFeatherWing.ino | 2 +- .../EInkGray29BmpButtonDemo.ino | 2 +- examples/FeatherWingHX8357/FeatherWingHX8357.ino | 2 +- .../FeatherWingILI9341/FeatherWingILI9341.ino | 2 +- examples/FeatherWingST7735/FeatherWingST7735.ino | 2 +- examples/PyPortal/.feather_rp2040.test.skip | 0 examples/ShieldILI9341/ShieldILI9341.ino | 2 +- examples/ShieldST7735/ShieldST7735.ino | 2 +- examples/ThinkInkDisplays/ThinkInkDisplays.ino | 4 +++- 23 files changed, 38 insertions(+), 36 deletions(-) create mode 100644 examples/PyPortal/.feather_rp2040.test.skip diff --git a/Adafruit_ImageReader.cpp b/Adafruit_ImageReader.cpp index cebc308..a746245 100644 --- a/Adafruit_ImageReader.cpp +++ b/Adafruit_ImageReader.cpp @@ -529,8 +529,8 @@ ImageReturnCode Adafruit_ImageReader::coreBMP( } } else { // Canvas is simpler, file.read(sdbuf, sizeof sdbuf); // just load sdbuf - } // (destidx never resets) - srcidx = 0; // Reset bmp buf index + } // (destidx never resets) + srcidx = 0; // Reset bmp buf index } if (depth == 24) { // Convert each pixel from BMP to 565 format, save in dest @@ -564,7 +564,7 @@ ImageReturnCode Adafruit_ImageReader::coreBMP( } } } - } // end pixel loop + } // end pixel loop if (tft) { // Drawing to TFT? if (destidx) { // Any remainders? // See notes above re: DMA @@ -584,11 +584,11 @@ ImageReturnCode Adafruit_ImageReader::coreBMP( img->palette = quantized; // Keep palette with img } } // end depth>24 or quantized malloc OK - } // end top/left clip - } // end malloc check - } // end depth check - } // end planes/compression check - } // end signature + } // end top/left clip + } // end malloc check + } // end depth check + } // end planes/compression check + } // end signature file.close(); return status; diff --git a/Adafruit_ImageReader_EPD.cpp b/Adafruit_ImageReader_EPD.cpp index 52ec525..e1eee67 100644 --- a/Adafruit_ImageReader_EPD.cpp +++ b/Adafruit_ImageReader_EPD.cpp @@ -391,8 +391,8 @@ ImageReturnCode Adafruit_ImageReader_EPD::coreBMP( } } else { // Canvas is simpler, file.read(sdbuf, sizeof sdbuf); // just load sdbuf - } // (destidx never resets) - srcidx = 0; // Reset bmp buf index + } // (destidx never resets) + srcidx = 0; // Reset bmp buf index } if (depth == 24) { // Convert each pixel from BMP to 565 format, save in dest @@ -438,7 +438,7 @@ ImageReturnCode Adafruit_ImageReader_EPD::coreBMP( } } } - } // end pixel loop + } // end pixel loop if (epd) { // Drawing to TFT? if (destidx) { // Any remainders? uint16_t index = 0; @@ -464,11 +464,11 @@ ImageReturnCode Adafruit_ImageReader_EPD::coreBMP( img->palette = quantized; // Keep palette with img } } // end depth>24 or quantized malloc OK - } // end top/left clip - } // end malloc check - } // end depth check - } // end planes/compression check - } // end signature + } // end top/left clip + } // end malloc check + } // end depth check + } // end planes/compression check + } // end signature file.close(); return status; diff --git a/examples/BreakoutSSD1331/BreakoutSSD1331.ino b/examples/BreakoutSSD1331/BreakoutSSD1331.ino index 4764edf..cba4f23 100644 --- a/examples/BreakoutSSD1331/BreakoutSSD1331.ino +++ b/examples/BreakoutSSD1331/BreakoutSSD1331.ino @@ -9,7 +9,7 @@ #include // Core graphics library #include // Hardware-specific library -#include // SD card & FAT filesystem library +#include // SD card & FAT filesystem library #include // SPI / QSPI flash library #include // Image-reading functions diff --git a/examples/BreakoutSSD1351/BreakoutSSD1351.ino b/examples/BreakoutSSD1351/BreakoutSSD1351.ino index 5dbdc76..15cc9ee 100644 --- a/examples/BreakoutSSD1351/BreakoutSSD1351.ino +++ b/examples/BreakoutSSD1351/BreakoutSSD1351.ino @@ -9,7 +9,7 @@ #include // Core graphics library #include // Hardware-specific library -#include // SD card & FAT filesystem library +#include // SD card & FAT filesystem library #include // SPI / QSPI flash library #include // Image-reading functions diff --git a/examples/BreakoutST7735-128x128/BreakoutST7735-128x128.ino b/examples/BreakoutST7735-128x128/BreakoutST7735-128x128.ino index e144b49..ca9259e 100644 --- a/examples/BreakoutST7735-128x128/BreakoutST7735-128x128.ino +++ b/examples/BreakoutST7735-128x128/BreakoutST7735-128x128.ino @@ -9,7 +9,7 @@ #include // Core graphics library #include // Hardware-specific library -#include // SD card & FAT filesystem library +#include // SD card & FAT filesystem library #include // SPI / QSPI flash library #include // Image-reading functions diff --git a/examples/BreakoutST7735-160x128/BreakoutST7735-160x128.ino b/examples/BreakoutST7735-160x128/BreakoutST7735-160x128.ino index 8e5fda3..dc65175 100644 --- a/examples/BreakoutST7735-160x128/BreakoutST7735-160x128.ino +++ b/examples/BreakoutST7735-160x128/BreakoutST7735-160x128.ino @@ -9,7 +9,7 @@ #include // Core graphics library #include // Hardware-specific library -#include // SD card & FAT filesystem library +#include // SD card & FAT filesystem library #include // SPI / QSPI flash library #include // Image-reading functions diff --git a/examples/BreakoutST7735-160x80/BreakoutST7735-160x80.ino b/examples/BreakoutST7735-160x80/BreakoutST7735-160x80.ino index abb92b7..b144dae 100644 --- a/examples/BreakoutST7735-160x80/BreakoutST7735-160x80.ino +++ b/examples/BreakoutST7735-160x80/BreakoutST7735-160x80.ino @@ -10,7 +10,7 @@ #include // Core graphics library #include // Hardware-specific library -#include // SD card & FAT filesystem library +#include // SD card & FAT filesystem library #include // SPI / QSPI flash library #include // Image-reading functions diff --git a/examples/BreakoutST7789-170x320/BreakoutST7789-170x320.ino b/examples/BreakoutST7789-170x320/BreakoutST7789-170x320.ino index a09c098..b44dcc5 100644 --- a/examples/BreakoutST7789-170x320/BreakoutST7789-170x320.ino +++ b/examples/BreakoutST7789-170x320/BreakoutST7789-170x320.ino @@ -9,7 +9,7 @@ #include // Core graphics library #include // Hardware-specific library for ST7789 -#include // SD card & FAT filesystem library +#include // SD card & FAT filesystem library #include // SPI / QSPI flash library #include // Image-reading functions diff --git a/examples/BreakoutST7789-172x320/BreakoutST7789-172x320.ino b/examples/BreakoutST7789-172x320/BreakoutST7789-172x320.ino index 0415ca1..a25257a 100644 --- a/examples/BreakoutST7789-172x320/BreakoutST7789-172x320.ino +++ b/examples/BreakoutST7789-172x320/BreakoutST7789-172x320.ino @@ -9,7 +9,7 @@ #include // Core graphics library #include // Hardware-specific library for ST7789 -#include // SD card & FAT filesystem library +#include // SD card & FAT filesystem library #include // SPI / QSPI flash library #include // Image-reading functions diff --git a/examples/BreakoutST7789-240x135/BreakoutST7789-240x135.ino b/examples/BreakoutST7789-240x135/BreakoutST7789-240x135.ino index bfa30e6..06e1dd8 100644 --- a/examples/BreakoutST7789-240x135/BreakoutST7789-240x135.ino +++ b/examples/BreakoutST7789-240x135/BreakoutST7789-240x135.ino @@ -9,7 +9,7 @@ #include // Core graphics library #include // Hardware-specific library for ST7789 -#include // SD card & FAT filesystem library +#include // SD card & FAT filesystem library #include // SPI / QSPI flash library #include // Image-reading functions diff --git a/examples/BreakoutST7789-240x240/BreakoutST7789-240x240.ino b/examples/BreakoutST7789-240x240/BreakoutST7789-240x240.ino index b997699..f7ba475 100644 --- a/examples/BreakoutST7789-240x240/BreakoutST7789-240x240.ino +++ b/examples/BreakoutST7789-240x240/BreakoutST7789-240x240.ino @@ -9,7 +9,7 @@ #include // Core graphics library #include // Hardware-specific library for ST7789 -#include // SD card & FAT filesystem library +#include // SD card & FAT filesystem library #include // SPI / QSPI flash library #include // Image-reading functions diff --git a/examples/BreakoutST7789-280x240/BreakoutST7789-280x240.ino b/examples/BreakoutST7789-280x240/BreakoutST7789-280x240.ino index 67d69b8..5be92a3 100644 --- a/examples/BreakoutST7789-280x240/BreakoutST7789-280x240.ino +++ b/examples/BreakoutST7789-280x240/BreakoutST7789-280x240.ino @@ -9,7 +9,7 @@ #include // Core graphics library #include // Hardware-specific library for ST7789 -#include // SD card & FAT filesystem library +#include // SD card & FAT filesystem library #include // SPI / QSPI flash library #include // Image-reading functions diff --git a/examples/BreakoutST7789-320x240/BreakoutST7789-320x240.ino b/examples/BreakoutST7789-320x240/BreakoutST7789-320x240.ino index 4e9acdd..fb8955f 100644 --- a/examples/BreakoutST7789-320x240/BreakoutST7789-320x240.ino +++ b/examples/BreakoutST7789-320x240/BreakoutST7789-320x240.ino @@ -9,7 +9,7 @@ #include // Core graphics library #include // Hardware-specific library for ST7789 -#include // SD card & FAT filesystem library +#include // SD card & FAT filesystem library #include // SPI / QSPI flash library #include // Image-reading functions diff --git a/examples/EInkBreakouts/EInkBreakouts.ino b/examples/EInkBreakouts/EInkBreakouts.ino index ee7818b..b1083ff 100644 --- a/examples/EInkBreakouts/EInkBreakouts.ino +++ b/examples/EInkBreakouts/EInkBreakouts.ino @@ -6,7 +6,7 @@ #include // Core graphics library #include "Adafruit_EPD.h" // Hardware-specific library for EPD -#include // SD card & FAT filesystem library +#include // SD card & FAT filesystem library #include // SPI / QSPI flash library #include // Image-reading functions diff --git a/examples/EInkFeatherWing/EInkFeatherWing.ino b/examples/EInkFeatherWing/EInkFeatherWing.ino index 47f4fa1..79d6588 100644 --- a/examples/EInkFeatherWing/EInkFeatherWing.ino +++ b/examples/EInkFeatherWing/EInkFeatherWing.ino @@ -6,7 +6,7 @@ #include // Core graphics library #include "Adafruit_EPD.h" // Hardware-specific library for EPD -#include // SD card & FAT filesystem library +#include // SD card & FAT filesystem library #include // SPI / QSPI flash library #include // Image-reading functions diff --git a/examples/EInkGray29BmpButtonDemo/EInkGray29BmpButtonDemo.ino b/examples/EInkGray29BmpButtonDemo/EInkGray29BmpButtonDemo.ino index 7d84ae9..cece063 100644 --- a/examples/EInkGray29BmpButtonDemo/EInkGray29BmpButtonDemo.ino +++ b/examples/EInkGray29BmpButtonDemo/EInkGray29BmpButtonDemo.ino @@ -1,6 +1,6 @@ #include // Core graphics library #include "Adafruit_ThinkInk.h" -#include // SD card & FAT filesystem library +#include // SD card & FAT filesystem library #include // Image-reading functions diff --git a/examples/FeatherWingHX8357/FeatherWingHX8357.ino b/examples/FeatherWingHX8357/FeatherWingHX8357.ino index 54316f8..c6d1f32 100644 --- a/examples/FeatherWingHX8357/FeatherWingHX8357.ino +++ b/examples/FeatherWingHX8357/FeatherWingHX8357.ino @@ -6,7 +6,7 @@ #include // Core graphics library #include // Hardware-specific library -#include // SD card & FAT filesystem library +#include // SD card & FAT filesystem library #include // SPI / QSPI flash library #include // Image-reading functions diff --git a/examples/FeatherWingILI9341/FeatherWingILI9341.ino b/examples/FeatherWingILI9341/FeatherWingILI9341.ino index fb903d6..52efe3b 100644 --- a/examples/FeatherWingILI9341/FeatherWingILI9341.ino +++ b/examples/FeatherWingILI9341/FeatherWingILI9341.ino @@ -6,7 +6,7 @@ #include // Core graphics library #include // Hardware-specific library -#include // SD card & FAT filesystem library +#include // SD card & FAT filesystem library #include // SPI / QSPI flash library #include // Image-reading functions diff --git a/examples/FeatherWingST7735/FeatherWingST7735.ino b/examples/FeatherWingST7735/FeatherWingST7735.ino index d578f43..c1774c3 100644 --- a/examples/FeatherWingST7735/FeatherWingST7735.ino +++ b/examples/FeatherWingST7735/FeatherWingST7735.ino @@ -10,7 +10,7 @@ #include // Core graphics library #include // Hardware-specific library -#include // SD card & FAT filesystem library +#include // SD card & FAT filesystem library #include // SPI / QSPI flash library #include // Image-reading functions #include // Part of Seesaw library diff --git a/examples/PyPortal/.feather_rp2040.test.skip b/examples/PyPortal/.feather_rp2040.test.skip new file mode 100644 index 0000000..e69de29 diff --git a/examples/ShieldILI9341/ShieldILI9341.ino b/examples/ShieldILI9341/ShieldILI9341.ino index 1901b23..baecf08 100644 --- a/examples/ShieldILI9341/ShieldILI9341.ino +++ b/examples/ShieldILI9341/ShieldILI9341.ino @@ -9,7 +9,7 @@ #include // Core graphics library #include // Hardware-specific library -#include // SD card & FAT filesystem library +#include // SD card & FAT filesystem library #include // SPI / QSPI flash library #include // Image-reading functions diff --git a/examples/ShieldST7735/ShieldST7735.ino b/examples/ShieldST7735/ShieldST7735.ino index d3d0b23..09e90c1 100644 --- a/examples/ShieldST7735/ShieldST7735.ino +++ b/examples/ShieldST7735/ShieldST7735.ino @@ -10,7 +10,7 @@ #include // Core graphics library #include // Hardware-specific library -#include // SD card & FAT filesystem library +#include // SD card & FAT filesystem library #include // SPI / QSPI flash library #include // Image-reading functions #include // IF EARLY TFT SHIELD (no Seesaw), diff --git a/examples/ThinkInkDisplays/ThinkInkDisplays.ino b/examples/ThinkInkDisplays/ThinkInkDisplays.ino index 5cabb69..8f408b1 100644 --- a/examples/ThinkInkDisplays/ThinkInkDisplays.ino +++ b/examples/ThinkInkDisplays/ThinkInkDisplays.ino @@ -6,7 +6,7 @@ #include // Core graphics library #include "Adafruit_ThinkInk.h" -#include // SD card & FAT filesystem library +#include // SD card & FAT filesystem library #include // SPI / QSPI flash library #include // Image-reading functions @@ -37,6 +37,8 @@ //ThinkInk_270_Tricolor_C44 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY); ThinkInk_290_Tricolor_Z10 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY); //ThinkInk_420_Tricolor_RW display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY); +//ThinkInk_290_Tricolor_Z13 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY); +//ThinkInk_290_Tricolor_Z94 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY); // Grayscale Displays //ThinkInk_154_Grayscale4_T8 display(EPD_DC, EPD_RESET, EPD_CS, SRAM_CS, EPD_BUSY);