Fix SD card not working issue with TFT_eSPI.

Author: embedded-kiddie

MLX90640.ino

@@ -41,10 +41,12 @@
 #define USE_TFT_ESPI
 /*--------------------------------------------------------------------------------
  * TFT_eSPI
- * CYD requires a different XPT2046 library and does not work with SD card.
+ * CYD requires XPT2046 touch screen library.
+ * See SPI bus assignment in 'boards/Setup_CYD_2432S028R.h' and 'pin_assign.h'.
  * https://github.com/Bodmer/TFT_eSPI/discussions/3123
- * https://github.com/TheNitek/XPT2046_Bitbang_Arduino_Library
  * https://forum.arduino.cc/t/cyd-sd-issues-probably-due-to-touch-pins/1280758/3
+ * https://github.com/witnessmenow/ESP32-Cheap-Yellow-Display/discussions/88
+ * https://github.com/TheNitek/XPT2046_Bitbang_Arduino_Library
  *--------------------------------------------------------------------------------*/
 #ifdef ARDUINO_ESP32_2432S028R
 #include <XPT2046_Touchscreen.h>

interpolation.hpp

@@ -91,5 +91,6 @@ void interpolate_image(float *src, const int src_rows, const int src_cols, const
         }
       }
     }
+    yield(); // Prevent the watchdog from firing
   }
 }

pin_assign.h

@@ -44,13 +44,13 @@
 #define TOUCH_MISO    CYD_TP_MISO     // 39
 #define TOUCH_CLK     CYD_TP_CLK      // 25
 #define TOUCH_CS      CYD_TP_CS       // 33
-#define TOUCH_SPI_BUS CYD_TP_SPI_BUS  // VSPI
+#define TOUCH_SPI_BUS HSPI            // CYD_TP_SPI_BUS (VSPI) --> HSPI
 
 #define SD_CS         CYD_SD_SS       //  5
 #define SD_MOSI       CYD_SD_MOSI     // 23
 #define SD_MISO       CYD_SD_MISO     // 19
 #define SD_SCK        CYD_SD_SCK      // 18
-#define SD_SPI_BUS    CYD_SD_SPI_BUS  // VSPI
+#define SD_SPI_BUS    VSPI            // CYD_SD_SPI_BUS (VSPI)
 #define SPI_MODE      SPI_MODE0       // SPI_MODE0, SPI_MODE2 or SPI_MODE3
 
 // false: Panel driver: ILI9341 (micro-USB x 1 type)

sdcard.hpp

@@ -6,12 +6,17 @@
 #include "SPI.h"
 
 /*--------------------------------------------------------------------------------
- * SPI bus and Graphics library
+ * SPI bus assignment for SD
  *--------------------------------------------------------------------------------*/
-#if defined (_TFT_eSPIH_)
-#define SD_CONFIG SD_CS, GFX_EXEC(getSPIinstance()), SPI_SD_FREQUENCY
+#if defined (ARDUINO_ESP32_2432S028R)
+  static SPIClass sd_spi = SPIClass(SD_SPI_BUS);
+  #define SD_CONFIG SD_CS, sd_spi, SPI_SD_FREQUENCY
 #else
-#define SD_CONFIG SD_CS, SPI, SPI_SD_FREQUENCY
+  #if defined (_TFT_eSPIH_)
+    #define SD_CONFIG SD_CS, GFX_EXEC(getSPIinstance()), SPI_SD_FREQUENCY
+  #else
+    #define SD_CONFIG SD_CS, SPI, SPI_SD_FREQUENCY
+  #endif
 #endif
 
 // Temporary buffer size for string manipulation
@@ -312,8 +317,7 @@ bool sdcard_setup(void) {
   }
 
 #if defined (ARDUINO_ESP32_2432S028R)
-  // It works with LovyanGFX but not with TFT_eSPI.
-  SPI.begin(SD_SCK, SD_MISO, SD_MOSI, SD_CS);
+  sd_spi.begin(SD_SCK, SD_MISO, SD_MOSI, SD_CS);
 #endif
 
   if (SD.begin(SD_CONFIG)) {

touch.hpp

@@ -99,8 +99,7 @@ extern uint16_t lcd_width;
 extern uint16_t lcd_height;
 
 /*--------------------------------------------------------------------------------
- * Touch panel instance for XPT2046_Touchscreen library
- * Assign the CYD touch panel on a different SPI bus from that of the display.
+ * Instance of XPT2046_Touchscreen library
  *--------------------------------------------------------------------------------*/
 #if defined (_XPT2046_Touchscreen_h_)
 #include "boards/XPT2046_ScreenPoint.h"
@@ -112,6 +111,7 @@ static XPT2046_ScreenPoint sp(TOUCH_CS, TOUCH_IRQ);
  * Setup touch manager
  *--------------------------------------------------------------------------------*/
 bool touch_setup(void) {
+
 #if defined (_XPT2046_Touchscreen_h_)
   sp_spi.begin(TOUCH_CLK, TOUCH_MISO, TOUCH_MOSI, TOUCH_CS);
   sp.begin(sp_spi, lcd_width, lcd_height, SCREEN_ROTATION);