Merge branch 'moononournation:master' into master

mathertel · web-flow · commit 2a8356d08966 · 2025-01-12T09:06:45.000+01:00
diff --git a/examples/ImgViewer/ImgViewerAnimatedGIF_GIFDEC/ImgViewerAnimatedGIF_GIFDEC.ino b/examples/ImgViewer/ImgViewerAnimatedGIF_GIFDEC/ImgViewerAnimatedGIF_GIFDEC.ino
@@ -30,7 +30,7 @@
 /* Wio Terminal */
 #if defined(ARDUINO_ARCH_SAMD) && defined(SEEED_GROVE_UI_WIRELESS)
 #define GIF_FILENAME "/ezgif.com-optimize.gif"
-#elif defined(TARGET_RP2040)
+#elif defined(TARGET_RP2040) || defined(PICO_RP2350)
 #define GIF_FILENAME "/ezgif.com-optimize.gif"
 #elif defined(ESP32)
 #define GIF_FILENAME "/ezgif.com-optimize.gif"
@@ -82,7 +82,7 @@ Arduino_GFX *gfx = new Arduino_ILI9341(bus, DF_GFX_RST, 3 /* rotation */, false
 #if defined(ARDUINO_ARCH_SAMD) && defined(SEEED_GROVE_UI_WIRELESS)
 #include <Seeed_FS.h>
 #include <SD/Seeed_SD.h>
-#elif defined(TARGET_RP2040)
+#elif defined(TARGET_RP2040) || defined(PICO_RP2350)
 #include <LittleFS.h>
 #include <SD.h>
 #elif defined(ESP32)
@@ -127,7 +127,7 @@ void setup()
 /* Wio Terminal */
 #if defined(ARDUINO_ARCH_SAMD) && defined(SEEED_GROVE_UI_WIRELESS)
   if (!SD.begin(SDCARD_SS_PIN, SDCARD_SPI, 4000000UL))
-#elif defined(TARGET_RP2040)
+#elif defined(TARGET_RP2040) || defined(PICO_RP2350)
   if (!LittleFS.begin())
   // if (!SD.begin(SS))
 #elif defined(ESP32)
@@ -159,7 +159,7 @@ void loop()
 /* Wio Terminal */
 #if defined(ARDUINO_ARCH_SAMD) && defined(SEEED_GROVE_UI_WIRELESS)
   File gifFile = SD.open(GIF_FILENAME, "r");
-#elif defined(TARGET_RP2040)
+#elif defined(TARGET_RP2040) || defined(PICO_RP2350)
   File gifFile = LittleFS.open(GIF_FILENAME, "r");
   // File gifFile = SD.open(GIF_FILENAME, "r");
 #elif defined(ESP32)
diff --git a/examples/ImgViewer/ImgViewerAnimatedGIF_bitbank/ImgViewerAnimatedGIF_bitbank.ino b/examples/ImgViewer/ImgViewerAnimatedGIF_bitbank/ImgViewerAnimatedGIF_bitbank.ino
@@ -31,7 +31,7 @@
 /* Wio Terminal */
 #if defined(ARDUINO_ARCH_SAMD) && defined(SEEED_GROVE_UI_WIRELESS)
 #define GIF_FILENAME "/ezgif.com-optimize.gif"
-#elif defined(TARGET_RP2040)
+#elif defined(TARGET_RP2040) || defined(PICO_RP2350)
 #define GIF_FILENAME "/ezgif.com-optimize.gif"
 #elif defined(ESP32)
 #define GIF_FILENAME "/ezgif.com-optimize.gif"
@@ -83,7 +83,7 @@ Arduino_GFX *gfx = new Arduino_ILI9341(bus, DF_GFX_RST, 3 /* rotation */, false
 #if defined(ARDUINO_ARCH_SAMD) && defined(SEEED_GROVE_UI_WIRELESS)
 #include <Seeed_FS.h>
 #include <SD/Seeed_SD.h>
-#elif defined(TARGET_RP2040)
+#elif defined(TARGET_RP2040) || defined(PICO_RP2350)
 #include <LittleFS.h>
 #include <SD.h>
 #elif defined(ESP32)
@@ -109,7 +109,7 @@ void *GIFOpenFile(const char *fname, int32_t *pSize)
   /* Wio Terminal */
 #if defined(ARDUINO_ARCH_SAMD) && defined(SEEED_GROVE_UI_WIRELESS)
   f = SD.open(fname, "r");
-#elif defined(TARGET_RP2040)
+#elif defined(TARGET_RP2040) || defined(PICO_RP2350)
   f = LittleFS.open(fname, "r");
   // f = SD.open(fname, "r");
 #elif defined(ESP32)
@@ -294,7 +294,7 @@ void setup()
 /* Wio Terminal */
 #if defined(ARDUINO_ARCH_SAMD) && defined(SEEED_GROVE_UI_WIRELESS)
   if (!SD.begin(SDCARD_SS_PIN, SDCARD_SPI, 4000000UL))
-#elif defined(TARGET_RP2040)
+#elif defined(TARGET_RP2040) || defined(PICO_RP2350)
   if (!LittleFS.begin())
   // if (!SD.begin(SS))
 #elif defined(ESP32)
diff --git a/examples/ImgViewer/ImgViewerBmp/ImgViewerBmp.ino b/examples/ImgViewer/ImgViewerBmp/ImgViewerBmp.ino
@@ -73,7 +73,7 @@ Arduino_GFX *gfx = new Arduino_ILI9341(bus, DF_GFX_RST, 3 /* rotation */, false
 #if defined(ARDUINO_ARCH_SAMD) && defined(SEEED_GROVE_UI_WIRELESS)
 #include <Seeed_FS.h>
 #include <SD/Seeed_SD.h>
-#elif defined(TARGET_RP2040)
+#elif defined(TARGET_RP2040) || defined(PICO_RP2350)
 #include <LittleFS.h>
 #include <SD.h>
 #elif defined(ESP32)
@@ -125,7 +125,7 @@ void setup()
 /* Wio Terminal */
 #if defined(ARDUINO_ARCH_SAMD) && defined(SEEED_GROVE_UI_WIRELESS)
   if (!SD.begin(SDCARD_SS_PIN, SDCARD_SPI, 4000000UL))
-#elif defined(TARGET_RP2040)
+#elif defined(TARGET_RP2040) || defined(PICO_RP2350)
   if (!LittleFS.begin())
   // if (!SD.begin(SS))
 #elif defined(ESP32)
@@ -157,7 +157,7 @@ void setup()
 /* Wio Terminal */
 #if defined(ARDUINO_ARCH_SAMD) && defined(SEEED_GROVE_UI_WIRELESS)
     File bmpFile = SD.open(BMP_FILENAME, "r");
-#elif defined(TARGET_RP2040)
+#elif defined(TARGET_RP2040) || defined(PICO_RP2350)
     File bmpFile = LittleFS.open(BMP_FILENAME, "r");
     // File bmpFile = SD.open(BMP_FILENAME, "r");
 #elif defined(ESP32)
diff --git a/examples/ImgViewer/ImgViewerJpeg_JPEGDEC/ImgViewerJpeg_JPEGDEC.ino b/examples/ImgViewer/ImgViewerJpeg_JPEGDEC/ImgViewerJpeg_JPEGDEC.ino
@@ -72,7 +72,7 @@ Arduino_GFX *gfx = new Arduino_ILI9341(bus, DF_GFX_RST, 3 /* rotation */, false
 #if defined(ARDUINO_ARCH_SAMD) && defined(SEEED_GROVE_UI_WIRELESS)
 #include <Seeed_FS.h>
 #include <SD/Seeed_SD.h>
-#elif defined(TARGET_RP2040)
+#elif defined(TARGET_RP2040) || defined(PICO_RP2350)
 #include <LittleFS.h>
 #include <SD.h>
 #elif defined(ESP32)
@@ -124,7 +124,7 @@ void setup()
 /* Wio Terminal */
 #if defined(ARDUINO_ARCH_SAMD) && defined(SEEED_GROVE_UI_WIRELESS)
   if (!SD.begin(SDCARD_SS_PIN, SDCARD_SPI, 4000000UL))
-#elif defined(TARGET_RP2040)
+#elif defined(TARGET_RP2040) || defined(PICO_RP2350)
   if (!LittleFS.begin())
   // if (!SD.begin(SS))
 #elif defined(ESP32)
diff --git a/examples/ImgViewer/ImgViewerJpeg_JPEGDEC/JpegFunc.h b/examples/ImgViewer/ImgViewerJpeg_JPEGDEC/JpegFunc.h
@@ -18,7 +18,7 @@ static void *jpegOpenFile(const char *szFilename, int32_t *pFileSize)
     // Serial.println("jpegOpenFile");
 #if defined(ARDUINO_ARCH_SAMD) && defined(SEEED_GROVE_UI_WIRELESS)
     _f = SD.open(szFilename, "r");
-#elif defined(TARGET_RP2040)
+#elif defined(TARGET_RP2040) || defined(PICO_RP2350)
     _f = LittleFS.open(szFilename, "r");
     // _f = SDFS.open(szFilename, "r");
 #elif defined(ESP32)
diff --git a/examples/ImgViewer/ImgViewerMjpeg_JPEGDEC/ImgViewerMjpeg_JPEGDEC.ino b/examples/ImgViewer/ImgViewerMjpeg_JPEGDEC/ImgViewerMjpeg_JPEGDEC.ino
@@ -77,7 +77,7 @@ Arduino_GFX *gfx = new Arduino_ILI9341(bus, DF_GFX_RST, 3 /* rotation */, false
 #if defined(ARDUINO_ARCH_SAMD) && defined(SEEED_GROVE_UI_WIRELESS)
 #include <Seeed_FS.h>
 #include <SD/Seeed_SD.h>
-#elif defined(TARGET_RP2040)
+#elif defined(TARGET_RP2040) || defined(PICO_RP2350)
 #include <LittleFS.h>
 #include <SD.h>
 #elif defined(ESP32)
@@ -140,7 +140,7 @@ void setup()
 #if defined(ARDUINO_ARCH_SAMD) && defined(SEEED_GROVE_UI_WIRELESS)
   // Init SPIFLASH
   if (!SD.begin(SDCARD_SS_PIN, SDCARD_SPI, 4000000UL))
-#elif defined(TARGET_RP2040)
+#elif defined(TARGET_RP2040) || defined(PICO_RP2350)
   if (!LittleFS.begin())
   // if (!SD.begin(SS))
 #elif defined(ESP32)
@@ -166,7 +166,7 @@ void setup()
   {
 #if defined(ARDUINO_ARCH_SAMD) && defined(SEEED_GROVE_UI_WIRELESS)
     File mjpegFile = SD.open(MJPEG_FILENAME, "r");
-#elif defined(TARGET_RP2040)
+#elif defined(TARGET_RP2040) || defined(PICO_RP2350)
     File mjpegFile = LittleFS.open(MJPEG_FILENAME, "r");
     // File mjpegFile = SD.open(MJPEG_FILENAME, "r");
 #elif defined(ESP32)
diff --git a/examples/ImgViewer/ImgViewerPng_PNGdec/ImgViewerPng_PNGdec.ino b/examples/ImgViewer/ImgViewerPng_PNGdec/ImgViewerPng_PNGdec.ino
@@ -73,7 +73,7 @@ Arduino_GFX *gfx = new Arduino_ILI9341(bus, DF_GFX_RST, 3 /* rotation */, false
 #if defined(ARDUINO_ARCH_SAMD) && defined(SEEED_GROVE_UI_WIRELESS)
 #include <Seeed_FS.h>
 #include <SD/Seeed_SD.h>
-#elif defined(TARGET_RP2040)
+#elif defined(TARGET_RP2040) || defined(PICO_RP2350)
 #include <LittleFS.h>
 #include <SD.h>
 #elif defined(ESP32)
@@ -102,7 +102,7 @@ void *myOpen(const char *filename, int32_t *size)
 /* Wio Terminal */
 #if defined(ARDUINO_ARCH_SAMD) && defined(SEEED_GROVE_UI_WIRELESS)
   pngFile = SD.open(filename, "r");
-#elif defined(TARGET_RP2040)
+#elif defined(TARGET_RP2040) || defined(PICO_RP2350)
   pngFile = LittleFS.open(filename, "r");
   // pngFile = SD.open(filename, "r");
 #elif defined(ESP32)
@@ -197,7 +197,7 @@ void setup()
 /* Wio Terminal */
 #if defined(ARDUINO_ARCH_SAMD) && defined(SEEED_GROVE_UI_WIRELESS)
   if (!SD.begin(SDCARD_SS_PIN, SDCARD_SPI, 4000000UL))
-#elif defined(TARGET_RP2040)
+#elif defined(TARGET_RP2040) || defined(PICO_RP2350)
   if (!LittleFS.begin())
   // if (!SD.begin(SS))
 #elif defined(ESP32)
diff --git a/examples/ImgViewer/ImgViewerTiff_G4/ImgViewerTiff_G4.ino b/examples/ImgViewer/ImgViewerTiff_G4/ImgViewerTiff_G4.ino
@@ -73,7 +73,7 @@ Arduino_GFX *gfx = new Arduino_ILI9341(bus, DF_GFX_RST, 3 /* rotation */, false
 #if defined(ARDUINO_ARCH_SAMD) && defined(SEEED_GROVE_UI_WIRELESS)
 #include <Seeed_FS.h>
 #include <SD/Seeed_SD.h>
-#elif defined(TARGET_RP2040)
+#elif defined(TARGET_RP2040) || defined(PICO_RP2350)
 #include <LittleFS.h>
 #include <SD.h>
 #elif defined(ESP32)
@@ -172,7 +172,7 @@ void setup()
 /* Wio Terminal */
 #if defined(ARDUINO_ARCH_SAMD) && defined(SEEED_GROVE_UI_WIRELESS)
   if (!SD.begin(SDCARD_SS_PIN, SDCARD_SPI, 4000000UL))
-#elif defined(TARGET_RP2040)
+#elif defined(TARGET_RP2040) || defined(PICO_RP2350)
   if (!LittleFS.begin())
   // if (!SD.begin(SS))
 #elif defined(ESP32)
@@ -202,7 +202,7 @@ void setup()
     /* Wio Terminal */
 #if defined(ARDUINO_ARCH_SAMD) && defined(SEEED_GROVE_UI_WIRELESS)
     File tiffFile = SD.open(TIFF_FILENAME, "r");
-#elif defined(TARGET_RP2040)
+#elif defined(TARGET_RP2040) || defined(PICO_RP2350)
     File tiffFile = LittleFS.open(TIFF_FILENAME, "r");
     // File tiffFile = SD.open(TIFF_FILENAME, "r");
 #elif defined(ESP32)
diff --git a/examples/MultipleDisplay/MultipleAnimatedGIF/MultipleAnimatedGIF.ino b/examples/MultipleDisplay/MultipleAnimatedGIF/MultipleAnimatedGIF.ino
@@ -45,7 +45,7 @@ Arduino_GFX *gfx4 = new Arduino_ILI9341(bus4, GFX_NOT_DEFINED /* RST */, 0 /* ro
  * End of Arduino_GFX setting
  ******************************************************************************/
 
-#if defined(TARGET_RP2040)
+#if defined(TARGET_RP2040) || defined(PICO_RP2350)
 #include <LittleFS.h>
 #include <SD.h>
 #elif defined(ESP32)
@@ -107,7 +107,7 @@ void setup()
   gfx4->fillScreen(RGB565_BLUE);
   delay(200);
 
-#if defined(TARGET_RP2040)
+#if defined(TARGET_RP2040) || defined(PICO_RP2350)
   if (!LittleFS.begin())
   // if (!SD.begin(SS))
 #elif defined(ESP32)
@@ -130,7 +130,7 @@ void setup()
 
 void loop()
 {
-#if defined(TARGET_RP2040)
+#if defined(TARGET_RP2040) || defined(PICO_RP2350)
   File gifFile1 = LittleFS.open(GIF_FILENAME1, "r");
   File gifFile2 = LittleFS.open(GIF_FILENAME2, "r");
   File gifFile3 = LittleFS.open(GIF_FILENAME3, "r");
diff --git a/examples/PDQgraphicstest/Arduino_GFX_databus.h b/examples/PDQgraphicstest/Arduino_GFX_databus.h
@@ -5,7 +5,7 @@
 #if defined(ARDUINO_ARCH_NRF52840)
 // Arduino_DataBus *bus = new Arduino_mbedSPI(TFT_DC, TFT_CS);
 Arduino_DataBus *bus = new Arduino_NRFXSPI(TFT_DC, TFT_CS, 13 /* SCK */, 11 /* MOSI */, 12 /* MISO */);
-#elif defined(TARGET_RP2040)
+#elif defined(TARGET_RP2040) || defined(PICO_RP2350)
 Arduino_DataBus *bus = new Arduino_RPiPicoSPI(TFT_DC /* DC */, TFT_CS /* CS */, 18 /* SCK */, 19 /* MOSI */, 16 /* MISO */, spi0 /* spi */);
 #elif defined(ESP32) && (CONFIG_IDF_TARGET_ESP32)
 Arduino_DataBus *bus = new Arduino_ESP32SPI(TFT_DC, TFT_CS, 18 /* SCK */, 23 /* MOSI */, GFX_NOT_DEFINED /* MISO */, VSPI /* spi_num */);
diff --git a/examples/PDQgraphicstest/Arduino_GFX_dev_device.h b/examples/PDQgraphicstest/Arduino_GFX_dev_device.h
@@ -45,6 +45,7 @@
 // #define XIAO_SAMD21_ROUND_DISPLAY
 // #define XIAO_ESP32C3_ROUND_DISPLAY
 // #define XIAO_ESP32S3_ROUND_DISPLAY
+// #define WAVESHARE_RP2040_LCD_0_96
 // #define WZ8048C050 // or called "Elecrow Wizee-ESP32"
 // #define ZX2D10GE10R_V4848
 // #define ZX3D50CE02S // or called "WT32-SC01 PLUS"
@@ -644,6 +645,12 @@ Arduino_ESP32RGBPanel *rgbpanel = new Arduino_ESP32RGBPanel(
 Arduino_RGB_Display *gfx = new Arduino_RGB_Display(
     800 /* width */, 480 /* height */, rgbpanel, 0 /* rotation */, true /* auto_flush */);
 
+#elif defined(WAVESHARE_RP2040_LCD_0_96)
+#define GFX_DEV_DEVICE WAVESHARE_RP2040_LCD_0_96
+#define GFX_BL 25
+Arduino_DataBus *bus = new Arduino_RPiPicoSPI(8 /* DC */, 9 /* CS */, 10 /* SCK */, 11 /* MOSI */, GFX_NOT_DEFINED /* MISO */, spi1 /* spi */);
+Arduino_GFX *gfx = new Arduino_ST7735(bus, 12 /* RST */, 0 /* rotation */, true /* IPS */, 80 /* width */, 160 /* height */, 26 /* col offset 1 */, 1 /* row offset 1 */, 26 /* col offset 2 */, 1 /* row offset 2 */);
+
 #elif defined(XIAO_SAMD21_ROUND_DISPLAY)
 #define GFX_DEV_DEVICE XIAO_SAMD21_ROUND_DISPLAY
 Arduino_DataBus *bus = new Arduino_HWSPI(3 /* DC */, 1 /* CS */);
diff --git a/examples/PDQgraphicstest/Arduino_GFX_pins.h b/examples/PDQgraphicstest/Arduino_GFX_pins.h
@@ -9,7 +9,7 @@
 #define TFT_DC 3
 #define TFT_RST 2
 #define GFX_BL 1
-#elif defined(TARGET_RP2040)
+#elif defined(TARGET_RP2040) || defined(PICO_RP2350)
 #define TFT_CS 17 // GFX_NOT_DEFINED for display without CS pin
 #define TFT_DC 27
 #define TFT_RST 26
diff --git a/examples/PDQgraphicstest/PDQgraphicstest.ino b/examples/PDQgraphicstest/PDQgraphicstest.ino
@@ -291,11 +291,11 @@ int32_t testText()
 
   gfx->setTextSize(2);
   gfx->setTextColor(gfx->color565(0xff, 0x00, 0x00));
-  gfx->print(F("RGB565_RED "));
+  gfx->print(F("RED "));
   gfx->setTextColor(gfx->color565(0x00, 0xff, 0x00));
-  gfx->print(F("RGB565_GREEN "));
+  gfx->print(F("GREEN "));
   gfx->setTextColor(gfx->color565(0x00, 0x00, 0xff));
-  gfx->println(F("RGB565_BLUE"));
+  gfx->println(F("BLUE"));
 
   gfx->setTextSize(tsa);
   gfx->setTextColor(RGB565_YELLOW);
diff --git a/examples/Sprite/SpriteGif/SpriteGif.ino b/examples/Sprite/SpriteGif/SpriteGif.ino
@@ -72,7 +72,7 @@ Arduino_Canvas_Indexed *canvasGfx = new Arduino_Canvas_Indexed(320 /* width */,
 #if defined(ARDUINO_ARCH_SAMD) && defined(SEEED_GROVE_UI_WIRELESS)
 #include <Seeed_FS.h>
 #include <SD/Seeed_SD.h>
-#elif defined(TARGET_RP2040)
+#elif defined(TARGET_RP2040) || defined(PICO_RP2350)
 #include <LittleFS.h>
 #include <SD.h>
 #elif defined(ESP32)
@@ -134,7 +134,7 @@ void setup()
 /* Wio Terminal */
 #if defined(ARDUINO_ARCH_SAMD) && defined(SEEED_GROVE_UI_WIRELESS)
   if (!SD.begin(SDCARD_SS_PIN, SDCARD_SPI, 4000000UL))
-#elif defined(TARGET_RP2040)
+#elif defined(TARGET_RP2040) || defined(PICO_RP2350)
   if (!LittleFS.begin())
   // if (!SD.begin(SS))
 #elif defined(ESP32)
@@ -157,7 +157,7 @@ void setup()
 /* Wio Terminal */
 #if defined(ARDUINO_ARCH_SAMD) && defined(SEEED_GROVE_UI_WIRELESS)
   File gifFile = SD.open(GIF_FILENAME, "r");
-#elif defined(TARGET_RP2040)
+#elif defined(TARGET_RP2040) || defined(PICO_RP2350)
   File gifFile = LittleFS.open(GIF_FILENAME, "r");
   // File gifFile = SD.open(GIF_FILENAME, "r");
 #elif defined(ESP32)
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=GFX Library for Arduino
-version=1.5.1
+version=1.5.2
 author=Moon On Our Nation <moononournation@gmail.com>
 maintainer=Moon On Our Nation <moononournation@gmail.com>
 sentence=Arduino_GFX is a GFX library for various color displays with various data bus interfaces
diff --git a/src/Arduino_DataBus.h b/src/Arduino_DataBus.h
@@ -30,7 +30,7 @@ typedef uint32_t ARDUINOGFX_PORT_t;
 #define USE_FAST_PINIO   ///< Use direct PORT register access
 #define HAS_PORT_SET_CLR ///< PORTs have set & clear registers
 typedef uint16_t ARDUINOGFX_PORT_t;
-#elif defined(TARGET_RP2040)
+#elif defined(TARGET_RP2040) || defined(PICO_RP2350)
 #define USE_FAST_PINIO   ///< Use direct PORT register access
 #define HAS_PORT_SET_CLR ///< PORTs have set & clear registers
 typedef uint32_t ARDUINOGFX_PORT_t;
diff --git a/src/Arduino_GFX.h b/src/Arduino_GFX.h
@@ -138,7 +138,7 @@
 #endif
 
 #if !defined(ATTINY_CORE)
-GFX_INLINE GFXglyph *pgm_read_glyph_ptr(const GFXfont *gfxFont, uint8_t c)
+GFX_INLINE static GFXglyph *pgm_read_glyph_ptr(const GFXfont *gfxFont, uint8_t c)
 {
 #ifdef __AVR__
   return &(((GFXglyph *)pgm_read_pointer(&gfxFont->glyph))[c]);
@@ -150,7 +150,7 @@ GFX_INLINE GFXglyph *pgm_read_glyph_ptr(const GFXfont *gfxFont, uint8_t c)
 #endif //__AVR__
 }
 
-GFX_INLINE uint8_t *pgm_read_bitmap_ptr(const GFXfont *gfxFont)
+GFX_INLINE static uint8_t *pgm_read_bitmap_ptr(const GFXfont *gfxFont)
 {
 #ifdef __AVR__
   return (uint8_t *)pgm_read_pointer(&gfxFont->bitmap);
diff --git a/src/Arduino_GFX_Library.cpp b/src/Arduino_GFX_Library.cpp
@@ -4,7 +4,7 @@ Arduino_DataBus *create_default_Arduino_DataBus()
 {
 #if defined(ARDUINO_ARCH_NRF52840)
   return new Arduino_NRFXSPI(DF_GFX_DC, DF_GFX_CS, DF_GFX_SCK, DF_GFX_MOSI, DF_GFX_MISO);
-#elif defined(TARGET_RP2040)
+#elif defined(TARGET_RP2040) || defined(PICO_RP2350)
   return new Arduino_RPiPicoSPI(DF_GFX_DC, DF_GFX_CS, DF_GFX_SCK, DF_GFX_MOSI, DF_GFX_MISO, DF_GFX_SPI);
 #elif defined(ESP32) && (CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3)
   return new Arduino_ESP32SPI(DF_GFX_DC, DF_GFX_CS, DF_GFX_SCK, DF_GFX_MOSI, DF_GFX_MISO);
diff --git a/src/Arduino_GFX_Library.h b/src/Arduino_GFX_Library.h
@@ -188,7 +188,7 @@
 #define DF_GFX_DC 3
 #define DF_GFX_RST 2
 #define DF_GFX_BL 1
-#elif defined(TARGET_RP2040)
+#elif defined(TARGET_RP2040) || defined(PICO_RP2350)
 #define DF_GFX_SCK 18
 #define DF_GFX_MOSI 19
 #define DF_GFX_MISO 16
diff --git a/src/databus/Arduino_ESP32QSPI.cpp b/src/databus/Arduino_ESP32QSPI.cpp
@@ -130,7 +130,7 @@ void Arduino_ESP32QSPI::endWrite()
 {
   if (_is_shared_interface)
   {
-    spi_device_acquire_bus(_handle, portMAX_DELAY);
+    spi_device_release_bus(_handle);
   }
 }
 
diff --git a/src/databus/Arduino_HWSPI.cpp b/src/databus/Arduino_HWSPI.cpp
@@ -73,7 +73,7 @@ bool Arduino_HWSPI::begin(int32_t speed, int8_t dataMode)
     _csPortSet = (PORTreg_t) & (((R_PORT0_Type *)IOPORT_PRV_PORT_ADDRESS(digitalPinToPort(_cs)))->POSR);
     _csPortClr = (PORTreg_t) & (((R_PORT0_Type *)IOPORT_PRV_PORT_ADDRESS(digitalPinToPort(_cs)))->PORR);
   }
-#elif defined(TARGET_RP2040)
+#elif defined(TARGET_RP2040) || defined(PICO_RP2350)
   _dcPinMask = digitalPinToBitMask(_dc);
   _dcPortSet = (PORTreg_t)&sio_hw->gpio_set;
   _dcPortClr = (PORTreg_t)&sio_hw->gpio_clr;
diff --git a/src/databus/Arduino_RPiPicoPAR16.cpp b/src/databus/Arduino_RPiPicoPAR16.cpp
@@ -1,4 +1,4 @@
-#if defined(TARGET_RP2040)
+#if defined(TARGET_RP2040) || defined(PICO_RP2350)
 
 #include "Arduino_RPiPicoPAR16.h"
 
@@ -253,4 +253,4 @@ GFX_INLINE void Arduino_RPiPicoPAR16::CS_LOW(void)
   }
 }
 
-#endif // #if defined(TARGET_RP2040)
+#endif // #if defined(TARGET_RP2040) || defined(PICO_RP2350)
diff --git a/src/databus/Arduino_RPiPicoPAR16.h b/src/databus/Arduino_RPiPicoPAR16.h
diff --git a/src/databus/Arduino_RPiPicoPAR8.cpp b/src/databus/Arduino_RPiPicoPAR8.cpp
diff --git a/src/databus/Arduino_RPiPicoPAR8.h b/src/databus/Arduino_RPiPicoPAR8.h
diff --git a/src/databus/Arduino_RPiPicoSPI.cpp b/src/databus/Arduino_RPiPicoSPI.cpp
diff --git a/src/databus/Arduino_RPiPicoSPI.h b/src/databus/Arduino_RPiPicoSPI.h
diff --git a/src/databus/Arduino_SWPAR16.cpp b/src/databus/Arduino_SWPAR16.cpp
diff --git a/src/databus/Arduino_SWPAR8.cpp b/src/databus/Arduino_SWPAR8.cpp
diff --git a/src/databus/Arduino_SWSPI.cpp b/src/databus/Arduino_SWSPI.cpp
