prepare for ESP32S3

Author: schreibfaul1

lib/es8388/ES8388.cpp

@@ -146,12 +146,13 @@ bool ES8388::begin(int sda, int scl, uint32_t frequency)
         res &= write_reg(ES8388_ADDR, ES8388_DACPOWER, 0x3c);
         res &= write_reg(ES8388_ADDR, ES8388_DACCONTROL3, 0x00);
         res &= write_reg(ES8388_ADDR, ES8388_ADCPOWER, 0x00);
-        
+
         /* set up MCLK) */
-		PIN_FUNC_SELECT(PERIPHS_IO_MUX_GPIO0_U, FUNC_GPIO0_CLK_OUT1);
+        #ifdef FUNC_GPIO0_CLK_OUT1
+		    PIN_FUNC_SELECT(PERIPHS_IO_MUX_GPIO0_U, FUNC_GPIO0_CLK_OUT1);
+        #endif
         WRITE_PERI_REG(PIN_CTRL, 0xFFF0);
     }
-
     return res;
 }
 

lib/tftLib/src/tft.cpp

@@ -503,22 +503,10 @@ uint8_t TFT::getRotation(void) const{
 
 void TFT::begin(uint8_t CS, uint8_t DC, uint8_t spi, uint8_t mosi, uint8_t miso, uint8_t sclk) {
 
-    // default is VSPI (VSPI_MISO 19, VSPI_MOSI 23, VSPI_SCLK 18)
-    //            HSPI (HSPI_MISO 12, HSPI_MOSI 13, HSPI_SCLK 14)
+    spi_TFT = new SPIClass(spi);
+    spi_TFT->begin(sclk, miso, mosi, -1);
+    spi_TFT->setFrequency(_freq);
 
-    if(spi == VSPI){
-        spi_TFT = &SPI;
-        spi_TFT->begin(sclk, miso, mosi, -1);
-        spi_TFT->setFrequency(_freq);
-    }
-    else if(spi == HSPI){
-        spi_TFT = new SPIClass(HSPI);
-        spi_TFT->begin(sclk, miso, mosi, -1);
-        spi_TFT->setFrequency(_freq);
-    }
-    else{
-        log_e("unknown SPI authority");
-    }
     TFT_SPI = SPISettings(_freq, MSBFIRST, SPI_MODE0);
 
 

lib/tftLib/src/tft.h

@@ -88,14 +88,14 @@ extern __attribute__((weak)) void tp_released();
 #define TFT_WHITE           0xFFFF // 255, 255, 255
 #define TFT_YELLOW          0xFFE0 // 255, 255,   0
 
+
 class TFT : public Print {
     protected:
     File gif_file;
     public:
         TFT(uint8_t TFT_id = 0, uint8_t dispInv = 0);
         virtual ~TFT(){}
-
-        void begin(uint8_t CS, uint8_t DC, uint8_t spi = VSPI, uint8_t mosi = 23, uint8_t miso = 19, uint8_t sclk = 18);
+        void begin(uint8_t CS, uint8_t DC, uint8_t spi, uint8_t mosi, uint8_t miso, uint8_t sclk);
         void      setFrequency(uint32_t f);
         void      setRotation(uint8_t r);
         bool      setCursor(uint16_t x, uint16_t y);

platformio.ini

@@ -10,10 +10,10 @@
 
 [env:esp32dev]
 ;platform = https://github.com/platformio/platform-espressif32.git#v4.2.0
-platform = https://github.com/platformio/platform-espressif32.git#v4.3.0
+platform = https://github.com/platformio/platform-espressif32.git#v4.4.0
 
-board = esp32dev
-;board = esp32-s3-devkitc-1
+;board = esp32dev
+board = um_tinys3
 
 board_build.f_cpu = 240000000L
 board_build.flash_size=4MB
@@ -32,6 +32,7 @@ lib_deps =
 
 
 platform_packages =
+;   platformio/tool-esptoolpy@~1.40200.0
 ;    framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.1-RC1
     framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.3-RC1
 ;    framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#master
@@ -47,11 +48,10 @@ board_upload.flash_size = 4MB
 ;build_flags = -DCORE_DEBUG_LEVEL=5    ; Verbose
 build_flags =
         -Wdouble-promotion             ; double to float warnings
-        -DCORE_DEBUG_LEVEL=1
+        -DCORE_DEBUG_LEVEL=3
         -DCONFIG_ARDUHAL_LOG_COLORS=1
 ;       -DBOARD_HAS_PSRAM
 ;       -mfix-esp32-psram-cache-issue
-;       -mfix-esp32-psram-cache-strategy=memw
         -DARDUINO_RUNNING_CORE=1       ; Arduino Runs On Core (setup, loop)
         -DARDUINO_EVENT_RUNNING_CORE=1 ; Events Run On Core
 

src/main.cpp

@@ -1018,6 +1018,9 @@ void setup(){
 
     SerialPrintfln("setup: ....  Init SD card");
     pinMode(SD_MMC_D0, INPUT_PULLUP);
+    #ifdef CONFIG_IDF_TARGET_ESP32S3
+        SD_MMC.setPins(SD_MMC_CLK, SD_MMC_CMD, SD_MMC_D0);
+    #endif
     if(!SD_MMC.begin("/sdcard", true)){
         clearAll();
         tft.setFont(_fonts[5]);