fix: complete esp32 display component modularization and build pipeline

build_scripts/build_esp32.bat

@@ -111,8 +111,10 @@ set CMAKE_ARGS=
 if "%TARGET%"=="esp32s3ram" (
     set IDF_TARGET=esp32s3
     set SDKCONFIG_DEFAULTS=sdkconfig.defaults;sdkconfig.defaults.esp32s3ram
+    set ENABLE_DISPLAY=1
     set CMAKE_ARGS=-DSDKCONFIG_DEFAULTS="sdkconfig.defaults;sdkconfig.defaults.esp32s3ram" -DENABLE_DISPLAY=1
 ) else (
+    set ENABLE_DISPLAY=0
     set IDF_TARGET=%TARGET%
 )
 

libraries/ESP32_Display_Panel/CMakeLists.txt

@@ -6,7 +6,7 @@ file(GLOB_RECURSE C_SRCS "${SRCS_DIR}/*.c")
 idf_component_register(
     SRCS ${C_SRCS} ${CPP_SRCS}
     INCLUDE_DIRS ${SRCS_DIR} "."
-    REQUIRES driver esp_lcd
+    REQUIRES driver esp_lcd ESP32_IO_Expander esp-lib-utils
 )
 
 target_compile_options(${COMPONENT_LIB}

libraries/ESP32_Display_Panel/idf_component.yml

@@ -1,13 +0,0 @@
-version: "1.0.2"
-description: ESP32_Display_Panel is a display driver and GUI porting library designed by Espressif specifically for ESP series SoCs (ESP32, ESP32-S3, ESP32-P4, etc.)
-url: https://github.com/esp-arduino-libs/ESP32_Display_Panel
-repository: https://github.com/esp-arduino-libs/ESP32_Display_Panel.git
-issues: https://github.com/esp-arduino-libs/ESP32_Display_Panel/issues
-dependencies:
-  idf: ">=5.1"
-  espressif/esp-lib-utils:
-    version: "0.2.*"
-    public: true
-  espressif/esp32_io_expander:
-    version: "1.*"
-    public: true

libraries/ESP32_IO_Expander/CMakeLists.txt

@@ -11,6 +11,7 @@ idf_component_register(
         ${SRCS_DIR}
     REQUIRES
         driver
+        esp-lib-utils
 )
 
 target_compile_options(${COMPONENT_LIB}

libraries/ESP32_IO_Expander/idf_component.yml

@@ -1,10 +0,0 @@
-version: "1.1.0"
-description: ESP32_IO_Expander is a library designed for driving IO expander chips using ESP SoCs
-url: https://github.com/esp-arduino-libs/ESP32_IO_Expander
-repository: https://github.com/esp-arduino-libs/ESP32_IO_Expander.git
-issues: https://github.com/esp-arduino-libs/ESP32_IO_Expander/issues
-dependencies:
-  idf: ">=5.1"
-  espressif/esp-lib-utils:
-    version: "0.2.*"
-    public: true

libraries/esp-lib-utils/idf_component.yml

@@ -1,7 +0,0 @@
-version: "0.2.0"
-description: esp-lib-utils is a library designed for ESP SoCs to provide utility functions, including logging, checking, and memory.
-url: https://github.com/esp-arduino-libs/esp-lib-utils
-repository: https://github.com/esp-arduino-libs/esp-lib-utils.git
-issues: https://github.com/esp-arduino-libs/esp-lib-utils/issues
-dependencies:
-  idf: ">=5.1"

libraries/lvgl/idf_component.yml

@@ -1,5 +0,0 @@
-description: LVGL - Light and Versatile Graphics Library
-url: https://lvgl.io/
-repository: https://github.com/lvgl/lvgl.git
-documentation: https://docs.lvgl.io/
-issues: https://github.com/lvgl/lvgl/issues

platforms/ESP-IDF/CMakeLists.txt

@@ -19,12 +19,15 @@ include_directories("$ENV{IDF_PATH}/../../libraries/berry/src")
 include_directories("$ENV{IDF_PATH}/../../include")
 include_directories("$ENV{IDF_PATH}/../../src/driver/display")
 
+if(ENABLE_DISPLAY OR (DEFINED ENV{ENABLE_DISPLAY} AND "$ENV{ENABLE_DISPLAY}" EQUAL "1"))
+    list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/../../libraries/ESP32_Display_Panel" "$ENV{IDF_PATH}/../../libraries/lvgl" "$ENV{IDF_PATH}/../../libraries/ESP32_IO_Expander" "$ENV{IDF_PATH}/../../libraries/esp-lib-utils")
+endif()
+
 #set(PROJECT_VER "$ENV{APP_VERSION}")
 project(OpenBeken)
 idf_build_set_property(COMPILE_OPTIONS "-Wno-error=format-truncation" APPEND)
 idf_build_set_property(COMPILE_OPTIONS "-Wno-error=incompatible-pointer-types" APPEND)
 
-if(ENABLE_DISPLAY)
-    list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/../../libraries/ESP32_Display_Panel" "$ENV{IDF_PATH}/../../libraries/lvgl" "$ENV{IDF_PATH}/../../libraries/ESP32_IO_Expander" "$ENV{IDF_PATH}/../../libraries/esp-lib-utils")
+if(ENABLE_DISPLAY OR (DEFINED ENV{ENABLE_DISPLAY} AND "$ENV{ENABLE_DISPLAY}" EQUAL "1"))
     idf_build_set_property(COMPILE_OPTIONS "-DLV_CONF_INCLUDE_SIMPLE=1" "-DBOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_5=1" "-DESP_PANEL_BOARD_DEFAULT_USE_SUPPORTED=1" "-DESP_PANEL_BOARD_USE_SUPPORTED_FILE=1" "-DESP_PANEL_BOARD_INCLUDE_SUPPORTED_SIMPLE=1" APPEND)
 endif()

platforms/ESP-IDF/main/CMakeLists.txt

@@ -37,7 +37,8 @@ if(ENABLE_MDNS_ESPIDF)
 	)
 endif()
 set(PRIV_REQ_COMPONENTS mqtt lwip esp_wifi nvs_flash esp_driver_tsens esp_driver_gpio esp_pm esp_partition app_update esp_adc esp_driver_uart esp_driver_ledc spi_flash esp_driver_spi esp_driver_gptimer)
-if(ENABLE_DISPLAY)
+message(STATUS "ENABLE_DISPLAY is '${ENABLE_DISPLAY}' in main/CMakeLists.txt")
+if(ENABLE_DISPLAY OR (DEFINED ENV{ENABLE_DISPLAY} AND "$ENV{ENABLE_DISPLAY}" EQUAL "1"))
 	list(APPEND PRIV_REQ_COMPONENTS ESP32_Display_Panel lvgl)
 endif()
 

src/driver/drv_main.c

@@ -1523,7 +1523,7 @@ static driver_t g_drivers[] = {
 	NULL,                                    // onChannelChanged
 	NULL,                                    // onHassDiscovery
 	false,                                   // loaded
-	}
+	},
 #endif
 	//{ "", NULL, NULL, NULL, NULL, NULL, NULL, NULL, false },
 #if ENABLE_DRIVER_DISPLAY