esp_lcd_panel is not part of ESP32#610

schreibfaul1 · Jan 24, 2025 · f39dfe1 · f39dfe1
1 parent 7fd766a
commit f39dfe1
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 35 deletions.
diff --git a/dependencies.lock b/dependencies.lock
@@ -49,20 +49,6 @@ dependencies:
       registry_url: https://components.espressif.com
       type: service
     version: 0.0.11
-  espressif/esp-sr:
-    component_hash: 9b41fd5ae5960c393bfd3559cd6e5fa2a95c0bf833915cebafe57fb8c4e4c396
-    dependencies:
-    - name: espressif/esp-dsp
-      registry_url: https://components.espressif.com
-      require: private
-      version: <=1.5.0
-    - name: idf
-      require: private
-      version: '>=5.0'
-    source:
-      registry_url: https://components.espressif.com/
-      type: service
-    version: 1.9.5
   espressif/esp-zboss-lib:
     component_hash: fad683f7e04366398b61c0eea6e6517d4fe7ec4112407e26743dc80bafc0dcdc
     dependencies:
@@ -116,24 +102,24 @@ dependencies:
       registry_url: https://components.espressif.com
       require: private
       version: '>=4.1'
-    - name: espressif/rmaker_common
+    - name: espressif/cbor
       registry_url: https://components.espressif.com
       require: private
-      version: ~1.4.0
-    - name: espressif/esp_diagnostics
+      rules:
+      - if: idf_version >=5.0
+      version: ~0.6
+    - name: espressif/esp_diag_data_store
       registry_url: https://components.espressif.com
       require: private
       version: ~1.0
-    - name: espressif/esp_diag_data_store
+    - name: espressif/esp_diagnostics
       registry_url: https://components.espressif.com
       require: private
       version: ~1.0
-    - name: espressif/cbor
+    - name: espressif/rmaker_common
       registry_url: https://components.espressif.com
       require: private
-      rules:
-      - if: idf_version >=5.0
-      version: ~0.6
+      version: ~1.4.0
     source:
       registry_url: https://components.espressif.com/
       type: service
@@ -274,15 +260,15 @@ dependencies:
       type: service
     version: 1.0.20~2
   espressif/mdns:
-    component_hash: d36b265164be5139f92de993f08f5ecaa0de0c0acbf84deee1f10bb5902d04ff
+    component_hash: d439c8c9f4a029f521fc772f5a1376af7972ffbad7ff353eff58d98258696633
     dependencies:
     - name: idf
       require: private
       version: '>=5.0'
     source:
       registry_url: https://components.espressif.com/
       type: service
-    version: 1.4.3
+    version: 1.5.1
   espressif/network_provisioning:
     component_hash: ef2e10182fd1861e68b821491916327c25416ca7ae70e5a6e43313dbc71fe993
     dependencies:
@@ -327,7 +313,6 @@ direct_dependencies:
 - espressif/cbor
 - espressif/esp-dsp
 - espressif/esp-modbus
-- espressif/esp-sr
 - espressif/esp-zboss-lib
 - espressif/esp-zigbee-lib
 - espressif/esp_diag_data_store
@@ -343,5 +328,5 @@ direct_dependencies:
 - idf
 - joltwallet/littlefs
 manifest_hash: d4982e9096cdc1deb27a8d5e9365200810e8d9512678f5f2095695b51e4b2c7b
-target: esp32s3
+target: esp32
 version: 2.0.0
