From e09230c9ac8696b917ceb6110ebbed294813fc9b Mon Sep 17 00:00:00 2001
From: Bodmer <bodmer@anola.net>
Date: Mon, 25 Apr 2022 02:29:08 +0100
Subject: [PATCH] Raise version to 2.4.60

---
 Processors/TFT_eSPI_ESP32_C3.c |  2 ++
 Processors/TFT_eSPI_ESP32_C3.h |  2 ++
 Processors/TFT_eSPI_ESP32_S3.c |  2 ++
 Processors/TFT_eSPI_ESP32_S3.h | 18 ++++++++++--------
 TFT_eSPI.h                     |  2 +-
 library.json                   |  2 +-
 library.properties             |  2 +-
 7 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/Processors/TFT_eSPI_ESP32_C3.c b/Processors/TFT_eSPI_ESP32_C3.c
index d438551..5d588ea 100644
--- a/Processors/TFT_eSPI_ESP32_C3.c
+++ b/Processors/TFT_eSPI_ESP32_C3.c
@@ -2,6 +2,8 @@
         // TFT_eSPI driver functions for ESP32 processors //
         ////////////////////////////////////////////////////
 
+// Temporarily a separate file to TFT_eSPI_ESP32.c until board package low level API stabilises
+
 ////////////////////////////////////////////////////////////////////////////////////////
 // Global variables
 ////////////////////////////////////////////////////////////////////////////////////////
diff --git a/Processors/TFT_eSPI_ESP32_C3.h b/Processors/TFT_eSPI_ESP32_C3.h
index 247f6c8..6c315e6 100644
--- a/Processors/TFT_eSPI_ESP32_C3.h
+++ b/Processors/TFT_eSPI_ESP32_C3.h
@@ -5,6 +5,8 @@
 #ifndef _TFT_eSPI_ESP32H_
 #define _TFT_eSPI_ESP32H_
 
+#warning >>>>------>> ESP32 C3 support is incomplete and non-functional at the moment
+
 // Processor ID reported by getSetup()
 #define PROCESSOR_ID 0x32
 
diff --git a/Processors/TFT_eSPI_ESP32_S3.c b/Processors/TFT_eSPI_ESP32_S3.c
index 9365379..77486d7 100644
--- a/Processors/TFT_eSPI_ESP32_S3.c
+++ b/Processors/TFT_eSPI_ESP32_S3.c
@@ -2,6 +2,8 @@
         // TFT_eSPI driver functions for ESP32 processors //
         ////////////////////////////////////////////////////
 
+// Temporarily a separate file to TFT_eSPI_ESP32.c until board package low level API stabilises
+
 ////////////////////////////////////////////////////////////////////////////////////////
 // Global variables
 ////////////////////////////////////////////////////////////////////////////////////////
diff --git a/Processors/TFT_eSPI_ESP32_S3.h b/Processors/TFT_eSPI_ESP32_S3.h
index 392be1d..29b99fb 100644
--- a/Processors/TFT_eSPI_ESP32_S3.h
+++ b/Processors/TFT_eSPI_ESP32_S3.h
@@ -2,9 +2,13 @@
         // TFT_eSPI driver functions for ESP32 processors //
         ////////////////////////////////////////////////////
 
+// Temporarily a separate file to TFT_eSPI_ESP32.h until board package low level API stabilises
+
 #ifndef _TFT_eSPI_ESP32H_
 #define _TFT_eSPI_ESP32H_
 
+#warning >>>>------>> DMA is not supported on the ESP32 S3 (possible future update)
+
 // Processor ID reported by getSetup()
 #define PROCESSOR_ID 0x32
 
@@ -20,11 +24,12 @@
   #define VSPI FSPI
 #endif
 
-// Fix IDF problems with ESP32S3 VSPI=FSPI_HOST=SPI2_HOST=1   HSPI_HOST=SPI3_HOST=2
+// Fix IDF problems with ESP32S3
+// Note illogical enumerations: FSPI_HOST=SPI2_HOST=1   HSPI_HOST=SPI3_HOST=2
 #if CONFIG_IDF_TARGET_ESP32S3
-  // Fix ESP32C3 IDF bug for missing definition (VSPI/FSPI only tested at the moment)
-  #ifndef REG_SPI_BASE
-    #define REG_SPI_BASE(i)     (((i)>1) ? (DR_REG_SPI3_BASE) : (DR_REG_SPI2_BASE))
+  // Fix ESP32C3 IDF bug for missing definition (FSPI only tested at the moment)
+  #ifndef REG_SPI_BASE //                      HSPI                 FSPI/VSPI
+    #define REG_SPI_BASE(i) (((i)>1) ? (DR_REG_SPI3_BASE) : (DR_REG_SPI2_BASE))
   #endif
 
   // Fix ESP32S3 IDF bug for name change
@@ -32,9 +37,6 @@
     #define SPI_MOSI_DLEN_REG(x) SPI_MS_DLEN_REG(x)
   #endif
 
-  // Fix ESP32C3 specific register reference
-  //#define out_w1tc out_w1tc.val
-  //#define out_w1ts out_w1ts.val
 #endif
 
 // SUPPORT_TRANSACTIONS is mandatory for ESP32 so the hal mutex is toggled
@@ -58,7 +60,7 @@ FSPI = 0, uses SPI2 ???? To be checked
 HSPI = 1, uses SPI3 ???? To be checked
 VSPI not defined
 
-For ESP32/S2/C3:
+For ESP32/S2/C3/S3:
 SPI1_HOST = 0
 SPI2_HOST = 1
 SPI3_HOST = 2
diff --git a/TFT_eSPI.h b/TFT_eSPI.h
index b13c39d..3eca4ac 100644
--- a/TFT_eSPI.h
+++ b/TFT_eSPI.h
@@ -16,7 +16,7 @@
 #ifndef _TFT_eSPIH_
 #define _TFT_eSPIH_
 
-#define TFT_ESPI_VERSION "2.4.51"
+#define TFT_ESPI_VERSION "2.4.60"
 
 // Bit level feature flags
 // Bit 0 set: viewport capability
diff --git a/library.json b/library.json
index b9e8b86..74d8eb9 100644
--- a/library.json
+++ b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "TFT_eSPI",
-  "version": "2.4.51",
+  "version": "2.4.60",
   "keywords": "Arduino, tft, display, ttgo, LilyPi, WT32-SC01, ePaper, display, Pico, RP2040 Nano Connect, RP2040, STM32, ESP8266, NodeMCU, ESP32, M5Stack, ILI9341, ST7735, ILI9163, S6D02A1, ILI9481, ILI9486, ILI9488, ST7789, ST7796, RM68140, SSD1351, SSD1963, ILI9225, HX8357D, GC9A01, R61581",
   "description": "A TFT and ePaper SPI graphics library with optimisation for Raspberry Pi Pico, RP2040, ESP8266, ESP32 and STM32",
   "repository":
diff --git a/library.properties b/library.properties
index 7668857..8a81257 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=TFT_eSPI
-version=2.4.51
+version=2.4.60
 author=Bodmer
 maintainer=Bodmer
 sentence=TFT graphics library for Arduino processors with performance optimisation for RP2040, STM32, ESP8266 and ESP32