diff --git a/lib/tftLib/src/tft.cpp b/lib/tftLib/src/tft.cpp
@@ -661,6 +661,7 @@ void TFT::begin(uint8_t CS, uint8_t DC, uint8_t spi, uint8_t mosi, uint8_t miso,
 }
 //——————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————
 void TFT::begin(const Pins& newPins, const Timing& newTiming){ // RGB_HMI
+#ifdef RGB_HMI
     m_pins = newPins;
     m_timing = newTiming;
 
@@ -730,6 +731,7 @@ void TFT::begin(const Pins& newPins, const Timing& newTiming){ // RGB_HMI
 
     log_e("m_h_res: %d, m_v_res: %d, m_framebuffer %i", m_h_res, m_v_res, m_framebuffer);
     memset(m_framebuffer, 0x00, m_h_res * m_v_res * 2);
+#endif
 }
 //——————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————
 typedef struct {

diff --git a/lib/tftLib/src/tft.h b/lib/tftLib/src/tft.h
@@ -8,11 +8,9 @@
 #include "SPI.h"
 #include "FS.h"
 #include "vector"
-#include "esp_lcd_panel_io.h"
-#include "esp_lcd_panel_rgb.h"
-#include "esp_lcd_panel_ops.h"
+
 #include "esp_log.h"
-#include "esp_lcd_panel_interface.h"
+
 #include "driver/gpio.h"
 #include "fonts/fontsdef.h"
 #include "fonts/TimesNewRoman.h"
@@ -22,6 +20,13 @@
 #include "fonts/Arial.h"
 #include "fonts/Z300.h"
 
+#ifdef CONFIG_IDF_TARGET_ESP32S3
+#include "esp_lcd_panel_io.h"
+#include "esp_lcd_panel_rgb.h"
+#include "esp_lcd_panel_ops.h"
+#include "esp_lcd_panel_interface.h"
+#endif
+
 using namespace std;
 
 
@@ -218,9 +223,11 @@ class TFT{
       uint8_t                _TFTcontroller = ILI9341;
       SPISettings            TFT_SPI;        // SPI settings for this slave
       SPIClass*              spi_TFT = NULL; // use in class TP
+#ifdef CONFIG_IDF_TARGET_ESP32S3
       Pins                   m_pins;
       Timing                 m_timing;
       esp_lcd_panel_handle_t m_panel;
+#endif
       uint16_t               m_h_res = 0;
       uint16_t               m_v_res = 0;
       uint16_t*              m_framebuffer;

diff --git a/platformio.ini b/platformio.ini
@@ -66,10 +66,11 @@ board_build.embed_txtfiles =
     managed_components/espressif__esp_rainmaker/server_certs/rmaker_ota_server.crt
 
 lib_deps =
-    https://github.com/schreibfaul1/ESP32-audioI2S.git
-    https://github.com/schreibfaul1/ESP32-KCX-BT-EMITTER.git
-    https://github.com/schreibfaul1/ESP32-DLNA-Client.git
-    https://github.com/schreibfaul1/ESP32-IR-Remote-Control.git
+    https://github.com/schreibfaul1/ESP32-audioI2S.git#213e0e6          ;Version 3.1.0b
+    https://github.com/schreibfaul1/ESP32-KCX-BT-EMITTER.git#6181da6    ;27.12.2024
+    https://github.com/schreibfaul1/ESP32-DLNA-Client.git#b9d4f52       ;20.01.2024
+    https://github.com/schreibfaul1/ESP32-IR-Remote-Control.git#c371281 ;05.01.2025
+
 ;—————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————
 [env:esp32]
     board = ${esp32.board}

diff --git a/sdkconfig.esp32 b/sdkconfig.esp32
@@ -583,6 +583,7 @@ CONFIG_TWAI_ERRATA_FIX_LISTEN_ONLY_DOM=y
 #
 CONFIG_ADC_DISABLE_DAC=y
 # CONFIG_ADC_SUPPRESS_DEPRECATE_WARN is not set
+# CONFIG_ADC_SKIP_LEGACY_CONFLICT_CHECK is not set
 
 #
 # Legacy ADC Calibration Configuration
@@ -598,42 +599,49 @@ CONFIG_ADC_CAL_LUT_ENABLE=y
 # Legacy DAC Driver Configurations
 #
 # CONFIG_DAC_SUPPRESS_DEPRECATE_WARN is not set
+# CONFIG_DAC_SKIP_LEGACY_CONFLICT_CHECK is not set
 # end of Legacy DAC Driver Configurations
 
 #
 # Legacy MCPWM Driver Configurations
 #
 # CONFIG_MCPWM_SUPPRESS_DEPRECATE_WARN is not set
+# CONFIG_MCPWM_SKIP_LEGACY_CONFLICT_CHECK is not set
 # end of Legacy MCPWM Driver Configurations
 
 #
 # Legacy Timer Group Driver Configurations
 #
 # CONFIG_GPTIMER_SUPPRESS_DEPRECATE_WARN is not set
+# CONFIG_GPTIMER_SKIP_LEGACY_CONFLICT_CHECK is not set
 # end of Legacy Timer Group Driver Configurations
 
 #
 # Legacy RMT Driver Configurations
 #
 # CONFIG_RMT_SUPPRESS_DEPRECATE_WARN is not set
+# CONFIG_RMT_SKIP_LEGACY_CONFLICT_CHECK is not set
 # end of Legacy RMT Driver Configurations
 
 #
 # Legacy I2S Driver Configurations
 #
 # CONFIG_I2S_SUPPRESS_DEPRECATE_WARN is not set
+# CONFIG_I2S_SKIP_LEGACY_CONFLICT_CHECK is not set
 # end of Legacy I2S Driver Configurations
 
 #
 # Legacy PCNT Driver Configurations
 #
 # CONFIG_PCNT_SUPPRESS_DEPRECATE_WARN is not set
+# CONFIG_PCNT_SKIP_LEGACY_CONFLICT_CHECK is not set
 # end of Legacy PCNT Driver Configurations
 
 #
 # Legacy SDM Driver Configurations
 #
 # CONFIG_SDM_SUPPRESS_DEPRECATE_WARN is not set
+# CONFIG_SDM_SKIP_LEGACY_CONFLICT_CHECK is not set
 # end of Legacy SDM Driver Configurations
 # end of Driver Configurations
 

diff --git a/src/common.h b/src/common.h
@@ -7,7 +7,7 @@
 #define _SSID                   "mySSID"                        // Your WiFi credentials here
 #define _PW                     "myWiFiPassword"                // Or in textfile on SD-card
 #define DECODER                 1                               // (1)MAX98357A PCM5102A CS4344... (2)AC101, (3)ES8388
-#define TFT_CONTROLLER          5                               // (0)ILI9341, (1)HX8347D, (2)ILI9486a, (3)ILI9486b, (4)ILI9488, (5)ST7796, (6)ST7796RPI, (7)RGB_HMI
+#define TFT_CONTROLLER          5                               // (0)ILI9341, (1)HX8347D, (2)ILI9486a, (3)ILI9486b, (4)ILI9488, (5)ST7796, (6)ST7796RPI
 #define DISPLAY_INVERSION       0                               // (0) off (1) on
 #define TFT_ROTATION            1                               // 1 or 3 (landscape)
 #define TFT_FREQUENCY           40000000                        // 80000000, 40000000, 27000000, 20000000, 10000000