diff --git a/SquareLine/boards/espbox_3/sdkconfig.defaults b/SquareLine/boards/espbox_3/sdkconfig.defaults deleted file mode 100644 index 22c58f9d6..000000000 --- a/SquareLine/boards/espbox_3/sdkconfig.defaults +++ /dev/null @@ -1,8 +0,0 @@ -# This file was generated using idf.py save-defconfig. It can be edited manually. -# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration -# -CONFIG_IDF_TARGET="esp32s3" -CONFIG_LV_COLOR_16_SWAP=y -CONFIG_LV_MEM_CUSTOM=y -CONFIG_LV_MEMCPY_MEMSET_STD=y -CONFIG_LV_USE_PERF_MONITOR=y \ No newline at end of file diff --git a/SquareLine/boards/espbox_lite/sdkconfig.defaults b/SquareLine/boards/espbox_lite/sdkconfig.defaults deleted file mode 100644 index 22c58f9d6..000000000 --- a/SquareLine/boards/espbox_lite/sdkconfig.defaults +++ /dev/null @@ -1,8 +0,0 @@ -# This file was generated using idf.py save-defconfig. It can be edited manually. -# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration -# -CONFIG_IDF_TARGET="esp32s3" -CONFIG_LV_COLOR_16_SWAP=y -CONFIG_LV_MEM_CUSTOM=y -CONFIG_LV_MEMCPY_MEMSET_STD=y -CONFIG_LV_USE_PERF_MONITOR=y \ No newline at end of file diff --git a/SquareLine/boards/custom_waveshare_7inch/README.md b/SquareLine/boards/v8/custom_waveshare_7inch/README.md similarity index 100% rename from SquareLine/boards/custom_waveshare_7inch/README.md rename to SquareLine/boards/v8/custom_waveshare_7inch/README.md diff --git a/SquareLine/boards/custom_waveshare_7inch/components/ws_7inch/CMakeLists.txt b/SquareLine/boards/v8/custom_waveshare_7inch/components/ws_7inch/CMakeLists.txt similarity index 100% rename from SquareLine/boards/custom_waveshare_7inch/components/ws_7inch/CMakeLists.txt rename to SquareLine/boards/v8/custom_waveshare_7inch/components/ws_7inch/CMakeLists.txt diff --git a/SquareLine/boards/custom_waveshare_7inch/components/ws_7inch/LICENSE b/SquareLine/boards/v8/custom_waveshare_7inch/components/ws_7inch/LICENSE similarity index 100% rename from SquareLine/boards/custom_waveshare_7inch/components/ws_7inch/LICENSE rename to SquareLine/boards/v8/custom_waveshare_7inch/components/ws_7inch/LICENSE diff --git a/SquareLine/boards/custom_waveshare_7inch/components/ws_7inch/README.md b/SquareLine/boards/v8/custom_waveshare_7inch/components/ws_7inch/README.md similarity index 100% rename from SquareLine/boards/custom_waveshare_7inch/components/ws_7inch/README.md rename to SquareLine/boards/v8/custom_waveshare_7inch/components/ws_7inch/README.md diff --git a/SquareLine/boards/custom_waveshare_7inch/components/ws_7inch/idf_component.yml b/SquareLine/boards/v8/custom_waveshare_7inch/components/ws_7inch/idf_component.yml similarity index 100% rename from SquareLine/boards/custom_waveshare_7inch/components/ws_7inch/idf_component.yml rename to SquareLine/boards/v8/custom_waveshare_7inch/components/ws_7inch/idf_component.yml diff --git a/SquareLine/boards/custom_waveshare_7inch/components/ws_7inch/include/bsp/display.h b/SquareLine/boards/v8/custom_waveshare_7inch/components/ws_7inch/include/bsp/display.h similarity index 100% rename from SquareLine/boards/custom_waveshare_7inch/components/ws_7inch/include/bsp/display.h rename to SquareLine/boards/v8/custom_waveshare_7inch/components/ws_7inch/include/bsp/display.h diff --git a/SquareLine/boards/custom_waveshare_7inch/components/ws_7inch/include/bsp/esp-bsp.h b/SquareLine/boards/v8/custom_waveshare_7inch/components/ws_7inch/include/bsp/esp-bsp.h similarity index 100% rename from SquareLine/boards/custom_waveshare_7inch/components/ws_7inch/include/bsp/esp-bsp.h rename to SquareLine/boards/v8/custom_waveshare_7inch/components/ws_7inch/include/bsp/esp-bsp.h diff --git a/SquareLine/boards/custom_waveshare_7inch/components/ws_7inch/include/bsp/touch.h b/SquareLine/boards/v8/custom_waveshare_7inch/components/ws_7inch/include/bsp/touch.h similarity index 100% rename from SquareLine/boards/custom_waveshare_7inch/components/ws_7inch/include/bsp/touch.h rename to SquareLine/boards/v8/custom_waveshare_7inch/components/ws_7inch/include/bsp/touch.h diff --git a/SquareLine/boards/custom_waveshare_7inch/components/ws_7inch/include/bsp/ws_7inch.h b/SquareLine/boards/v8/custom_waveshare_7inch/components/ws_7inch/include/bsp/ws_7inch.h similarity index 100% rename from SquareLine/boards/custom_waveshare_7inch/components/ws_7inch/include/bsp/ws_7inch.h rename to SquareLine/boards/v8/custom_waveshare_7inch/components/ws_7inch/include/bsp/ws_7inch.h diff --git a/SquareLine/boards/custom_waveshare_7inch/components/ws_7inch/pic.jpg b/SquareLine/boards/v8/custom_waveshare_7inch/components/ws_7inch/pic.jpg similarity index 100% rename from SquareLine/boards/custom_waveshare_7inch/components/ws_7inch/pic.jpg rename to SquareLine/boards/v8/custom_waveshare_7inch/components/ws_7inch/pic.jpg diff --git a/SquareLine/boards/custom_waveshare_7inch/components/ws_7inch/priv_include/bsp_err_check.h b/SquareLine/boards/v8/custom_waveshare_7inch/components/ws_7inch/priv_include/bsp_err_check.h similarity index 100% rename from SquareLine/boards/custom_waveshare_7inch/components/ws_7inch/priv_include/bsp_err_check.h rename to SquareLine/boards/v8/custom_waveshare_7inch/components/ws_7inch/priv_include/bsp_err_check.h diff --git a/SquareLine/boards/custom_waveshare_7inch/components/ws_7inch/ws_7inch.c b/SquareLine/boards/v8/custom_waveshare_7inch/components/ws_7inch/ws_7inch.c similarity index 100% rename from SquareLine/boards/custom_waveshare_7inch/components/ws_7inch/ws_7inch.c rename to SquareLine/boards/v8/custom_waveshare_7inch/components/ws_7inch/ws_7inch.c diff --git a/SquareLine/boards/custom_waveshare_7inch/image.png b/SquareLine/boards/v8/custom_waveshare_7inch/image.png similarity index 100% rename from SquareLine/boards/custom_waveshare_7inch/image.png rename to SquareLine/boards/v8/custom_waveshare_7inch/image.png diff --git a/SquareLine/boards/custom_waveshare_7inch/main/idf_component.yml b/SquareLine/boards/v8/custom_waveshare_7inch/main/idf_component.yml similarity index 100% rename from SquareLine/boards/custom_waveshare_7inch/main/idf_component.yml rename to SquareLine/boards/v8/custom_waveshare_7inch/main/idf_component.yml diff --git a/SquareLine/boards/custom_waveshare_7inch/manifest.json b/SquareLine/boards/v8/custom_waveshare_7inch/manifest.json similarity index 92% rename from SquareLine/boards/custom_waveshare_7inch/manifest.json rename to SquareLine/boards/v8/custom_waveshare_7inch/manifest.json index ae24ea821..367948647 100644 --- a/SquareLine/boards/custom_waveshare_7inch/manifest.json +++ b/SquareLine/boards/v8/custom_waveshare_7inch/manifest.json @@ -7,6 +7,8 @@ "screen_height":"480", "screen_color_swap":true, + "supported_lvgl_version":"8.2.0, 8.3.*", + "short_description":"Internal custom board with WaveShare 7inch Display made by Espressif.", "long_description":"Example of the custom BSP and custom LCD made by Espressif for various Demos.", diff --git a/SquareLine/boards/custom_waveshare_7inch/sdkconfig.defaults b/SquareLine/boards/v8/custom_waveshare_7inch/sdkconfig.defaults similarity index 89% rename from SquareLine/boards/custom_waveshare_7inch/sdkconfig.defaults rename to SquareLine/boards/v8/custom_waveshare_7inch/sdkconfig.defaults index 6a4a507f5..ac1b939f9 100644 --- a/SquareLine/boards/custom_waveshare_7inch/sdkconfig.defaults +++ b/SquareLine/boards/v8/custom_waveshare_7inch/sdkconfig.defaults @@ -4,4 +4,4 @@ CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y -CONFIG_LV_USE_PERF_MONITOR=y \ No newline at end of file +CONFIG_LV_USE_PERF_MONITOR=y diff --git a/SquareLine/boards/esp32_c3_lcdkit/image.png b/SquareLine/boards/v8/esp32_c3_lcdkit/image.png similarity index 100% rename from SquareLine/boards/esp32_c3_lcdkit/image.png rename to SquareLine/boards/v8/esp32_c3_lcdkit/image.png diff --git a/SquareLine/boards/esp32_c3_lcdkit/main/idf_component.yml b/SquareLine/boards/v8/esp32_c3_lcdkit/main/idf_component.yml similarity index 76% rename from SquareLine/boards/esp32_c3_lcdkit/main/idf_component.yml rename to SquareLine/boards/v8/esp32_c3_lcdkit/main/idf_component.yml index c5c12a4ca..33f20426a 100644 --- a/SquareLine/boards/esp32_c3_lcdkit/main/idf_component.yml +++ b/SquareLine/boards/v8/esp32_c3_lcdkit/main/idf_component.yml @@ -3,4 +3,4 @@ targets: - esp32c3 dependencies: idf: ">=4.4" - esp32_c3_lcdkit: "*" + esp32_c3_lcdkit: "==1.0.1" diff --git a/SquareLine/boards/esp32_c3_lcdkit/manifest.json b/SquareLine/boards/v8/esp32_c3_lcdkit/manifest.json similarity index 94% rename from SquareLine/boards/esp32_c3_lcdkit/manifest.json rename to SquareLine/boards/v8/esp32_c3_lcdkit/manifest.json index d39b4bb5d..22637a8df 100644 --- a/SquareLine/boards/esp32_c3_lcdkit/manifest.json +++ b/SquareLine/boards/v8/esp32_c3_lcdkit/manifest.json @@ -7,6 +7,8 @@ "screen_height":"240", "screen_color_swap":true, + "supported_lvgl_version":"8.2.0, 8.3.*", + "short_description":"ESP32-C3-LCDKit is a HMI development kit with encoder, that is based on Espressif's ESP32-C3.", "long_description":"ESP32-C3-LCDkit is an ESP32-C3-based evaluation development board with an SPI interface display. It also has an integrated rotary encoder switch and features screen interaction. Due to its low cost, low power consumption, and high performance, ESP32-C3 satisfies the basic GUI interaction needs, gaining ground in scenarios with small screen sizes.", diff --git a/SquareLine/boards/esp32_c3_lcdkit/sdkconfig.defaults b/SquareLine/boards/v8/esp32_c3_lcdkit/sdkconfig.defaults similarity index 100% rename from SquareLine/boards/esp32_c3_lcdkit/sdkconfig.defaults rename to SquareLine/boards/v8/esp32_c3_lcdkit/sdkconfig.defaults diff --git a/SquareLine/boards/esp32_s2_kaluga_kit/image.png b/SquareLine/boards/v8/esp32_s2_kaluga_kit/image.png similarity index 100% rename from SquareLine/boards/esp32_s2_kaluga_kit/image.png rename to SquareLine/boards/v8/esp32_s2_kaluga_kit/image.png diff --git a/SquareLine/boards/esp32_s2_kaluga_kit/main/idf_component.yml b/SquareLine/boards/v8/esp32_s2_kaluga_kit/main/idf_component.yml similarity index 74% rename from SquareLine/boards/esp32_s2_kaluga_kit/main/idf_component.yml rename to SquareLine/boards/v8/esp32_s2_kaluga_kit/main/idf_component.yml index 88fa466d1..1017a4131 100644 --- a/SquareLine/boards/esp32_s2_kaluga_kit/main/idf_component.yml +++ b/SquareLine/boards/v8/esp32_s2_kaluga_kit/main/idf_component.yml @@ -3,4 +3,4 @@ targets: - esp32s2 dependencies: idf: ">=4.4" - esp32_s2_kaluga_kit: "*" + esp32_s2_kaluga_kit: "==3.0.1" diff --git a/SquareLine/boards/esp32_s2_kaluga_kit/manifest.json b/SquareLine/boards/v8/esp32_s2_kaluga_kit/manifest.json similarity index 94% rename from SquareLine/boards/esp32_s2_kaluga_kit/manifest.json rename to SquareLine/boards/v8/esp32_s2_kaluga_kit/manifest.json index f8ff30ed6..282d3c515 100644 --- a/SquareLine/boards/esp32_s2_kaluga_kit/manifest.json +++ b/SquareLine/boards/v8/esp32_s2_kaluga_kit/manifest.json @@ -7,6 +7,8 @@ "screen_height":"240", "screen_color_swap":true, + "supported_lvgl_version":"8.2.0, 8.3.*", + "short_description":"The ESP32-S2-Kaluga-1 development kit produced by Espressif. It integrates the ESP32-S2-WROVER module and all the connectors for extension boards.", "long_description":"Multimedia development board ESP32-S2-Kaluga-1 kit based on ESP32-S2 has various functions, such as an LCD screen display, touch panel control, camera image acquisition, audio playback, etc. It can be flexibly assembled and disassembled, thus fulfilling a variety of customized requirements.", diff --git a/SquareLine/boards/esp32_s2_kaluga_kit/sdkconfig.defaults b/SquareLine/boards/v8/esp32_s2_kaluga_kit/sdkconfig.defaults similarity index 90% rename from SquareLine/boards/esp32_s2_kaluga_kit/sdkconfig.defaults rename to SquareLine/boards/v8/esp32_s2_kaluga_kit/sdkconfig.defaults index a27c7c44b..e292b8499 100644 --- a/SquareLine/boards/esp32_s2_kaluga_kit/sdkconfig.defaults +++ b/SquareLine/boards/v8/esp32_s2_kaluga_kit/sdkconfig.defaults @@ -5,4 +5,4 @@ CONFIG_IDF_TARGET="esp32s2" CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y -CONFIG_LV_USE_PERF_MONITOR=y \ No newline at end of file +CONFIG_LV_USE_PERF_MONITOR=y diff --git a/SquareLine/boards/esp32_s3_eye/image.png b/SquareLine/boards/v8/esp32_s3_eye/image.png similarity index 100% rename from SquareLine/boards/esp32_s3_eye/image.png rename to SquareLine/boards/v8/esp32_s3_eye/image.png diff --git a/SquareLine/boards/esp32_s3_korvo_2/main/idf_component.yml b/SquareLine/boards/v8/esp32_s3_eye/main/idf_component.yml similarity index 78% rename from SquareLine/boards/esp32_s3_korvo_2/main/idf_component.yml rename to SquareLine/boards/v8/esp32_s3_eye/main/idf_component.yml index 74a9d3c46..30d3534e1 100644 --- a/SquareLine/boards/esp32_s3_korvo_2/main/idf_component.yml +++ b/SquareLine/boards/v8/esp32_s3_eye/main/idf_component.yml @@ -3,4 +3,4 @@ targets: - esp32s3 dependencies: idf: ">=4.4" - esp32_s3_korvo_2: "*" + esp32_s3_eye: "==3.0.4" diff --git a/SquareLine/boards/esp32_s3_eye/manifest.json b/SquareLine/boards/v8/esp32_s3_eye/manifest.json similarity index 94% rename from SquareLine/boards/esp32_s3_eye/manifest.json rename to SquareLine/boards/v8/esp32_s3_eye/manifest.json index 825c14fb4..6533f53b4 100644 --- a/SquareLine/boards/esp32_s3_eye/manifest.json +++ b/SquareLine/boards/v8/esp32_s3_eye/manifest.json @@ -7,6 +7,8 @@ "screen_height":"240", "screen_color_swap":true, + "supported_lvgl_version":"8.2.0, 8.3.*", + "short_description":"The ESP32-S3-EYE is a small-sized AI development board produced by Espressif. It is based on the ESP32-S3 SoC and ESP-WHO.", "long_description":"ESP32-S3-EYE features a 2-Megapixel camera, an LCD display, and a microphone, which are used for image recognition and audio processing. ESP32-S3-EYE offers plenty of storage, with an 8 MB Octal PSRAM and a 8 MB flash. It also supports image transmission via Wi-Fi and debugging through a Micro-USB port.", diff --git a/SquareLine/boards/esp32_s3_usb_otg/sdkconfig.defaults b/SquareLine/boards/v8/esp32_s3_eye/sdkconfig.defaults similarity index 90% rename from SquareLine/boards/esp32_s3_usb_otg/sdkconfig.defaults rename to SquareLine/boards/v8/esp32_s3_eye/sdkconfig.defaults index 22c58f9d6..80a2848c3 100644 --- a/SquareLine/boards/esp32_s3_usb_otg/sdkconfig.defaults +++ b/SquareLine/boards/v8/esp32_s3_eye/sdkconfig.defaults @@ -5,4 +5,4 @@ CONFIG_IDF_TARGET="esp32s3" CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y -CONFIG_LV_USE_PERF_MONITOR=y \ No newline at end of file +CONFIG_LV_USE_PERF_MONITOR=y diff --git a/SquareLine/boards/esp32_s3_korvo_2/image.png b/SquareLine/boards/v8/esp32_s3_korvo_2/image.png similarity index 100% rename from SquareLine/boards/esp32_s3_korvo_2/image.png rename to SquareLine/boards/v8/esp32_s3_korvo_2/image.png diff --git a/SquareLine/boards/v8/esp32_s3_korvo_2/main/idf_component.yml b/SquareLine/boards/v8/esp32_s3_korvo_2/main/idf_component.yml new file mode 100644 index 000000000..4787121ec --- /dev/null +++ b/SquareLine/boards/v8/esp32_s3_korvo_2/main/idf_component.yml @@ -0,0 +1,6 @@ +description: ESP-BSP SquareLine LVGL Example +targets: + - esp32s3 +dependencies: + idf: ">=4.4" + esp32_s3_korvo_2: "==2.1.2" diff --git a/SquareLine/boards/esp32_s3_korvo_2/manifest.json b/SquareLine/boards/v8/esp32_s3_korvo_2/manifest.json similarity index 95% rename from SquareLine/boards/esp32_s3_korvo_2/manifest.json rename to SquareLine/boards/v8/esp32_s3_korvo_2/manifest.json index 6217509e1..be4e4c796 100644 --- a/SquareLine/boards/esp32_s3_korvo_2/manifest.json +++ b/SquareLine/boards/v8/esp32_s3_korvo_2/manifest.json @@ -7,6 +7,8 @@ "screen_height":"240", "screen_color_swap":true, + "supported_lvgl_version":"8.2.0, 8.3.*", + "short_description":"The ESP32-S3-Korvo-2 is a multimedia development board based on the ESP32-S3 chip.", "long_description":"The ESP32-S3-Korvo-2 is a multimedia development board based on the ESP32-S3 chip. It is equipped with a two-microphone array which is suitable for voice recognition and near/far-field voice wake-up applications. The board integrates multiple peripherals such as LCD, camera, and microSD card. It also supports JPEG video stream processing. With all of its outstanding features, the board is an ideal choice for the development of low-cost and low-power network-connected audio and video products.", diff --git a/SquareLine/boards/espbox/sdkconfig.defaults b/SquareLine/boards/v8/esp32_s3_korvo_2/sdkconfig.defaults similarity index 90% rename from SquareLine/boards/espbox/sdkconfig.defaults rename to SquareLine/boards/v8/esp32_s3_korvo_2/sdkconfig.defaults index 22c58f9d6..80a2848c3 100644 --- a/SquareLine/boards/espbox/sdkconfig.defaults +++ b/SquareLine/boards/v8/esp32_s3_korvo_2/sdkconfig.defaults @@ -5,4 +5,4 @@ CONFIG_IDF_TARGET="esp32s3" CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y -CONFIG_LV_USE_PERF_MONITOR=y \ No newline at end of file +CONFIG_LV_USE_PERF_MONITOR=y diff --git a/SquareLine/boards/esp32_s3_lcd_ev_board/image.png b/SquareLine/boards/v8/esp32_s3_lcd_ev_board/image.png similarity index 100% rename from SquareLine/boards/esp32_s3_lcd_ev_board/image.png rename to SquareLine/boards/v8/esp32_s3_lcd_ev_board/image.png diff --git a/SquareLine/boards/esp32_s3_lcd_ev_board/main/idf_component.yml b/SquareLine/boards/v8/esp32_s3_lcd_ev_board/main/idf_component.yml similarity index 70% rename from SquareLine/boards/esp32_s3_lcd_ev_board/main/idf_component.yml rename to SquareLine/boards/v8/esp32_s3_lcd_ev_board/main/idf_component.yml index 5653a06f7..05dd52cc5 100644 --- a/SquareLine/boards/esp32_s3_lcd_ev_board/main/idf_component.yml +++ b/SquareLine/boards/v8/esp32_s3_lcd_ev_board/main/idf_component.yml @@ -2,4 +2,4 @@ description: ESP-BSP SquareLine LVGL Example targets: - esp32s3 dependencies: - esp32_s3_lcd_ev_board: "^2.1" + esp32_s3_lcd_ev_board: "==2.1.0" diff --git a/SquareLine/boards/esp32_s3_lcd_ev_board/manifest.json b/SquareLine/boards/v8/esp32_s3_lcd_ev_board/manifest.json similarity index 95% rename from SquareLine/boards/esp32_s3_lcd_ev_board/manifest.json rename to SquareLine/boards/v8/esp32_s3_lcd_ev_board/manifest.json index b7ebb8305..92446ce1d 100644 --- a/SquareLine/boards/esp32_s3_lcd_ev_board/manifest.json +++ b/SquareLine/boards/v8/esp32_s3_lcd_ev_board/manifest.json @@ -7,6 +7,8 @@ "screen_height":"480", "screen_color_swap":false, + "supported_lvgl_version":"8.2.0, 8.3.*", + "short_description":"ESP32-S3-LCD-EV-BOARD is a development board for evaluating and verifying ESP32-S3 screen interactive applications. It has the functions of touch screen interaction and voice interaction.", "long_description":"ESP32-S3-LCD-EV-BOARD has an ESP32-S3-WROOM-1 module with built-in 16 MB Flash and 8/16 MB PSRAM. It features onboard audio codec + audio amplifier and onboard dual microphone pickup. It uses USB type-C interface for download and debugging. ESP32-S3-LCD-EV-BOARD can be used with different screen sub boards with various screen sizes and resolutions, and supports RGB, 8080, SPI, I2C interface screens.", diff --git a/SquareLine/boards/esp32_s3_lcd_ev_board/partitions.csv b/SquareLine/boards/v8/esp32_s3_lcd_ev_board/partitions.csv similarity index 100% rename from SquareLine/boards/esp32_s3_lcd_ev_board/partitions.csv rename to SquareLine/boards/v8/esp32_s3_lcd_ev_board/partitions.csv diff --git a/SquareLine/boards/esp32_s3_lcd_ev_board/sdkconfig.defaults b/SquareLine/boards/v8/esp32_s3_lcd_ev_board/sdkconfig.defaults similarity index 100% rename from SquareLine/boards/esp32_s3_lcd_ev_board/sdkconfig.defaults rename to SquareLine/boards/v8/esp32_s3_lcd_ev_board/sdkconfig.defaults diff --git a/SquareLine/boards/esp32_s3_usb_otg/image.png b/SquareLine/boards/v8/esp32_s3_usb_otg/image.png similarity index 100% rename from SquareLine/boards/esp32_s3_usb_otg/image.png rename to SquareLine/boards/v8/esp32_s3_usb_otg/image.png diff --git a/SquareLine/boards/v8/esp32_s3_usb_otg/main/idf_component.yml b/SquareLine/boards/v8/esp32_s3_usb_otg/main/idf_component.yml new file mode 100644 index 000000000..315270d77 --- /dev/null +++ b/SquareLine/boards/v8/esp32_s3_usb_otg/main/idf_component.yml @@ -0,0 +1,6 @@ +description: ESP-BSP SquareLine LVGL Example +targets: + - esp32s3 +dependencies: + idf: ">=4.4" + esp32_s3_usb_otg: "==1.5.1" diff --git a/SquareLine/boards/esp32_s3_usb_otg/manifest.json b/SquareLine/boards/v8/esp32_s3_usb_otg/manifest.json similarity index 94% rename from SquareLine/boards/esp32_s3_usb_otg/manifest.json rename to SquareLine/boards/v8/esp32_s3_usb_otg/manifest.json index 0de957acc..f386b436f 100644 --- a/SquareLine/boards/esp32_s3_usb_otg/manifest.json +++ b/SquareLine/boards/v8/esp32_s3_usb_otg/manifest.json @@ -7,6 +7,8 @@ "screen_height":"240", "screen_color_swap":true, + "supported_lvgl_version":"8.2.0, 8.3.*", + "short_description":"ESP32-S3-USB-OTG is a development board produced by Espressif that focuses on USB-OTG function verification and application development.", "long_description":"ESP32-S3-USB-OTG is targeting at applications based on USB interface. It is equipped with the ESP32-S3-MINI-1-N8 module. Combined with the Wi-Fi functionality provided by the SoC, the USB interface can be used for video streaming over Wi-Fi, accessing the Internet through a 4G hotspot, connecting to a wireless USB disk, and many other applications.", diff --git a/SquareLine/boards/esp32_s3_eye/sdkconfig.defaults b/SquareLine/boards/v8/esp32_s3_usb_otg/sdkconfig.defaults similarity index 90% rename from SquareLine/boards/esp32_s3_eye/sdkconfig.defaults rename to SquareLine/boards/v8/esp32_s3_usb_otg/sdkconfig.defaults index 22c58f9d6..80a2848c3 100644 --- a/SquareLine/boards/esp32_s3_eye/sdkconfig.defaults +++ b/SquareLine/boards/v8/esp32_s3_usb_otg/sdkconfig.defaults @@ -5,4 +5,4 @@ CONFIG_IDF_TARGET="esp32s3" CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y -CONFIG_LV_USE_PERF_MONITOR=y \ No newline at end of file +CONFIG_LV_USE_PERF_MONITOR=y diff --git a/SquareLine/boards/espbox/image.png b/SquareLine/boards/v8/espbox/image.png similarity index 100% rename from SquareLine/boards/espbox/image.png rename to SquareLine/boards/v8/espbox/image.png diff --git a/SquareLine/boards/espbox/main/idf_component.yml b/SquareLine/boards/v8/espbox/main/idf_component.yml similarity index 82% rename from SquareLine/boards/espbox/main/idf_component.yml rename to SquareLine/boards/v8/espbox/main/idf_component.yml index c6f71713e..5c75feed5 100644 --- a/SquareLine/boards/espbox/main/idf_component.yml +++ b/SquareLine/boards/v8/espbox/main/idf_component.yml @@ -3,4 +3,4 @@ targets: - esp32s3 dependencies: idf: ">=4.4" - esp-box: "*" + esp-box: "==3.0.5" diff --git a/SquareLine/boards/espbox/manifest.json b/SquareLine/boards/v8/espbox/manifest.json similarity index 96% rename from SquareLine/boards/espbox/manifest.json rename to SquareLine/boards/v8/espbox/manifest.json index dda1d1347..96207f171 100644 --- a/SquareLine/boards/espbox/manifest.json +++ b/SquareLine/boards/v8/espbox/manifest.json @@ -7,6 +7,8 @@ "screen_height":"240", "screen_color_swap":true, + "supported_lvgl_version":"8.2.0, 8.3.*", + "short_description":"ESP32-S3-BOX is an AI voice development kit that is based on Espressif’s ESP32-S3 Wi-Fi + Bluetooth 5 (LE) SoC, with AI capabilities.", "long_description":"The BOX series development boards, ESP32-S3-BOX and ESP32-S3-BOX-Lite provide a platform for developing the control of home appliances using Voice Assistance + touch and screen controller, sensor, infrared controller, and intelligent Wi-Fi gateway. Development boards come with pre-built firmware that supports offline voice interaction, with the SDKs and examples provided by Espressif, you will be able to develop a wide variety of AIoT applications based on the BOX series products such as online and offline voice assistants, voice-enabled devices, human-computer interaction devices, control panels, multi-protocol gateways easily.", diff --git a/SquareLine/boards/esp32_s3_korvo_2/sdkconfig.defaults b/SquareLine/boards/v8/espbox/sdkconfig.defaults similarity index 90% rename from SquareLine/boards/esp32_s3_korvo_2/sdkconfig.defaults rename to SquareLine/boards/v8/espbox/sdkconfig.defaults index 22c58f9d6..80a2848c3 100644 --- a/SquareLine/boards/esp32_s3_korvo_2/sdkconfig.defaults +++ b/SquareLine/boards/v8/espbox/sdkconfig.defaults @@ -5,4 +5,4 @@ CONFIG_IDF_TARGET="esp32s3" CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y -CONFIG_LV_USE_PERF_MONITOR=y \ No newline at end of file +CONFIG_LV_USE_PERF_MONITOR=y diff --git a/SquareLine/boards/espbox_3/image.png b/SquareLine/boards/v8/espbox_3/image.png similarity index 100% rename from SquareLine/boards/espbox_3/image.png rename to SquareLine/boards/v8/espbox_3/image.png diff --git a/SquareLine/boards/espbox_3/main/idf_component.yml b/SquareLine/boards/v8/espbox_3/main/idf_component.yml similarity index 80% rename from SquareLine/boards/espbox_3/main/idf_component.yml rename to SquareLine/boards/v8/espbox_3/main/idf_component.yml index e62f919e4..50934a231 100644 --- a/SquareLine/boards/espbox_3/main/idf_component.yml +++ b/SquareLine/boards/v8/espbox_3/main/idf_component.yml @@ -3,4 +3,4 @@ targets: - esp32s3 dependencies: idf: ">=4.4" - esp-box-3: "*" + esp-box-3: "==1.1.3" diff --git a/SquareLine/boards/espbox_3/manifest.json b/SquareLine/boards/v8/espbox_3/manifest.json similarity index 96% rename from SquareLine/boards/espbox_3/manifest.json rename to SquareLine/boards/v8/espbox_3/manifest.json index c9286337f..9eaf1ac39 100644 --- a/SquareLine/boards/espbox_3/manifest.json +++ b/SquareLine/boards/v8/espbox_3/manifest.json @@ -7,6 +7,8 @@ "screen_height":"240", "screen_color_swap":true, + "supported_lvgl_version":"8.2.0, 8.3.*", + "short_description":"ESP32-S3-BOX is an AI voice development kit that is based on Espressif’s ESP32-S3 Wi-Fi + Bluetooth 5 (LE) SoC, with AI capabilities.", "long_description":"The BOX series development boards, ESP32-S3-BOX and ESP32-S3-BOX-Lite provide a platform for developing the control of home appliances using Voice Assistance + touch and screen controller, sensor, infrared controller, and intelligent Wi-Fi gateway. Development boards come with pre-built firmware that supports offline voice interaction, with the SDKs and examples provided by Espressif, you will be able to develop a wide variety of AIoT applications based on the BOX series products such as online and offline voice assistants, voice-enabled devices, human-computer interaction devices, control panels, multi-protocol gateways easily.", diff --git a/SquareLine/boards/v8/espbox_3/sdkconfig.defaults b/SquareLine/boards/v8/espbox_3/sdkconfig.defaults new file mode 100644 index 000000000..80a2848c3 --- /dev/null +++ b/SquareLine/boards/v8/espbox_3/sdkconfig.defaults @@ -0,0 +1,8 @@ +# This file was generated using idf.py save-defconfig. It can be edited manually. +# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration +# +CONFIG_IDF_TARGET="esp32s3" +CONFIG_LV_COLOR_16_SWAP=y +CONFIG_LV_MEM_CUSTOM=y +CONFIG_LV_MEMCPY_MEMSET_STD=y +CONFIG_LV_USE_PERF_MONITOR=y diff --git a/SquareLine/boards/espbox_lite/image.png b/SquareLine/boards/v8/espbox_lite/image.png similarity index 100% rename from SquareLine/boards/espbox_lite/image.png rename to SquareLine/boards/v8/espbox_lite/image.png diff --git a/SquareLine/boards/v8/espbox_lite/main/idf_component.yml b/SquareLine/boards/v8/espbox_lite/main/idf_component.yml new file mode 100644 index 000000000..c1839cbd0 --- /dev/null +++ b/SquareLine/boards/v8/espbox_lite/main/idf_component.yml @@ -0,0 +1,6 @@ +description: ESP-BSP SquareLine LVGL Example +targets: + - esp32s3 +dependencies: + idf: ">=4.4" + esp-box-lite: "==2.0.4" diff --git a/SquareLine/boards/espbox_lite/manifest.json b/SquareLine/boards/v8/espbox_lite/manifest.json similarity index 96% rename from SquareLine/boards/espbox_lite/manifest.json rename to SquareLine/boards/v8/espbox_lite/manifest.json index af0443461..17dcea00d 100644 --- a/SquareLine/boards/espbox_lite/manifest.json +++ b/SquareLine/boards/v8/espbox_lite/manifest.json @@ -7,6 +7,8 @@ "screen_height":"240", "screen_color_swap":true, + "supported_lvgl_version":"8.2.0, 8.3.*", + "short_description":"ESP32-S3-BOX Lite is an AI voice development kit that is based on Espressif's ESP32-S3 Wi-Fi + Bluetooth 5 (LE) SoC, with AI capabilities.", "long_description":"The BOX series development boards, ESP32-S3-BOX and ESP32-S3-BOX-Lite provide a platform for developing the control of home appliances using Voice Assistance + touch and screen controller, sensor, infrared controller, and intelligent Wi-Fi gateway. Development boards come with pre-built firmware that supports offline voice interaction, with the SDKs and examples provided by Espressif, you will be able to develop a wide variety of AIoT applications based on the BOX series products such as online and offline voice assistants, voice-enabled devices, human-computer interaction devices, control panels, multi-protocol gateways easily.", diff --git a/SquareLine/boards/v8/espbox_lite/sdkconfig.defaults b/SquareLine/boards/v8/espbox_lite/sdkconfig.defaults new file mode 100644 index 000000000..80a2848c3 --- /dev/null +++ b/SquareLine/boards/v8/espbox_lite/sdkconfig.defaults @@ -0,0 +1,8 @@ +# This file was generated using idf.py save-defconfig. It can be edited manually. +# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration +# +CONFIG_IDF_TARGET="esp32s3" +CONFIG_LV_COLOR_16_SWAP=y +CONFIG_LV_MEM_CUSTOM=y +CONFIG_LV_MEMCPY_MEMSET_STD=y +CONFIG_LV_USE_PERF_MONITOR=y diff --git a/SquareLine/boards/espwroverkit/image.png b/SquareLine/boards/v8/espwroverkit/image.png similarity index 100% rename from SquareLine/boards/espwroverkit/image.png rename to SquareLine/boards/v8/espwroverkit/image.png diff --git a/SquareLine/boards/espwroverkit/main/idf_component.yml b/SquareLine/boards/v8/espwroverkit/main/idf_component.yml similarity index 77% rename from SquareLine/boards/espwroverkit/main/idf_component.yml rename to SquareLine/boards/v8/espwroverkit/main/idf_component.yml index 50521fbb4..c979734eb 100644 --- a/SquareLine/boards/espwroverkit/main/idf_component.yml +++ b/SquareLine/boards/v8/espwroverkit/main/idf_component.yml @@ -3,4 +3,4 @@ targets: - esp32 dependencies: idf: ">=4.4" - esp_wrover_kit: "^1.0.0" + esp_wrover_kit: "==1.5.1" diff --git a/SquareLine/boards/espwroverkit/manifest.json b/SquareLine/boards/v8/espwroverkit/manifest.json similarity index 94% rename from SquareLine/boards/espwroverkit/manifest.json rename to SquareLine/boards/v8/espwroverkit/manifest.json index 69de38f64..166b345a0 100644 --- a/SquareLine/boards/espwroverkit/manifest.json +++ b/SquareLine/boards/v8/espwroverkit/manifest.json @@ -7,6 +7,8 @@ "screen_height":"320", "screen_color_swap":true, + "supported_lvgl_version":"8.2.0, 8.3.*", + "short_description":"ESP-WROVER-KIT is an ESP32-based development board produced by Espressif. This board features an integrated LCD screen and microSD card slot.", "long_description":"The ESP-WROVER-KIT comes with an ESP32-WROVER-E module by default. The I/O pins have been broken out from the ESP32-WROVER-E for easy extension. The board carries an advanced multi-protocol USB bridge (the FTDI FT2232HL), enabling developers to use JTAG directly to debug the ESP32 module through the USB interface. The development board makes secondary development easy and cost-effective.", diff --git a/SquareLine/boards/espwroverkit/sdkconfig.defaults b/SquareLine/boards/v8/espwroverkit/sdkconfig.defaults similarity index 100% rename from SquareLine/boards/espwroverkit/sdkconfig.defaults rename to SquareLine/boards/v8/espwroverkit/sdkconfig.defaults diff --git a/SquareLine/boards/m5stack_core_s3/image.png b/SquareLine/boards/v8/m5stack_core_s3/image.png similarity index 100% rename from SquareLine/boards/m5stack_core_s3/image.png rename to SquareLine/boards/v8/m5stack_core_s3/image.png diff --git a/SquareLine/boards/m5stack_core_s3/main/idf_component.yml b/SquareLine/boards/v8/m5stack_core_s3/main/idf_component.yml similarity index 76% rename from SquareLine/boards/m5stack_core_s3/main/idf_component.yml rename to SquareLine/boards/v8/m5stack_core_s3/main/idf_component.yml index fac109b2e..3cf5b34b6 100644 --- a/SquareLine/boards/m5stack_core_s3/main/idf_component.yml +++ b/SquareLine/boards/v8/m5stack_core_s3/main/idf_component.yml @@ -3,4 +3,4 @@ targets: - esp32s3 dependencies: idf: ">=5.0" - m5stack_core_s3: "*" + m5stack_core_s3: "==1.0.1" diff --git a/SquareLine/boards/m5stack_core_s3/manifest.json b/SquareLine/boards/v8/m5stack_core_s3/manifest.json similarity index 97% rename from SquareLine/boards/m5stack_core_s3/manifest.json rename to SquareLine/boards/v8/m5stack_core_s3/manifest.json index 7a01cd9f5..a2b735017 100644 --- a/SquareLine/boards/m5stack_core_s3/manifest.json +++ b/SquareLine/boards/v8/m5stack_core_s3/manifest.json @@ -7,6 +7,8 @@ "screen_height":"240", "screen_color_swap":true, + "supported_lvgl_version":"8.2.0, 8.3.*", + "short_description":"CoreS3 is the third generation of the M5Stack Core series. Powered by the ESP32-S3 solution, this kit features a dual-core Xtensa LX7 processor running at 240MHz. CoreS3 comes equipped with built-in Wi-Fi functionality, enabling seamless connectivity. It boasts 16MB of onboard flash memory and 8MB of PSRAM, providing ample space for program storage.", "long_description":"CoreS3 offers convenient programming options through its TYPE-C interface, supporting OTG and CDC functions. This allows for easy connection with external USB devices and hassle-free firmware flashing. CoreS3 features a 2.0-inch capacitive touch IPS screen, protected by high-strength glass material. Additionally, a 0.3 megapixel camera GC0308 is integrated at the bottom of the screen, accompanied by a proximity sensor LTR-553ALS-WA for enhanced functionality. Power management is handled by the AXP2101 power management core chip, employing a 4-way power flow control loop for efficient power distribution. The overall design emphasizes low power consumption. CoreS3 also features a 6-axis attitude sensor BMI270 and a magnetometer BMM150 for precise motion detection. With the onboard TF-card (microSD) card slot and BM8563 RTC chip, accurate timing and sleep-timer wake-up functions are readily available.", diff --git a/SquareLine/boards/m5stack_core_s3/partitions.csv b/SquareLine/boards/v8/m5stack_core_s3/partitions.csv similarity index 100% rename from SquareLine/boards/m5stack_core_s3/partitions.csv rename to SquareLine/boards/v8/m5stack_core_s3/partitions.csv diff --git a/SquareLine/boards/m5stack_core_s3/sdkconfig.defaults b/SquareLine/boards/v8/m5stack_core_s3/sdkconfig.defaults similarity index 100% rename from SquareLine/boards/m5stack_core_s3/sdkconfig.defaults rename to SquareLine/boards/v8/m5stack_core_s3/sdkconfig.defaults diff --git a/SquareLine/boards/v9/esp32_c3_lcdkit/image.png b/SquareLine/boards/v9/esp32_c3_lcdkit/image.png new file mode 100644 index 000000000..56b4462ec Binary files /dev/null and b/SquareLine/boards/v9/esp32_c3_lcdkit/image.png differ diff --git a/SquareLine/boards/v9/esp32_c3_lcdkit/main/idf_component.yml b/SquareLine/boards/v9/esp32_c3_lcdkit/main/idf_component.yml new file mode 100644 index 000000000..14db88b8b --- /dev/null +++ b/SquareLine/boards/v9/esp32_c3_lcdkit/main/idf_component.yml @@ -0,0 +1,6 @@ +description: ESP-BSP SquareLine LVGL Example +targets: + - esp32c3 +dependencies: + idf: ">=4.4" + esp32_c3_lcdkit: ">=1.1.0" diff --git a/SquareLine/boards/v9/esp32_c3_lcdkit/manifest.json b/SquareLine/boards/v9/esp32_c3_lcdkit/manifest.json new file mode 100644 index 000000000..8713e04ce --- /dev/null +++ b/SquareLine/boards/v9/esp32_c3_lcdkit/manifest.json @@ -0,0 +1,20 @@ +{ + "name":"ESP32-C3-LCDKit", + "version":"2.0.0", + "mcu":"ESP32C3", + + "screen_width":"240", + "screen_height":"240", + "screen_color_swap":true, + + "supported_lvgl_version":"9.1.*", + + "short_description":"ESP32-C3-LCDKit is a HMI development kit with encoder, that is based on Espressif's ESP32-C3.", + "long_description":"ESP32-C3-LCDkit is an ESP32-C3-based evaluation development board with an SPI interface display. It also has an integrated rotary encoder switch and features screen interaction. Due to its low cost, low power consumption, and high performance, ESP32-C3 satisfies the basic GUI interaction needs, gaining ground in scenarios with small screen sizes.", + + "placeholders": + { + "__ESP_BOARD_INCLUDE__": "bsp/esp-bsp.h", + "__ESP_BOARD_I2C_INIT__": "" + } +} diff --git a/SquareLine/boards/v9/esp32_c3_lcdkit/sdkconfig.defaults b/SquareLine/boards/v9/esp32_c3_lcdkit/sdkconfig.defaults new file mode 100644 index 000000000..e92dc39d3 --- /dev/null +++ b/SquareLine/boards/v9/esp32_c3_lcdkit/sdkconfig.defaults @@ -0,0 +1,5 @@ +CONFIG_IDF_TARGET="esp32c3" +CONFIG_LV_COLOR_16_SWAP=y +CONFIG_LV_MEM_CUSTOM=y +CONFIG_LV_MEMCPY_MEMSET_STD=y +CONFIG_LV_USE_PERF_MONITOR=y diff --git a/SquareLine/boards/v9/esp32_s2_kaluga_kit/image.png b/SquareLine/boards/v9/esp32_s2_kaluga_kit/image.png new file mode 100644 index 000000000..64784ef3c Binary files /dev/null and b/SquareLine/boards/v9/esp32_s2_kaluga_kit/image.png differ diff --git a/SquareLine/boards/v9/esp32_s2_kaluga_kit/main/idf_component.yml b/SquareLine/boards/v9/esp32_s2_kaluga_kit/main/idf_component.yml new file mode 100644 index 000000000..824e7eeb1 --- /dev/null +++ b/SquareLine/boards/v9/esp32_s2_kaluga_kit/main/idf_component.yml @@ -0,0 +1,6 @@ +description: ESP-BSP SquareLine LVGL Example +targets: + - esp32s2 +dependencies: + idf: ">=4.4" + esp32_s2_kaluga_kit: ">=3.1.0" diff --git a/SquareLine/boards/v9/esp32_s2_kaluga_kit/manifest.json b/SquareLine/boards/v9/esp32_s2_kaluga_kit/manifest.json new file mode 100644 index 000000000..98d1dfe35 --- /dev/null +++ b/SquareLine/boards/v9/esp32_s2_kaluga_kit/manifest.json @@ -0,0 +1,20 @@ +{ + "name":"ESP32-S2-Kaluga Kit", + "version":"2.0.0", + "mcu":"ESP32S2", + + "screen_width":"320", + "screen_height":"240", + "screen_color_swap":true, + + "supported_lvgl_version":"9.1.*", + + "short_description":"The ESP32-S2-Kaluga-1 development kit produced by Espressif. It integrates the ESP32-S2-WROVER module and all the connectors for extension boards.", + "long_description":"Multimedia development board ESP32-S2-Kaluga-1 kit based on ESP32-S2 has various functions, such as an LCD screen display, touch panel control, camera image acquisition, audio playback, etc. It can be flexibly assembled and disassembled, thus fulfilling a variety of customized requirements.", + + "placeholders": + { + "__ESP_BOARD_INCLUDE__": "bsp/esp32_s2_kaluga_kit.h", + "__ESP_BOARD_I2C_INIT__": "" + } +} diff --git a/SquareLine/boards/v9/esp32_s2_kaluga_kit/sdkconfig.defaults b/SquareLine/boards/v9/esp32_s2_kaluga_kit/sdkconfig.defaults new file mode 100644 index 000000000..e292b8499 --- /dev/null +++ b/SquareLine/boards/v9/esp32_s2_kaluga_kit/sdkconfig.defaults @@ -0,0 +1,8 @@ +# This file was generated using idf.py save-defconfig. It can be edited manually. +# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration +# +CONFIG_IDF_TARGET="esp32s2" +CONFIG_LV_COLOR_16_SWAP=y +CONFIG_LV_MEM_CUSTOM=y +CONFIG_LV_MEMCPY_MEMSET_STD=y +CONFIG_LV_USE_PERF_MONITOR=y diff --git a/SquareLine/boards/v9/esp32_s3_eye/image.png b/SquareLine/boards/v9/esp32_s3_eye/image.png new file mode 100644 index 000000000..69d191e9c Binary files /dev/null and b/SquareLine/boards/v9/esp32_s3_eye/image.png differ diff --git a/SquareLine/boards/v9/esp32_s3_eye/main/idf_component.yml b/SquareLine/boards/v9/esp32_s3_eye/main/idf_component.yml new file mode 100644 index 000000000..700bb66c8 --- /dev/null +++ b/SquareLine/boards/v9/esp32_s3_eye/main/idf_component.yml @@ -0,0 +1,6 @@ +description: ESP-BSP SquareLine LVGL Example +targets: + - esp32s3 +dependencies: + idf: ">=4.4" + esp32_s3_eye: ">=3.1.0" diff --git a/SquareLine/boards/v9/esp32_s3_eye/manifest.json b/SquareLine/boards/v9/esp32_s3_eye/manifest.json new file mode 100644 index 000000000..230d2ab74 --- /dev/null +++ b/SquareLine/boards/v9/esp32_s3_eye/manifest.json @@ -0,0 +1,20 @@ +{ + "name":"ESP32-S3-EYE", + "version":"2.0.0", + "mcu":"ESP32S3", + + "screen_width":"240", + "screen_height":"240", + "screen_color_swap":true, + + "supported_lvgl_version":"9.1.*", + + "short_description":"The ESP32-S3-EYE is a small-sized AI development board produced by Espressif. It is based on the ESP32-S3 SoC and ESP-WHO.", + "long_description":"ESP32-S3-EYE features a 2-Megapixel camera, an LCD display, and a microphone, which are used for image recognition and audio processing. ESP32-S3-EYE offers plenty of storage, with an 8 MB Octal PSRAM and a 8 MB flash. It also supports image transmission via Wi-Fi and debugging through a Micro-USB port.", + + "placeholders": + { + "__ESP_BOARD_INCLUDE__": "bsp/esp32_s3_eye.h", + "__ESP_BOARD_I2C_INIT__": "" + } +} diff --git a/SquareLine/boards/v9/esp32_s3_eye/sdkconfig.defaults b/SquareLine/boards/v9/esp32_s3_eye/sdkconfig.defaults new file mode 100644 index 000000000..80a2848c3 --- /dev/null +++ b/SquareLine/boards/v9/esp32_s3_eye/sdkconfig.defaults @@ -0,0 +1,8 @@ +# This file was generated using idf.py save-defconfig. It can be edited manually. +# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration +# +CONFIG_IDF_TARGET="esp32s3" +CONFIG_LV_COLOR_16_SWAP=y +CONFIG_LV_MEM_CUSTOM=y +CONFIG_LV_MEMCPY_MEMSET_STD=y +CONFIG_LV_USE_PERF_MONITOR=y diff --git a/SquareLine/boards/v9/esp32_s3_korvo_2/image.png b/SquareLine/boards/v9/esp32_s3_korvo_2/image.png new file mode 100644 index 000000000..6e68fdb90 Binary files /dev/null and b/SquareLine/boards/v9/esp32_s3_korvo_2/image.png differ diff --git a/SquareLine/boards/v9/esp32_s3_korvo_2/main/idf_component.yml b/SquareLine/boards/v9/esp32_s3_korvo_2/main/idf_component.yml new file mode 100644 index 000000000..67b061533 --- /dev/null +++ b/SquareLine/boards/v9/esp32_s3_korvo_2/main/idf_component.yml @@ -0,0 +1,6 @@ +description: ESP-BSP SquareLine LVGL Example +targets: + - esp32s3 +dependencies: + idf: ">=4.4" + esp32_s3_korvo_2: ">2.2.0" diff --git a/SquareLine/boards/v9/esp32_s3_korvo_2/manifest.json b/SquareLine/boards/v9/esp32_s3_korvo_2/manifest.json new file mode 100644 index 000000000..1ce4d07a6 --- /dev/null +++ b/SquareLine/boards/v9/esp32_s3_korvo_2/manifest.json @@ -0,0 +1,20 @@ +{ + "name":"ESP32-S3-Korvo-2", + "version":"2.0.0", + "mcu":"ESP32S3", + + "screen_width":"320", + "screen_height":"240", + "screen_color_swap":true, + + "supported_lvgl_version":"9.1.*", + + "short_description":"The ESP32-S3-Korvo-2 is a multimedia development board based on the ESP32-S3 chip.", + "long_description":"The ESP32-S3-Korvo-2 is a multimedia development board based on the ESP32-S3 chip. It is equipped with a two-microphone array which is suitable for voice recognition and near/far-field voice wake-up applications. The board integrates multiple peripherals such as LCD, camera, and microSD card. It also supports JPEG video stream processing. With all of its outstanding features, the board is an ideal choice for the development of low-cost and low-power network-connected audio and video products.", + + "placeholders": + { + "__ESP_BOARD_INCLUDE__": "bsp/esp-bsp.h", + "__ESP_BOARD_I2C_INIT__": "/* Initialize I2C (for touch and audio) */\n bsp_i2c_init();" + } +} diff --git a/SquareLine/boards/v9/esp32_s3_korvo_2/sdkconfig.defaults b/SquareLine/boards/v9/esp32_s3_korvo_2/sdkconfig.defaults new file mode 100644 index 000000000..80a2848c3 --- /dev/null +++ b/SquareLine/boards/v9/esp32_s3_korvo_2/sdkconfig.defaults @@ -0,0 +1,8 @@ +# This file was generated using idf.py save-defconfig. It can be edited manually. +# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration +# +CONFIG_IDF_TARGET="esp32s3" +CONFIG_LV_COLOR_16_SWAP=y +CONFIG_LV_MEM_CUSTOM=y +CONFIG_LV_MEMCPY_MEMSET_STD=y +CONFIG_LV_USE_PERF_MONITOR=y diff --git a/SquareLine/boards/v9/esp32_s3_lcd_ev_board/image.png b/SquareLine/boards/v9/esp32_s3_lcd_ev_board/image.png new file mode 100644 index 000000000..2f9c7048f Binary files /dev/null and b/SquareLine/boards/v9/esp32_s3_lcd_ev_board/image.png differ diff --git a/SquareLine/boards/v9/esp32_s3_lcd_ev_board/main/idf_component.yml b/SquareLine/boards/v9/esp32_s3_lcd_ev_board/main/idf_component.yml new file mode 100644 index 000000000..55e39ba6d --- /dev/null +++ b/SquareLine/boards/v9/esp32_s3_lcd_ev_board/main/idf_component.yml @@ -0,0 +1,5 @@ +description: ESP-BSP SquareLine LVGL Example +targets: + - esp32s3 +dependencies: + esp32_s3_lcd_ev_board: ">=2.2.1" diff --git a/SquareLine/boards/v9/esp32_s3_lcd_ev_board/manifest.json b/SquareLine/boards/v9/esp32_s3_lcd_ev_board/manifest.json new file mode 100644 index 000000000..7a4cc6bb9 --- /dev/null +++ b/SquareLine/boards/v9/esp32_s3_lcd_ev_board/manifest.json @@ -0,0 +1,20 @@ +{ + "name":"ESP32-S3-LCD-EV-BOARD", + "version":"3.0.0", + "mcu":"ESP32S3", + + "screen_width":"800", + "screen_height":"480", + "screen_color_swap":false, + + "supported_lvgl_version":"9.1.*", + + "short_description":"ESP32-S3-LCD-EV-BOARD is a development board for evaluating and verifying ESP32-S3 screen interactive applications. It has the functions of touch screen interaction and voice interaction.", + "long_description":"ESP32-S3-LCD-EV-BOARD has an ESP32-S3-WROOM-1 module with built-in 16 MB Flash and 8/16 MB PSRAM. It features onboard audio codec + audio amplifier and onboard dual microphone pickup. It uses USB type-C interface for download and debugging. ESP32-S3-LCD-EV-BOARD can be used with different screen sub boards with various screen sizes and resolutions, and supports RGB, 8080, SPI, I2C interface screens.", + + "placeholders": + { + "__ESP_BOARD_INCLUDE__": "bsp/esp32_s3_lcd_ev_board.h", + "__ESP_BOARD_I2C_INIT__": "/* Initialize I2C (for touch and audio) */\n bsp_i2c_init();" + } +} diff --git a/SquareLine/boards/v9/esp32_s3_lcd_ev_board/partitions.csv b/SquareLine/boards/v9/esp32_s3_lcd_ev_board/partitions.csv new file mode 100644 index 000000000..7a3cb7172 --- /dev/null +++ b/SquareLine/boards/v9/esp32_s3_lcd_ev_board/partitions.csv @@ -0,0 +1,6 @@ +# Name, Type, SubType, Offset, Size, Flags +# Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap +nvs, data, nvs, 0x9000, 0x6000, +phy_init, data, phy, , 0x1000, +factory, app, factory, , 3500k, +storage, data, spiffs, , 7000k, diff --git a/SquareLine/boards/v9/esp32_s3_lcd_ev_board/sdkconfig.defaults b/SquareLine/boards/v9/esp32_s3_lcd_ev_board/sdkconfig.defaults new file mode 100644 index 000000000..f38a19375 --- /dev/null +++ b/SquareLine/boards/v9/esp32_s3_lcd_ev_board/sdkconfig.defaults @@ -0,0 +1,24 @@ +# This file was generated using idf.py save-defconfig. It can be edited manually. +# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration +# +CONFIG_IDF_TARGET="esp32s3" +CONFIG_ESPTOOLPY_FLASHMODE_QIO=y +CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y +CONFIG_PARTITION_TABLE_CUSTOM=y +CONFIG_COMPILER_OPTIMIZATION_PERF=y +CONFIG_SPIRAM=y +CONFIG_SPIRAM_MODE_OCT=y +CONFIG_SPIRAM_FETCH_INSTRUCTIONS=y +CONFIG_SPIRAM_RODATA=y +CONFIG_SPIRAM_SPEED_80M=y +CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y +CONFIG_ESP32S3_DATA_CACHE_LINE_64B=y +CONFIG_FREERTOS_HZ=1000 +CONFIG_BSP_LCD_RGB_BUFFER_NUMS=2 +CONFIG_BSP_LCD_RGB_BOUNCE_BUFFER_MODE=y +CONFIG_BSP_DISPLAY_LVGL_AVOID_TEAR=y +CONFIG_BSP_DISPLAY_LVGL_DIRECT_MODE=y +CONFIG_LV_MEM_CUSTOM=y +CONFIG_LV_MEMCPY_MEMSET_STD=y +CONFIG_LV_USE_PERF_MONITOR=y +CONFIG_LV_ATTRIBUTE_FAST_MEM_USE_IRAM=y diff --git a/SquareLine/boards/v9/esp32_s3_usb_otg/image.png b/SquareLine/boards/v9/esp32_s3_usb_otg/image.png new file mode 100644 index 000000000..bec37c2c6 Binary files /dev/null and b/SquareLine/boards/v9/esp32_s3_usb_otg/image.png differ diff --git a/SquareLine/boards/v9/esp32_s3_usb_otg/main/idf_component.yml b/SquareLine/boards/v9/esp32_s3_usb_otg/main/idf_component.yml new file mode 100644 index 000000000..6c8a75c4c --- /dev/null +++ b/SquareLine/boards/v9/esp32_s3_usb_otg/main/idf_component.yml @@ -0,0 +1,6 @@ +description: ESP-BSP SquareLine LVGL Example +targets: + - esp32s3 +dependencies: + idf: ">=4.4" + esp32_s3_usb_otg: ">=1.6.0" diff --git a/SquareLine/boards/v9/esp32_s3_usb_otg/manifest.json b/SquareLine/boards/v9/esp32_s3_usb_otg/manifest.json new file mode 100644 index 000000000..0d9b867bf --- /dev/null +++ b/SquareLine/boards/v9/esp32_s3_usb_otg/manifest.json @@ -0,0 +1,20 @@ +{ + "name":"ESP32-S3-USB-OTG", + "version":"2.0.0", + "mcu":"ESP32S3", + + "screen_width":"240", + "screen_height":"240", + "screen_color_swap":true, + + "supported_lvgl_version":"9.1.*", + + "short_description":"ESP32-S3-USB-OTG is a development board produced by Espressif that focuses on USB-OTG function verification and application development.", + "long_description":"ESP32-S3-USB-OTG is targeting at applications based on USB interface. It is equipped with the ESP32-S3-MINI-1-N8 module. Combined with the Wi-Fi functionality provided by the SoC, the USB interface can be used for video streaming over Wi-Fi, accessing the Internet through a 4G hotspot, connecting to a wireless USB disk, and many other applications.", + + "placeholders": + { + "__ESP_BOARD_INCLUDE__": "bsp/esp32_s3_usb_otg.h", + "__ESP_BOARD_I2C_INIT__": "" + } +} diff --git a/SquareLine/boards/v9/esp32_s3_usb_otg/sdkconfig.defaults b/SquareLine/boards/v9/esp32_s3_usb_otg/sdkconfig.defaults new file mode 100644 index 000000000..80a2848c3 --- /dev/null +++ b/SquareLine/boards/v9/esp32_s3_usb_otg/sdkconfig.defaults @@ -0,0 +1,8 @@ +# This file was generated using idf.py save-defconfig. It can be edited manually. +# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration +# +CONFIG_IDF_TARGET="esp32s3" +CONFIG_LV_COLOR_16_SWAP=y +CONFIG_LV_MEM_CUSTOM=y +CONFIG_LV_MEMCPY_MEMSET_STD=y +CONFIG_LV_USE_PERF_MONITOR=y diff --git a/SquareLine/boards/v9/espbox/image.png b/SquareLine/boards/v9/espbox/image.png new file mode 100644 index 000000000..d97cfbe9b Binary files /dev/null and b/SquareLine/boards/v9/espbox/image.png differ diff --git a/SquareLine/boards/esp32_s3_eye/main/idf_component.yml b/SquareLine/boards/v9/espbox/main/idf_component.yml similarity index 82% rename from SquareLine/boards/esp32_s3_eye/main/idf_component.yml rename to SquareLine/boards/v9/espbox/main/idf_component.yml index e0dbbb059..f10236238 100644 --- a/SquareLine/boards/esp32_s3_eye/main/idf_component.yml +++ b/SquareLine/boards/v9/espbox/main/idf_component.yml @@ -3,4 +3,4 @@ targets: - esp32s3 dependencies: idf: ">=4.4" - esp32_s3_eye: "*" + esp-box: ">=3.1.0" diff --git a/SquareLine/boards/v9/espbox/manifest.json b/SquareLine/boards/v9/espbox/manifest.json new file mode 100644 index 000000000..0dba1c93d --- /dev/null +++ b/SquareLine/boards/v9/espbox/manifest.json @@ -0,0 +1,20 @@ +{ + "name":"ESP-BOX", + "version":"2.0.0", + "mcu":"ESP32S3", + + "screen_width":"320", + "screen_height":"240", + "screen_color_swap":true, + + "supported_lvgl_version":"9.1.*", + + "short_description":"ESP32-S3-BOX is an AI voice development kit that is based on Espressif’s ESP32-S3 Wi-Fi + Bluetooth 5 (LE) SoC, with AI capabilities.", + "long_description":"The BOX series development boards, ESP32-S3-BOX and ESP32-S3-BOX-Lite provide a platform for developing the control of home appliances using Voice Assistance + touch and screen controller, sensor, infrared controller, and intelligent Wi-Fi gateway. Development boards come with pre-built firmware that supports offline voice interaction, with the SDKs and examples provided by Espressif, you will be able to develop a wide variety of AIoT applications based on the BOX series products such as online and offline voice assistants, voice-enabled devices, human-computer interaction devices, control panels, multi-protocol gateways easily.", + + "placeholders": + { + "__ESP_BOARD_INCLUDE__": "bsp/esp-box.h", + "__ESP_BOARD_I2C_INIT__": "/* Initialize I2C (for touch and audio) */\n bsp_i2c_init();" + } +} diff --git a/SquareLine/boards/v9/espbox/sdkconfig.defaults b/SquareLine/boards/v9/espbox/sdkconfig.defaults new file mode 100644 index 000000000..80a2848c3 --- /dev/null +++ b/SquareLine/boards/v9/espbox/sdkconfig.defaults @@ -0,0 +1,8 @@ +# This file was generated using idf.py save-defconfig. It can be edited manually. +# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration +# +CONFIG_IDF_TARGET="esp32s3" +CONFIG_LV_COLOR_16_SWAP=y +CONFIG_LV_MEM_CUSTOM=y +CONFIG_LV_MEMCPY_MEMSET_STD=y +CONFIG_LV_USE_PERF_MONITOR=y diff --git a/SquareLine/boards/v9/espbox_3/image.png b/SquareLine/boards/v9/espbox_3/image.png new file mode 100644 index 000000000..fdf748d18 Binary files /dev/null and b/SquareLine/boards/v9/espbox_3/image.png differ diff --git a/SquareLine/boards/espbox_lite/main/idf_component.yml b/SquareLine/boards/v9/espbox_3/main/idf_component.yml similarity index 80% rename from SquareLine/boards/espbox_lite/main/idf_component.yml rename to SquareLine/boards/v9/espbox_3/main/idf_component.yml index 8e99cab4a..50248949e 100644 --- a/SquareLine/boards/espbox_lite/main/idf_component.yml +++ b/SquareLine/boards/v9/espbox_3/main/idf_component.yml @@ -3,4 +3,4 @@ targets: - esp32s3 dependencies: idf: ">=4.4" - esp-box-lite: "*" + esp-box-3: ">=1.2.0" diff --git a/SquareLine/boards/v9/espbox_3/manifest.json b/SquareLine/boards/v9/espbox_3/manifest.json new file mode 100644 index 000000000..b54e3ccfa --- /dev/null +++ b/SquareLine/boards/v9/espbox_3/manifest.json @@ -0,0 +1,20 @@ +{ + "name":"ESP-BOX-3", + "version":"2.0.0", + "mcu":"ESP32S3", + + "screen_width":"320", + "screen_height":"240", + "screen_color_swap":true, + + "supported_lvgl_version":"9.1.*", + + "short_description":"ESP32-S3-BOX is an AI voice development kit that is based on Espressif’s ESP32-S3 Wi-Fi + Bluetooth 5 (LE) SoC, with AI capabilities.", + "long_description":"The BOX series development boards, ESP32-S3-BOX and ESP32-S3-BOX-Lite provide a platform for developing the control of home appliances using Voice Assistance + touch and screen controller, sensor, infrared controller, and intelligent Wi-Fi gateway. Development boards come with pre-built firmware that supports offline voice interaction, with the SDKs and examples provided by Espressif, you will be able to develop a wide variety of AIoT applications based on the BOX series products such as online and offline voice assistants, voice-enabled devices, human-computer interaction devices, control panels, multi-protocol gateways easily.", + + "placeholders": + { + "__ESP_BOARD_INCLUDE__": "bsp/esp-bsp.h", + "__ESP_BOARD_I2C_INIT__": "/* Initialize I2C (for touch and audio) */\n bsp_i2c_init();" + } +} diff --git a/SquareLine/boards/v9/espbox_3/sdkconfig.defaults b/SquareLine/boards/v9/espbox_3/sdkconfig.defaults new file mode 100644 index 000000000..80a2848c3 --- /dev/null +++ b/SquareLine/boards/v9/espbox_3/sdkconfig.defaults @@ -0,0 +1,8 @@ +# This file was generated using idf.py save-defconfig. It can be edited manually. +# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration +# +CONFIG_IDF_TARGET="esp32s3" +CONFIG_LV_COLOR_16_SWAP=y +CONFIG_LV_MEM_CUSTOM=y +CONFIG_LV_MEMCPY_MEMSET_STD=y +CONFIG_LV_USE_PERF_MONITOR=y diff --git a/SquareLine/boards/v9/espbox_lite/image.png b/SquareLine/boards/v9/espbox_lite/image.png new file mode 100644 index 000000000..482b09757 Binary files /dev/null and b/SquareLine/boards/v9/espbox_lite/image.png differ diff --git a/SquareLine/boards/esp32_s3_usb_otg/main/idf_component.yml b/SquareLine/boards/v9/espbox_lite/main/idf_component.yml similarity index 79% rename from SquareLine/boards/esp32_s3_usb_otg/main/idf_component.yml rename to SquareLine/boards/v9/espbox_lite/main/idf_component.yml index 0dbb51be4..cba80c834 100644 --- a/SquareLine/boards/esp32_s3_usb_otg/main/idf_component.yml +++ b/SquareLine/boards/v9/espbox_lite/main/idf_component.yml @@ -3,4 +3,4 @@ targets: - esp32s3 dependencies: idf: ">=4.4" - esp32_s3_usb_otg: "*" + esp-box-lite: ">2.1.0" diff --git a/SquareLine/boards/v9/espbox_lite/manifest.json b/SquareLine/boards/v9/espbox_lite/manifest.json new file mode 100644 index 000000000..59f3311d1 --- /dev/null +++ b/SquareLine/boards/v9/espbox_lite/manifest.json @@ -0,0 +1,20 @@ +{ + "name":"ESP-BOX Lite", + "version":"2.0.0", + "mcu":"ESP32S3", + + "screen_width":"320", + "screen_height":"240", + "screen_color_swap":true, + + "supported_lvgl_version":"9.1.*", + + "short_description":"ESP32-S3-BOX Lite is an AI voice development kit that is based on Espressif's ESP32-S3 Wi-Fi + Bluetooth 5 (LE) SoC, with AI capabilities.", + "long_description":"The BOX series development boards, ESP32-S3-BOX and ESP32-S3-BOX-Lite provide a platform for developing the control of home appliances using Voice Assistance + touch and screen controller, sensor, infrared controller, and intelligent Wi-Fi gateway. Development boards come with pre-built firmware that supports offline voice interaction, with the SDKs and examples provided by Espressif, you will be able to develop a wide variety of AIoT applications based on the BOX series products such as online and offline voice assistants, voice-enabled devices, human-computer interaction devices, control panels, multi-protocol gateways easily.", + + "placeholders": + { + "__ESP_BOARD_INCLUDE__": "bsp/esp-bsp.h", + "__ESP_BOARD_I2C_INIT__": "/* Initialize I2C (for touch and audio) */\n bsp_i2c_init();" + } +} diff --git a/SquareLine/boards/v9/espbox_lite/sdkconfig.defaults b/SquareLine/boards/v9/espbox_lite/sdkconfig.defaults new file mode 100644 index 000000000..80a2848c3 --- /dev/null +++ b/SquareLine/boards/v9/espbox_lite/sdkconfig.defaults @@ -0,0 +1,8 @@ +# This file was generated using idf.py save-defconfig. It can be edited manually. +# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration +# +CONFIG_IDF_TARGET="esp32s3" +CONFIG_LV_COLOR_16_SWAP=y +CONFIG_LV_MEM_CUSTOM=y +CONFIG_LV_MEMCPY_MEMSET_STD=y +CONFIG_LV_USE_PERF_MONITOR=y diff --git a/SquareLine/boards/v9/espwroverkit/image.png b/SquareLine/boards/v9/espwroverkit/image.png new file mode 100644 index 000000000..4d98b2d6b Binary files /dev/null and b/SquareLine/boards/v9/espwroverkit/image.png differ diff --git a/SquareLine/boards/v9/espwroverkit/main/idf_component.yml b/SquareLine/boards/v9/espwroverkit/main/idf_component.yml new file mode 100644 index 000000000..2417ca0a5 --- /dev/null +++ b/SquareLine/boards/v9/espwroverkit/main/idf_component.yml @@ -0,0 +1,6 @@ +description: ESP-BSP SquareLine LVGL Example +targets: + - esp32 +dependencies: + idf: ">=4.4" + esp_wrover_kit: ">=1.6.0" diff --git a/SquareLine/boards/v9/espwroverkit/manifest.json b/SquareLine/boards/v9/espwroverkit/manifest.json new file mode 100644 index 000000000..fd091fd8f --- /dev/null +++ b/SquareLine/boards/v9/espwroverkit/manifest.json @@ -0,0 +1,20 @@ +{ + "name":"ESP WROVER KIT", + "version":"2.0.0", + "mcu":"ESP32", + + "screen_width":"240", + "screen_height":"320", + "screen_color_swap":true, + + "supported_lvgl_version":"9.1.*", + + "short_description":"ESP-WROVER-KIT is an ESP32-based development board produced by Espressif. This board features an integrated LCD screen and microSD card slot.", + "long_description":"The ESP-WROVER-KIT comes with an ESP32-WROVER-E module by default. The I/O pins have been broken out from the ESP32-WROVER-E for easy extension. The board carries an advanced multi-protocol USB bridge (the FTDI FT2232HL), enabling developers to use JTAG directly to debug the ESP32 module through the USB interface. The development board makes secondary development easy and cost-effective.", + + "placeholders": + { + "__ESP_BOARD_INCLUDE__": "bsp/esp_wrover_kit.h", + "__ESP_BOARD_I2C_INIT__": "" + } +} diff --git a/SquareLine/boards/v9/espwroverkit/sdkconfig.defaults b/SquareLine/boards/v9/espwroverkit/sdkconfig.defaults new file mode 100644 index 000000000..97681efa4 --- /dev/null +++ b/SquareLine/boards/v9/espwroverkit/sdkconfig.defaults @@ -0,0 +1,11 @@ +# This file was generated using idf.py save-defconfig. It can be edited manually. +# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration +# +CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y +CONFIG_ESP_DEFAULT_CPU_FREQ_240=y +CONFIG_LV_COLOR_16_SWAP=y +CONFIG_LV_MEM_CUSTOM=y +CONFIG_LV_MEMCPY_MEMSET_STD=y +CONFIG_LV_USE_PERF_MONITOR=y +CONFIG_LV_SPRINTF_CUSTOM=y +# CONFIG_LV_BUILD_EXAMPLES is not set diff --git a/SquareLine/boards/v9/m5stack_core_s3/image.png b/SquareLine/boards/v9/m5stack_core_s3/image.png new file mode 100644 index 000000000..01dc38ede Binary files /dev/null and b/SquareLine/boards/v9/m5stack_core_s3/image.png differ diff --git a/SquareLine/boards/v9/m5stack_core_s3/main/idf_component.yml b/SquareLine/boards/v9/m5stack_core_s3/main/idf_component.yml new file mode 100644 index 000000000..b8adda382 --- /dev/null +++ b/SquareLine/boards/v9/m5stack_core_s3/main/idf_component.yml @@ -0,0 +1,6 @@ +description: ESP-BSP SquareLine LVGL Example +targets: + - esp32s3 +dependencies: + idf: ">=5.0" + m5stack_core_s3: ">=1.1.0" diff --git a/SquareLine/boards/v9/m5stack_core_s3/manifest.json b/SquareLine/boards/v9/m5stack_core_s3/manifest.json new file mode 100644 index 000000000..d56d7ea03 --- /dev/null +++ b/SquareLine/boards/v9/m5stack_core_s3/manifest.json @@ -0,0 +1,20 @@ +{ + "name":"M5Stack CoreS3", + "version":"2.0.0", + "mcu":"ESP32S3", + + "screen_width":"320", + "screen_height":"240", + "screen_color_swap":true, + + "supported_lvgl_version":"9.1.*", + + "short_description":"CoreS3 is the third generation of the M5Stack Core series. Powered by the ESP32-S3 solution, this kit features a dual-core Xtensa LX7 processor running at 240MHz. CoreS3 comes equipped with built-in Wi-Fi functionality, enabling seamless connectivity. It boasts 16MB of onboard flash memory and 8MB of PSRAM, providing ample space for program storage.", + "long_description":"CoreS3 offers convenient programming options through its TYPE-C interface, supporting OTG and CDC functions. This allows for easy connection with external USB devices and hassle-free firmware flashing. CoreS3 features a 2.0-inch capacitive touch IPS screen, protected by high-strength glass material. Additionally, a 0.3 megapixel camera GC0308 is integrated at the bottom of the screen, accompanied by a proximity sensor LTR-553ALS-WA for enhanced functionality. Power management is handled by the AXP2101 power management core chip, employing a 4-way power flow control loop for efficient power distribution. The overall design emphasizes low power consumption. CoreS3 also features a 6-axis attitude sensor BMI270 and a magnetometer BMM150 for precise motion detection. With the onboard TF-card (microSD) card slot and BM8563 RTC chip, accurate timing and sleep-timer wake-up functions are readily available.", + + "placeholders": + { + "__ESP_BOARD_INCLUDE__": "bsp/esp-bsp.h", + "__ESP_BOARD_I2C_INIT__": "/* Initialize I2C (for touch and audio) */\n bsp_i2c_init();" + } +} diff --git a/SquareLine/boards/v9/m5stack_core_s3/partitions.csv b/SquareLine/boards/v9/m5stack_core_s3/partitions.csv new file mode 100644 index 000000000..7c211a410 --- /dev/null +++ b/SquareLine/boards/v9/m5stack_core_s3/partitions.csv @@ -0,0 +1,5 @@ +# Name, Type, SubType, Offset, Size, Flags +# Note: if you change the phy_init or app partition offset, make sure to change the offset in Kconfig.projbuild +nvs, data, nvs, 0x9000, 0x6000, +phy_init, data, phy, 0xf000, 0x1000, +factory, app, factory, 0x10000, 8M, diff --git a/SquareLine/boards/v9/m5stack_core_s3/sdkconfig.defaults b/SquareLine/boards/v9/m5stack_core_s3/sdkconfig.defaults new file mode 100644 index 000000000..6071db689 --- /dev/null +++ b/SquareLine/boards/v9/m5stack_core_s3/sdkconfig.defaults @@ -0,0 +1,11 @@ +# This file was generated using idf.py save-defconfig. It can be edited manually. +# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration +# +CONFIG_IDF_TARGET="esp32s3" +CONFIG_ESPTOOLPY_FLASHMODE_QIO=y +CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y +CONFIG_PARTITION_TABLE_CUSTOM=y +CONFIG_LV_COLOR_16_SWAP=y +CONFIG_LV_MEM_CUSTOM=y +CONFIG_LV_MEMCPY_MEMSET_STD=y +CONFIG_LV_USE_PERF_MONITOR=y diff --git a/SquareLine/gen.py b/SquareLine/gen.py index 60b5d1eaa..d30b0f8fc 100644 --- a/SquareLine/gen.py +++ b/SquareLine/gen.py @@ -40,7 +40,7 @@ "color_depth": "", "lvgl_export_path": "", "lvgl_include_path": "lvgl.h", - "supported_lvgl_version": "8.2.0, 8.3.3", + "supported_lvgl_version": "9.1.*", "pattern_match_files": "./CMakeLists.txt", "language":"C", "ui_export_path":"./main/ui", @@ -164,6 +164,7 @@ def create_slb_file(output, output_filename, manifest): check_json_key(manifest, "screen_color_swap") check_json_key(manifest, "short_description") check_json_key(manifest, "long_description") + check_json_key(manifest, "supported_lvgl_version") SLB_FILE["version"] = manifest["version"] SLB_FILE["title"] = manifest["name"] @@ -180,6 +181,7 @@ def create_slb_file(output, output_filename, manifest): SLB_FILE["color_depth"] = "16" SLB_FILE["short_description"] = manifest["short_description"] SLB_FILE["long_description"] = manifest["long_description"] + SLB_FILE["supported_lvgl_version"] = manifest["supported_lvgl_version"] out_slb_json = json.dumps(SLB_FILE, indent=4) slb_file = os.path.join(output, output_filename + ".slb") @@ -267,9 +269,15 @@ def main(outdir, sel_board): # Remove all in output directory if os.path.exists(output_folder): shutil.rmtree(output_folder) - # loop all boards - for dirname in os.listdir(BOARDS_DIR): - d = os.path.join(BOARDS_DIR, dirname) + # loop all boards V8 + for dirname in os.listdir(BOARDS_DIR + "v8/"): + d = os.path.join(BOARDS_DIR, "v8/" + dirname) + # checking if it is a file + if os.path.isdir(d) and "custom" not in dirname: + process_board(dirname, os.path.join(output_folder, dirname), d) + # loop all boards V9 + for dirname in os.listdir(BOARDS_DIR + "v9/"): + d = os.path.join(BOARDS_DIR, "v9/" + dirname) # checking if it is a file if os.path.isdir(d) and "custom" not in dirname: process_board(dirname, os.path.join(output_folder, dirname), d) diff --git a/bsp/esp-box-3/esp-box-3.c b/bsp/esp-box-3/esp-box-3.c index c318e82c5..7a4ec9647 100644 --- a/bsp/esp-box-3/esp-box-3.c +++ b/bsp/esp-box-3/esp-box-3.c @@ -53,7 +53,7 @@ static const ili9341_lcd_init_cmd_t vendor_specific_init[] = { {0, (uint8_t []){0}, 0xff, 0}, }; -static lv_disp_t *disp; +static lv_display_t *disp; static lv_indev_t *disp_indev = NULL; static esp_lcd_touch_handle_t tp; // LCD touch handle static esp_lcd_panel_handle_t panel_handle = NULL; @@ -424,7 +424,7 @@ esp_err_t bsp_display_new(const bsp_display_config_t *config, esp_lcd_panel_hand return ret; } -static lv_disp_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) +static lv_display_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) { assert(cfg != NULL); esp_lcd_panel_io_handle_t io_handle = NULL; @@ -454,6 +454,9 @@ static lv_disp_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) .flags = { .buff_dma = cfg->flags.buff_dma, .buff_spiram = cfg->flags.buff_spiram, +#if LVGL_VERSION_MAJOR >= 9 + .swap_bytes = (BSP_LCD_BIGENDIAN ? true : false), +#endif } }; @@ -534,7 +537,7 @@ esp_err_t bsp_touch_new(const bsp_touch_config_t *config, esp_lcd_touch_handle_t return ESP_OK; } -static lv_indev_t *bsp_display_indev_init(lv_disp_t *disp) +static lv_indev_t *bsp_display_indev_init(lv_display_t *disp) { BSP_ERROR_CHECK_RETURN_NULL(bsp_touch_new(NULL, &tp)); assert(tp); @@ -548,7 +551,7 @@ static lv_indev_t *bsp_display_indev_init(lv_disp_t *disp) return lvgl_port_add_touch(&touch_cfg); } -lv_disp_t *bsp_display_start(void) +lv_display_t *bsp_display_start(void) { bsp_display_cfg_t cfg = { .lvgl_port_cfg = ESP_LVGL_PORT_INIT_CONFIG(), @@ -566,7 +569,7 @@ lv_disp_t *bsp_display_start(void) return bsp_display_start_with_config(&cfg); } -lv_disp_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg) +lv_display_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg) { assert(cfg != NULL); BSP_ERROR_CHECK_RETURN_NULL(lvgl_port_init(&cfg->lvgl_port_cfg)); @@ -585,7 +588,7 @@ lv_indev_t *bsp_display_get_input_dev(void) return disp_indev; } -void bsp_display_rotate(lv_disp_t *disp, lv_disp_rot_t rotation) +void bsp_display_rotate(lv_display_t *disp, lv_disp_rotation_t rotation) { lv_disp_set_rotation(disp, rotation); } diff --git a/bsp/esp-box-3/idf_component.yml b/bsp/esp-box-3/idf_component.yml index 82c6c8f53..c4154e7b3 100644 --- a/bsp/esp-box-3/idf_component.yml +++ b/bsp/esp-box-3/idf_component.yml @@ -1,5 +1,5 @@ -version: "1.1.3" +version: "1.2.0" description: Board Support Package (BSP) for ESP32-S3-BOX-3 url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp-box-3 @@ -14,7 +14,6 @@ dependencies: esp_lcd_touch_tt21100: "^1" esp_lcd_touch_gt911: "^1" esp_lcd_ili9341: "^1" - lvgl/lvgl: "^8" espressif/esp_lvgl_port: version: "^2" diff --git a/bsp/esp-box-3/include/bsp/esp-box-3.h b/bsp/esp-box-3/include/bsp/esp-box-3.h index 53ccb68e4..9de01790e 100644 --- a/bsp/esp-box-3/include/bsp/esp-box-3.h +++ b/bsp/esp-box-3/include/bsp/esp-box-3.h @@ -351,7 +351,7 @@ esp_err_t bsp_sdcard_unmount(void); * * @return Pointer to LVGL display or NULL when error occurred */ -lv_disp_t *bsp_display_start(void); +lv_display_t *bsp_display_start(void); /** * @brief Initialize display @@ -363,7 +363,7 @@ lv_disp_t *bsp_display_start(void); * * @return Pointer to LVGL display or NULL when error occurred */ -lv_disp_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg); +lv_display_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg); /** * @brief Get pointer to input device (touch, buttons, ...) @@ -419,7 +419,7 @@ esp_err_t bsp_display_exit_sleep(void); * @param[in] disp Pointer to LVGL display * @param[in] rotation Angle of the display rotation */ -void bsp_display_rotate(lv_disp_t *disp, lv_disp_rot_t rotation); +void bsp_display_rotate(lv_display_t *disp, lv_disp_rotation_t rotation); /************************************************************************************************** * * Button diff --git a/bsp/esp-box-lite/esp-box-lite.c b/bsp/esp-box-lite/esp-box-lite.c index 14ed47598..53f251242 100644 --- a/bsp/esp-box-lite/esp-box-lite.c +++ b/bsp/esp-box-lite/esp-box-lite.c @@ -332,7 +332,7 @@ esp_err_t bsp_display_new(const bsp_display_config_t *config, esp_lcd_panel_hand return ret; } -static lv_disp_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) +static lv_display_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) { assert(cfg != NULL); esp_lcd_panel_io_handle_t io_handle = NULL; @@ -363,13 +363,16 @@ static lv_disp_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) .flags = { .buff_dma = cfg->flags.buff_dma, .buff_spiram = cfg->flags.buff_spiram, +#if LVGL_VERSION_MAJOR >= 9 + .swap_bytes = (BSP_LCD_BIGENDIAN ? true : false), +#endif } }; return lvgl_port_add_disp(&disp_cfg); } -static lv_indev_t *bsp_display_indev_init(lv_disp_t *disp) +static lv_indev_t *bsp_display_indev_init(lv_display_t *disp) { #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0) /* Initialize ADC and get ADC handle */ @@ -387,7 +390,7 @@ static lv_indev_t *bsp_display_indev_init(lv_disp_t *disp) return lvgl_port_add_navigation_buttons(&btns); } -lv_disp_t *bsp_display_start(void) +lv_display_t *bsp_display_start(void) { bsp_display_cfg_t cfg = { .lvgl_port_cfg = ESP_LVGL_PORT_INIT_CONFIG(), @@ -405,9 +408,9 @@ lv_disp_t *bsp_display_start(void) return bsp_display_start_with_config(&cfg); } -lv_disp_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg) +lv_display_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg) { - lv_disp_t *disp; + lv_display_t *disp; assert(cfg != NULL); BSP_ERROR_CHECK_RETURN_NULL(lvgl_port_init(&cfg->lvgl_port_cfg)); @@ -425,7 +428,7 @@ lv_indev_t *bsp_display_get_input_dev(void) return disp_indev; } -void bsp_display_rotate(lv_disp_t *disp, lv_disp_rot_t rotation) +void bsp_display_rotate(lv_display_t *disp, lv_disp_rotation_t rotation) { lv_disp_set_rotation(disp, rotation); } diff --git a/bsp/esp-box-lite/idf_component.yml b/bsp/esp-box-lite/idf_component.yml index dbdecf858..31efd600a 100644 --- a/bsp/esp-box-lite/idf_component.yml +++ b/bsp/esp-box-lite/idf_component.yml @@ -1,4 +1,4 @@ -version: "2.0.4" +version: "2.1.0" description: Board Support Package (BSP) for ESP32-S3-BOX-Lite url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp-box-lite @@ -10,7 +10,6 @@ tags: dependencies: idf: ">=4.4.5" - lvgl/lvgl: "^8" button: version: ">=2.4" diff --git a/bsp/esp-box-lite/include/bsp/esp-box-lite.h b/bsp/esp-box-lite/include/bsp/esp-box-lite.h index 8159a9902..787c84cf9 100644 --- a/bsp/esp-box-lite/include/bsp/esp-box-lite.h +++ b/bsp/esp-box-lite/include/bsp/esp-box-lite.h @@ -296,7 +296,7 @@ esp_err_t bsp_spiffs_unmount(void); * * @return Pointer to LVGL display or NULL when error occurred */ -lv_disp_t *bsp_display_start(void); +lv_display_t *bsp_display_start(void); /** * @brief Initialize display @@ -308,7 +308,7 @@ lv_disp_t *bsp_display_start(void); * * @return Pointer to LVGL display or NULL when error occurred */ -lv_disp_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg); +lv_display_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg); /** * @brief Get pointer to input device (touch, buttons, ...) @@ -342,7 +342,7 @@ void bsp_display_unlock(void); * @param[in] disp Pointer to LVGL display * @param[in] rotation Angle of the display rotation */ -void bsp_display_rotate(lv_disp_t *disp, lv_disp_rot_t rotation); +void bsp_display_rotate(lv_display_t *disp, lv_disp_rotation_t rotation); /************************************************************************************************** * diff --git a/bsp/esp-box/esp-box.c b/bsp/esp-box/esp-box.c index 98abdb6fa..405b7a99d 100644 --- a/bsp/esp-box/esp-box.c +++ b/bsp/esp-box/esp-box.c @@ -30,7 +30,7 @@ static const char *TAG = "ESP-BOX"; _Static_assert(CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS > 0, "Touch buttons must be supported for this BSP"); /** @endcond */ -static lv_disp_t *disp; +static lv_display_t *disp; static lv_indev_t *disp_indev = NULL; static esp_lcd_touch_handle_t tp; // LCD touch handle static bool i2c_initialized = false; @@ -318,7 +318,7 @@ esp_err_t bsp_display_new(const bsp_display_config_t *config, esp_lcd_panel_hand return ret; } -static lv_disp_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) +static lv_display_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) { assert(cfg != NULL); esp_lcd_panel_io_handle_t io_handle = NULL; @@ -349,6 +349,9 @@ static lv_disp_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) .flags = { .buff_dma = cfg->flags.buff_dma, .buff_spiram = cfg->flags.buff_spiram, +#if LVGL_VERSION_MAJOR >= 9 + .swap_bytes = (BSP_LCD_BIGENDIAN ? true : false), +#endif } }; @@ -382,7 +385,7 @@ esp_err_t bsp_touch_new(const bsp_touch_config_t *config, esp_lcd_touch_handle_t return esp_lcd_touch_new_i2c_tt21100(tp_io_handle, &tp_cfg, ret_touch); } -static lv_indev_t *bsp_display_indev_init(lv_disp_t *disp) +static lv_indev_t *bsp_display_indev_init(lv_display_t *disp) { BSP_ERROR_CHECK_RETURN_NULL(bsp_touch_new(NULL, &tp)); assert(tp); @@ -396,7 +399,7 @@ static lv_indev_t *bsp_display_indev_init(lv_disp_t *disp) return lvgl_port_add_touch(&touch_cfg); } -lv_disp_t *bsp_display_start(void) +lv_display_t *bsp_display_start(void) { bsp_display_cfg_t cfg = { .lvgl_port_cfg = ESP_LVGL_PORT_INIT_CONFIG(), @@ -414,7 +417,7 @@ lv_disp_t *bsp_display_start(void) return bsp_display_start_with_config(&cfg); } -lv_disp_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg) +lv_display_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg) { assert(cfg != NULL); BSP_ERROR_CHECK_RETURN_NULL(lvgl_port_init(&cfg->lvgl_port_cfg)); @@ -433,7 +436,7 @@ lv_indev_t *bsp_display_get_input_dev(void) return disp_indev; } -void bsp_display_rotate(lv_disp_t *disp, lv_disp_rot_t rotation) +void bsp_display_rotate(lv_display_t *disp, lv_disp_rotation_t rotation) { lv_disp_set_rotation(disp, rotation); } diff --git a/bsp/esp-box/idf_component.yml b/bsp/esp-box/idf_component.yml index 5a2fade2e..8b2e81397 100644 --- a/bsp/esp-box/idf_component.yml +++ b/bsp/esp-box/idf_component.yml @@ -1,5 +1,5 @@ -version: "3.0.5" +version: "3.1.0" description: Board Support Package (BSP) for ESP-BOX url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp-box @@ -12,7 +12,6 @@ tags: dependencies: idf: ">=4.4.5" esp_lcd_touch_tt21100: "^1" - lvgl/lvgl: "^8" espressif/esp_lvgl_port: version: "^2" diff --git a/bsp/esp-box/include/bsp/esp-box.h b/bsp/esp-box/include/bsp/esp-box.h index 659922ed1..d8346a060 100644 --- a/bsp/esp-box/include/bsp/esp-box.h +++ b/bsp/esp-box/include/bsp/esp-box.h @@ -293,7 +293,7 @@ esp_err_t bsp_spiffs_unmount(void); * * @return Pointer to LVGL display or NULL when error occurred */ -lv_disp_t *bsp_display_start(void); +lv_display_t *bsp_display_start(void); /** * @brief Initialize display @@ -305,7 +305,7 @@ lv_disp_t *bsp_display_start(void); * * @return Pointer to LVGL display or NULL when error occurred */ -lv_disp_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg); +lv_display_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg); /** * @brief Get pointer to input device (touch, buttons, ...) @@ -339,7 +339,7 @@ void bsp_display_unlock(void); * @param[in] disp Pointer to LVGL display * @param[in] rotation Angle of the display rotation */ -void bsp_display_rotate(lv_disp_t *disp, lv_disp_rot_t rotation); +void bsp_display_rotate(lv_display_t *disp, lv_disp_rotation_t rotation); /************************************************************************************************** * * Button diff --git a/bsp/esp32_azure_iot_kit/esp32_azure_iot_kit.c b/bsp/esp32_azure_iot_kit/esp32_azure_iot_kit.c index ca1907082..bca12196c 100644 --- a/bsp/esp32_azure_iot_kit/esp32_azure_iot_kit.c +++ b/bsp/esp32_azure_iot_kit/esp32_azure_iot_kit.c @@ -19,7 +19,7 @@ static const char *TAG = "Azure-IoT"; -static lv_disp_t *disp; +static lv_display_t *disp; sdmmc_card_t *bsp_sdcard = NULL; // Global uSD card handler static bool i2c_initialized = false; @@ -244,7 +244,7 @@ esp_err_t bsp_display_new(const bsp_display_config_t *config, esp_lcd_panel_hand return ret; } -static lv_disp_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) +static lv_display_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) { assert(cfg != NULL); esp_lcd_panel_io_handle_t io_handle = NULL; @@ -278,7 +278,7 @@ static lv_disp_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) return lvgl_port_add_disp(&disp_cfg); } -lv_disp_t *bsp_display_start(void) +lv_display_t *bsp_display_start(void) { bsp_display_cfg_t cfg = { .lvgl_port_cfg = ESP_LVGL_PORT_INIT_CONFIG(), @@ -292,7 +292,7 @@ lv_disp_t *bsp_display_start(void) return bsp_display_start_with_config(&cfg); } -lv_disp_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg) +lv_display_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg) { assert(cfg != NULL); BSP_ERROR_CHECK_RETURN_NULL(lvgl_port_init(&cfg->lvgl_port_cfg)); @@ -307,7 +307,7 @@ lv_indev_t *bsp_display_get_input_dev(void) return NULL; } -void bsp_display_rotate(lv_disp_t *disp, lv_disp_rot_t rotation) +void bsp_display_rotate(lv_display_t *disp, lv_disp_rotation_t rotation) { lv_disp_set_rotation(disp, rotation); } diff --git a/bsp/esp32_azure_iot_kit/idf_component.yml b/bsp/esp32_azure_iot_kit/idf_component.yml index 17b098f8f..2c70ff38c 100644 --- a/bsp/esp32_azure_iot_kit/idf_component.yml +++ b/bsp/esp32_azure_iot_kit/idf_component.yml @@ -1,4 +1,4 @@ -version: "2.0.1" +version: "2.1.0" description: Board Support Package (BSP) for ESP32-Azure-IoT-Kit url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp32_azure_iot_kit @@ -10,7 +10,6 @@ tags: dependencies: idf: ">=4.4.5" - lvgl/lvgl: "^8" espressif/esp_lvgl_port: version: "^2" diff --git a/bsp/esp32_azure_iot_kit/include/bsp/esp32_azure_iot_kit.h b/bsp/esp32_azure_iot_kit/include/bsp/esp32_azure_iot_kit.h index 50fc23ddd..f993f1e1e 100644 --- a/bsp/esp32_azure_iot_kit/include/bsp/esp32_azure_iot_kit.h +++ b/bsp/esp32_azure_iot_kit/include/bsp/esp32_azure_iot_kit.h @@ -225,7 +225,7 @@ esp_err_t bsp_sdcard_unmount(void); * * @return Pointer to LVGL display or NULL when error occurred */ -lv_disp_t *bsp_display_start(void); +lv_display_t *bsp_display_start(void); /** * @brief Initialize display @@ -237,7 +237,7 @@ lv_disp_t *bsp_display_start(void); * * @return Pointer to LVGL display or NULL when error occurred */ -lv_disp_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg); +lv_display_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg); /** * @brief Get pointer to input device (touch, buttons, ...) @@ -271,7 +271,7 @@ void bsp_display_unlock(void); * @param[in] disp Pointer to LVGL display * @param[in] rotation Angle of the display rotation */ -void bsp_display_rotate(lv_disp_t *disp, lv_disp_rot_t rotation); +void bsp_display_rotate(lv_display_t *disp, lv_disp_rotation_t rotation); /************************************************************************************************** * diff --git a/bsp/esp32_c3_lcdkit/esp32_c3_lcdkit.c b/bsp/esp32_c3_lcdkit/esp32_c3_lcdkit.c index 36001dc88..24b13b4e1 100644 --- a/bsp/esp32_c3_lcdkit/esp32_c3_lcdkit.c +++ b/bsp/esp32_c3_lcdkit/esp32_c3_lcdkit.c @@ -200,7 +200,7 @@ esp_err_t bsp_spiffs_unmount(void) return esp_vfs_spiffs_unregister(CONFIG_BSP_SPIFFS_PARTITION_LABEL); } -static lv_disp_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) +static lv_display_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) { assert(cfg != NULL); esp_lcd_panel_io_handle_t io_handle = NULL; @@ -231,13 +231,16 @@ static lv_disp_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) .flags = { .buff_dma = cfg->flags.buff_dma, .buff_spiram = cfg->flags.buff_spiram, +#if LVGL_VERSION_MAJOR >= 9 + .swap_bytes = (BSP_LCD_BIGENDIAN ? true : false), +#endif } }; return lvgl_port_add_disp(&disp_cfg); } -static lv_indev_t *bsp_display_indev_init(lv_disp_t *disp) +static lv_indev_t *bsp_display_indev_init(lv_display_t *disp) { const lvgl_port_encoder_cfg_t encoder = { .disp = disp, @@ -368,7 +371,7 @@ esp_err_t bsp_display_new(const bsp_display_config_t *config, esp_lcd_panel_hand return ret; } -lv_disp_t *bsp_display_start(void) +lv_display_t *bsp_display_start(void) { bsp_display_cfg_t cfg = { .lvgl_port_cfg = ESP_LVGL_PORT_INIT_CONFIG(), @@ -402,7 +405,7 @@ lv_indev_t *bsp_display_get_input_dev(void) return disp_indev; } -void bsp_display_rotate(lv_disp_t *disp, lv_disp_rot_t rotation) +void bsp_display_rotate(lv_display_t *disp, lv_disp_rotation_t rotation) { lv_disp_set_rotation(disp, rotation); } diff --git a/bsp/esp32_c3_lcdkit/idf_component.yml b/bsp/esp32_c3_lcdkit/idf_component.yml index efd9e4349..d22b3ee89 100644 --- a/bsp/esp32_c3_lcdkit/idf_component.yml +++ b/bsp/esp32_c3_lcdkit/idf_component.yml @@ -1,4 +1,4 @@ -version: "1.0.1" +version: "1.1.0" description: Board Support Package (BSP) for esp32_c3_lcdkit url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp32_c3_lcdkit @@ -6,11 +6,10 @@ targets: - esp32c3 tags: - - bsp + - bsp dependencies: idf: ">=5.0.0" - lvgl/lvgl: "^8" espressif/esp_lvgl_port: public: true diff --git a/bsp/esp32_c3_lcdkit/include/bsp/esp32_c3_lcdkit.h b/bsp/esp32_c3_lcdkit/include/bsp/esp32_c3_lcdkit.h index 41afccd50..ecf0e1b93 100644 --- a/bsp/esp32_c3_lcdkit/include/bsp/esp32_c3_lcdkit.h +++ b/bsp/esp32_c3_lcdkit/include/bsp/esp32_c3_lcdkit.h @@ -93,7 +93,7 @@ typedef struct { * * @return Pointer to LVGL display or NULL when error occurred */ -lv_disp_t *bsp_display_start(void); +lv_display_t *bsp_display_start(void); /** * @brief Initialize display @@ -140,7 +140,7 @@ void bsp_display_unlock(void); * @param[in] disp Pointer to LVGL display * @param[in] rotation Angle of the display rotation */ -void bsp_display_rotate(lv_disp_t *disp, lv_disp_rot_t rotation); +void bsp_display_rotate(lv_display_t *disp, lv_disp_rotation_t rotation); /************************************************************************************************** * diff --git a/bsp/esp32_p4_function_ev_board/esp32_p4_function_ev_board.c b/bsp/esp32_p4_function_ev_board/esp32_p4_function_ev_board.c index d8e4004d1..1548ab3af 100644 --- a/bsp/esp32_p4_function_ev_board/esp32_p4_function_ev_board.c +++ b/bsp/esp32_p4_function_ev_board/esp32_p4_function_ev_board.c @@ -360,7 +360,12 @@ static lv_display_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) .flags = { .buff_dma = cfg->flags.buff_dma, .buff_spiram = cfg->flags.buff_spiram, +#if LVGL_VERSION_MAJOR >= 9 .swap_bytes = (BSP_LCD_BIGENDIAN ? true : false), +#endif +#if LVGL_VERSION_MAJOR == 8 + .sw_rotate = cfg->flags.sw_rotate, /* Only SW rotation is supported for 90° and 270° */ +#endif } }; diff --git a/bsp/esp32_s2_kaluga_kit/esp32_s2_kaluga_kit.c b/bsp/esp32_s2_kaluga_kit/esp32_s2_kaluga_kit.c index fb244be25..65270cd63 100644 --- a/bsp/esp32_s2_kaluga_kit/esp32_s2_kaluga_kit.c +++ b/bsp/esp32_s2_kaluga_kit/esp32_s2_kaluga_kit.c @@ -356,7 +356,7 @@ esp_err_t bsp_display_new(const bsp_display_config_t *config, esp_lcd_panel_hand return ret; } -static lv_disp_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) +static lv_display_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) { assert(cfg != NULL); esp_lcd_panel_io_handle_t io_handle = NULL; @@ -387,13 +387,16 @@ static lv_disp_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) .flags = { .buff_dma = cfg->flags.buff_dma, .buff_spiram = cfg->flags.buff_spiram, +#if LVGL_VERSION_MAJOR >= 9 + .swap_bytes = (BSP_LCD_BIGENDIAN ? true : false), +#endif } }; return lvgl_port_add_disp(&disp_cfg); } -lv_disp_t *bsp_display_start(void) +lv_display_t *bsp_display_start(void) { bsp_display_cfg_t cfg = { .lvgl_port_cfg = ESP_LVGL_PORT_INIT_CONFIG(), @@ -407,9 +410,9 @@ lv_disp_t *bsp_display_start(void) return bsp_display_start_with_config(&cfg); } -lv_disp_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg) +lv_display_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg) { - lv_disp_t *disp = NULL; + lv_display_t *disp = NULL; BSP_NULL_CHECK(cfg, NULL); BSP_ERROR_CHECK_RETURN_NULL(lvgl_port_init(&cfg->lvgl_port_cfg)); @@ -422,7 +425,7 @@ lv_indev_t *bsp_display_get_input_dev(void) return NULL; } -void bsp_display_rotate(lv_disp_t *disp, lv_disp_rot_t rotation) +void bsp_display_rotate(lv_display_t *disp, lv_disp_rotation_t rotation) { lv_disp_set_rotation(disp, rotation); } diff --git a/bsp/esp32_s2_kaluga_kit/idf_component.yml b/bsp/esp32_s2_kaluga_kit/idf_component.yml index 2cc4bea96..895708b6f 100644 --- a/bsp/esp32_s2_kaluga_kit/idf_component.yml +++ b/bsp/esp32_s2_kaluga_kit/idf_component.yml @@ -1,4 +1,4 @@ -version: "3.0.1" +version: "3.1.0" description: Board Support Package (BSP) for ESP32-S2-Kaluga kit url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp32_s2_kaluga_kit @@ -10,7 +10,6 @@ tags: dependencies: idf: ">=4.4.5" - lvgl/lvgl: "^8" espressif/esp_lvgl_port: version: "^2" diff --git a/bsp/esp32_s2_kaluga_kit/include/bsp/esp32_s2_kaluga_kit.h b/bsp/esp32_s2_kaluga_kit/include/bsp/esp32_s2_kaluga_kit.h index cea9485ef..f085a05bf 100644 --- a/bsp/esp32_s2_kaluga_kit/include/bsp/esp32_s2_kaluga_kit.h +++ b/bsp/esp32_s2_kaluga_kit/include/bsp/esp32_s2_kaluga_kit.h @@ -308,7 +308,7 @@ esp_err_t bsp_spiffs_unmount(void); * * @return Pointer to LVGL display or NULL when error occurred */ -lv_disp_t *bsp_display_start(void); +lv_display_t *bsp_display_start(void); /** * @brief Initialize display @@ -319,7 +319,7 @@ lv_disp_t *bsp_display_start(void); * * @return Pointer to LVGL display or NULL when error occurred */ -lv_disp_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg); +lv_display_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg); /** * @brief Get pointer to input device (touch, buttons, ...) @@ -353,7 +353,7 @@ void bsp_display_unlock(void); * @param[in] disp Pointer to LVGL display * @param[in] rotation Angle of the display rotation */ -void bsp_display_rotate(lv_disp_t *disp, lv_disp_rot_t rotation); +void bsp_display_rotate(lv_display_t *disp, lv_disp_rotation_t rotation); /************************************************************************************************** * diff --git a/bsp/esp32_s3_eye/README.md b/bsp/esp32_s3_eye/README.md index 9e9a6715c..fe12258aa 100644 --- a/bsp/esp32_s3_eye/README.md +++ b/bsp/esp32_s3_eye/README.md @@ -18,7 +18,6 @@ The ESP32-S3-EYE board consists of two parts: the main board (ESP32-S3-EYE-MB) t * Accelerometer * OV2640 camera - ### Capabilities and dependencies | Capability | Available | Component | Version | diff --git a/bsp/esp32_s3_eye/esp32_s3_eye.c b/bsp/esp32_s3_eye/esp32_s3_eye.c index a01523fec..fdcf99db2 100644 --- a/bsp/esp32_s3_eye/esp32_s3_eye.c +++ b/bsp/esp32_s3_eye/esp32_s3_eye.c @@ -302,7 +302,7 @@ esp_err_t bsp_display_new(const bsp_display_config_t *config, esp_lcd_panel_hand } #if (BSP_CONFIG_NO_GRAPHIC_LIB == 0) -static lv_disp_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) +static lv_display_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) { assert(cfg != NULL); esp_lcd_panel_io_handle_t io_handle = NULL; @@ -337,13 +337,16 @@ static lv_disp_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) .flags = { .buff_dma = cfg->flags.buff_dma, .buff_spiram = cfg->flags.buff_spiram, +#if LVGL_VERSION_MAJOR >= 9 + .swap_bytes = (BSP_LCD_BIGENDIAN ? true : false), +#endif } }; return lvgl_port_add_disp(&disp_cfg); } -lv_disp_t *bsp_display_start(void) +lv_display_t *bsp_display_start(void) { bsp_display_cfg_t cfg = { .lvgl_port_cfg = { @@ -363,9 +366,9 @@ lv_disp_t *bsp_display_start(void) return bsp_display_start_with_config(&cfg); } -lv_disp_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg) +lv_display_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg) { - lv_disp_t *disp; + lv_display_t *disp; assert(cfg != NULL); BSP_ERROR_CHECK_RETURN_NULL(lvgl_port_init(&cfg->lvgl_port_cfg)); BSP_NULL_CHECK(disp = bsp_display_lcd_init(cfg), NULL); @@ -388,7 +391,7 @@ void bsp_display_unlock(void) lvgl_port_unlock(); } -void bsp_display_rotate(lv_disp_t *disp, lv_disp_rot_t rotation) +void bsp_display_rotate(lv_display_t *disp, lv_disp_rotation_t rotation) { lv_disp_set_rotation(disp, rotation); } diff --git a/bsp/esp32_s3_eye/idf_component.yml b/bsp/esp32_s3_eye/idf_component.yml index d622bfc66..3d769d770 100644 --- a/bsp/esp32_s3_eye/idf_component.yml +++ b/bsp/esp32_s3_eye/idf_component.yml @@ -1,4 +1,4 @@ -version: "3.0.4" +version: "3.1.0" description: Board Support Package (BSP) for ESP32-S3-EYE url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp32_s3_eye @@ -6,11 +6,10 @@ targets: - esp32s3 tags: - - bsp + - bsp dependencies: idf: ">=4.4.5" - lvgl/lvgl: "^8" espressif/esp_lvgl_port: version: "^2" diff --git a/bsp/esp32_s3_eye/include/bsp/display.h b/bsp/esp32_s3_eye/include/bsp/display.h index a4ccb1026..958c91cc4 100644 --- a/bsp/esp32_s3_eye/include/bsp/display.h +++ b/bsp/esp32_s3_eye/include/bsp/display.h @@ -24,7 +24,7 @@ /* LCD display color format */ #define BSP_LCD_COLOR_FORMAT (ESP_LCD_COLOR_FORMAT_RGB565) /* LCD display color bytes endianess */ -#define BSP_LCD_BIGENDIAN (1) +#define BSP_LCD_BIGENDIAN (0) /* LCD display color bits */ #define BSP_LCD_BITS_PER_PIXEL (16) /* LCD display color space */ diff --git a/bsp/esp32_s3_eye/include/bsp/esp32_s3_eye.h b/bsp/esp32_s3_eye/include/bsp/esp32_s3_eye.h index 055710a0b..d0cd38ec2 100644 --- a/bsp/esp32_s3_eye/include/bsp/esp32_s3_eye.h +++ b/bsp/esp32_s3_eye/include/bsp/esp32_s3_eye.h @@ -328,7 +328,7 @@ typedef struct { * * @return Pointer to LVGL display or NULL when error occurred */ -lv_disp_t *bsp_display_start(void); +lv_display_t *bsp_display_start(void); /** * @brief Initialize display @@ -340,7 +340,7 @@ lv_disp_t *bsp_display_start(void); * * @return Pointer to LVGL display or NULL when error occurred */ -lv_disp_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg); +lv_display_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg); /** * @brief Get pointer to input device (touch, buttons, ...) @@ -374,7 +374,7 @@ void bsp_display_unlock(void); * @param[in] disp Pointer to LVGL display * @param[in] rotation Angle of the display rotation */ -void bsp_display_rotate(lv_disp_t *disp, lv_disp_rot_t rotation); +void bsp_display_rotate(lv_display_t *disp, lv_disp_rotation_t rotation); #endif // BSP_CONFIG_NO_GRAPHIC_LIB == 0 /************************************************************************************************** diff --git a/bsp/esp32_s3_korvo_2/esp32_s3_korvo_2.c b/bsp/esp32_s3_korvo_2/esp32_s3_korvo_2.c index 06ce6aef0..4143d09a0 100644 --- a/bsp/esp32_s3_korvo_2/esp32_s3_korvo_2.c +++ b/bsp/esp32_s3_korvo_2/esp32_s3_korvo_2.c @@ -355,7 +355,7 @@ esp_err_t bsp_display_new(const bsp_display_config_t *config, esp_lcd_panel_hand return ret; } -static lv_disp_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) +static lv_display_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) { assert(cfg != NULL); esp_lcd_panel_io_handle_t io_handle = NULL; @@ -386,6 +386,9 @@ static lv_disp_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) .flags = { .buff_dma = cfg->flags.buff_dma, .buff_spiram = cfg->flags.buff_spiram, +#if LVGL_VERSION_MAJOR >= 9 + .swap_bytes = (BSP_LCD_BIGENDIAN ? true : false), +#endif } }; @@ -417,7 +420,7 @@ esp_err_t bsp_touch_new(const bsp_touch_config_t *config, esp_lcd_touch_handle_t return esp_lcd_touch_new_i2c_tt21100(tp_io_handle, &tp_cfg, ret_touch); } -static lv_indev_t *bsp_display_indev_init(lv_disp_t *disp) +static lv_indev_t *bsp_display_indev_init(lv_display_t *disp) { if (tp == NULL) { BSP_ERROR_CHECK_RETURN_NULL(bsp_touch_new(NULL, &tp)); @@ -451,7 +454,7 @@ esp_err_t bsp_display_backlight_on(void) return esp_io_expander_set_level(io_expander, BSP_LCD_IO_BACKLIGHT, 1); } -lv_disp_t *bsp_display_start(void) +lv_display_t *bsp_display_start(void) { bsp_display_cfg_t cfg = { .lvgl_port_cfg = ESP_LVGL_PORT_INIT_CONFIG(), @@ -465,9 +468,9 @@ lv_disp_t *bsp_display_start(void) return bsp_display_start_with_config(&cfg); } -lv_disp_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg) +lv_display_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg) { - lv_disp_t *disp = NULL; + lv_display_t *disp = NULL; assert(cfg != NULL); BSP_ERROR_CHECK_RETURN_NULL(lvgl_port_init(&cfg->lvgl_port_cfg)); @@ -483,7 +486,7 @@ lv_indev_t *bsp_display_get_input_dev(void) return disp_indev; } -void bsp_display_rotate(lv_disp_t *disp, lv_disp_rot_t rotation) +void bsp_display_rotate(lv_display_t *disp, lv_disp_rotation_t rotation) { lv_disp_set_rotation(disp, rotation); } diff --git a/bsp/esp32_s3_korvo_2/idf_component.yml b/bsp/esp32_s3_korvo_2/idf_component.yml index bb687c09d..f1902ab9d 100644 --- a/bsp/esp32_s3_korvo_2/idf_component.yml +++ b/bsp/esp32_s3_korvo_2/idf_component.yml @@ -1,4 +1,4 @@ -version: "2.1.2" +version: "2.2.0" description: Board Support Package (BSP) for ESP32-S3-Korvo-2 url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp32_s3_korvo_2 @@ -6,13 +6,12 @@ targets: - esp32s3 tags: - - bsp + - bsp dependencies: idf: ">=4.4.5" esp_lcd_ili9341: "^1" esp_lcd_touch_tt21100: "^1" - lvgl/lvgl: "^8" esp_io_expander_tca9554: version: "^1" diff --git a/bsp/esp32_s3_korvo_2/include/bsp/esp32_s3_korvo_2.h b/bsp/esp32_s3_korvo_2/include/bsp/esp32_s3_korvo_2.h index ec4d1930d..dc0f48844 100644 --- a/bsp/esp32_s3_korvo_2/include/bsp/esp32_s3_korvo_2.h +++ b/bsp/esp32_s3_korvo_2/include/bsp/esp32_s3_korvo_2.h @@ -443,7 +443,7 @@ esp_err_t bsp_sdcard_unmount(void); * * @return Pointer to LVGL display or NULL when error occurred */ -lv_disp_t *bsp_display_start(void); +lv_display_t *bsp_display_start(void); /** * @brief Initialize display @@ -455,7 +455,7 @@ lv_disp_t *bsp_display_start(void); * * @return Pointer to LVGL display or NULL when error occurred */ -lv_disp_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg); +lv_display_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg); /** * @brief Get pointer to input device (touch, buttons, ...) @@ -489,7 +489,7 @@ void bsp_display_unlock(void); * @param[in] disp Pointer to LVGL display * @param[in] rotation Angle of the display rotation */ -void bsp_display_rotate(lv_disp_t *disp, lv_disp_rot_t rotation); +void bsp_display_rotate(lv_display_t *disp, lv_disp_rotation_t rotation); /************************************************************************************************** * diff --git a/bsp/esp32_s3_lcd_ev_board/idf_component.yml b/bsp/esp32_s3_lcd_ev_board/idf_component.yml index 1af696476..8d842b541 100644 --- a/bsp/esp32_s3_lcd_ev_board/idf_component.yml +++ b/bsp/esp32_s3_lcd_ev_board/idf_component.yml @@ -1,4 +1,4 @@ -version: "2.2.0" +version: "2.2.1" description: Board Support Package (BSP) for ESP32-S3-LCD-EV-Board url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp32_s3_lcd_ev_board diff --git a/bsp/esp32_s3_lcd_ev_board/src/esp32_s3_lcd_ev_board.c b/bsp/esp32_s3_lcd_ev_board/src/esp32_s3_lcd_ev_board.c index 7aa693f9b..1c531c1d5 100644 --- a/bsp/esp32_s3_lcd_ev_board/src/esp32_s3_lcd_ev_board.c +++ b/bsp/esp32_s3_lcd_ev_board/src/esp32_s3_lcd_ev_board.c @@ -445,7 +445,7 @@ esp_err_t bsp_display_backlight_on(void) void bsp_display_rotate(lv_display_t *disp, lv_display_rotation_t rotation) { - ESP_LOGE(TAG, "Unable to rotate the display."); + lv_disp_set_rotation(disp, rotation); } bool bsp_display_lock(uint32_t timeout_ms) diff --git a/bsp/esp32_s3_usb_otg/README.md b/bsp/esp32_s3_usb_otg/README.md index 6218a9001..587a447ab 100644 --- a/bsp/esp32_s3_usb_otg/README.md +++ b/bsp/esp32_s3_usb_otg/README.md @@ -4,7 +4,7 @@ ### Overview -ESP32-S3-USB-OTG is a development board that focuses on USB-OTG function verification and application development. It is based on ESP32-S3 SoC, supports Wi-Fi and BLE 5.0 wireless functions, and supports USB host and USB device functions. It can be used to develop applications such as wireless storage devices, Wi-Fi network cards, LTE MiFi, multimedia devices, virtual keyboards and mice. +ESP32-S3-USB-OTG is a development board that focuses on USB-OTG function verification and application development. It is based on ESP32-S3 SoC, supports Wi-Fi and BLE 5.0 wireless functions, and supports USB host and USB device functions. It can be used to develop applications such as wireless storage devices, Wi-Fi network cards, LTE MiFi, multimedia devices, virtual keyboards and mice. * [Hardware reference](https://docs.espressif.com/projects/espressif-esp-dev-kits/en/latest/esp32s3/esp32-s3-usb-otg/user_guide.html) diff --git a/bsp/esp32_s3_usb_otg/esp32_s3_usb_otg.c b/bsp/esp32_s3_usb_otg/esp32_s3_usb_otg.c index b04821627..729eefc5c 100644 --- a/bsp/esp32_s3_usb_otg/esp32_s3_usb_otg.c +++ b/bsp/esp32_s3_usb_otg/esp32_s3_usb_otg.c @@ -321,7 +321,7 @@ esp_err_t bsp_display_new(const bsp_display_config_t *config, esp_lcd_panel_hand return ret; } -static lv_disp_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) +static lv_display_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) { assert(cfg != NULL); esp_lcd_panel_io_handle_t io_handle = NULL; @@ -352,13 +352,16 @@ static lv_disp_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) .flags = { .buff_dma = cfg->flags.buff_dma, .buff_spiram = cfg->flags.buff_spiram, +#if LVGL_VERSION_MAJOR >= 9 + .swap_bytes = (BSP_LCD_BIGENDIAN ? true : false), +#endif } }; return lvgl_port_add_disp(&disp_cfg); } -lv_disp_t *bsp_display_start(void) +lv_display_t *bsp_display_start(void) { bsp_display_cfg_t cfg = { .lvgl_port_cfg = ESP_LVGL_PORT_INIT_CONFIG(), @@ -372,9 +375,9 @@ lv_disp_t *bsp_display_start(void) return bsp_display_start_with_config(&cfg); } -lv_disp_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg) +lv_display_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg) { - lv_disp_t *disp = NULL; + lv_display_t *disp = NULL; assert(cfg != NULL); BSP_ERROR_CHECK_RETURN_NULL(lvgl_port_init(&cfg->lvgl_port_cfg)); BSP_NULL_CHECK(disp = bsp_display_lcd_init(cfg), NULL); @@ -386,7 +389,7 @@ lv_indev_t *bsp_display_get_input_dev(void) return NULL; } -void bsp_display_rotate(lv_disp_t *disp, lv_disp_rot_t rotation) +void bsp_display_rotate(lv_display_t *disp, lv_disp_rotation_t rotation) { lv_disp_set_rotation(disp, rotation); } diff --git a/bsp/esp32_s3_usb_otg/idf_component.yml b/bsp/esp32_s3_usb_otg/idf_component.yml index 8d332ab8c..356eb063c 100644 --- a/bsp/esp32_s3_usb_otg/idf_component.yml +++ b/bsp/esp32_s3_usb_otg/idf_component.yml @@ -1,4 +1,4 @@ -version: "1.5.1" +version: "1.6.0" description: Board Support Package (BSP) for ESP32-S3-USB-OTG url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp32_s3_usb_otg @@ -10,7 +10,6 @@ tags: dependencies: idf: ">=4.4" - lvgl/lvgl: "^8" button: version: ">=2.5,<4.0" diff --git a/bsp/esp32_s3_usb_otg/include/bsp/esp32_s3_usb_otg.h b/bsp/esp32_s3_usb_otg/include/bsp/esp32_s3_usb_otg.h index 55b8d5ea7..6dd4de39c 100644 --- a/bsp/esp32_s3_usb_otg/include/bsp/esp32_s3_usb_otg.h +++ b/bsp/esp32_s3_usb_otg/include/bsp/esp32_s3_usb_otg.h @@ -213,7 +213,7 @@ esp_err_t bsp_spiffs_unmount(void); * * @return Pointer to LVGL display or NULL when error occurred */ -lv_disp_t *bsp_display_start(void); +lv_display_t *bsp_display_start(void); /** * @brief Initialize display @@ -225,7 +225,7 @@ lv_disp_t *bsp_display_start(void); * * @return Pointer to LVGL display or NULL when error occurred */ -lv_disp_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg); +lv_display_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg); /** * @brief Get pointer to input device (touch, buttons, ...) @@ -259,7 +259,7 @@ void bsp_display_unlock(void); * @param[in] disp Pointer to LVGL display * @param[in] rotation Angle of the display rotation */ -void bsp_display_rotate(lv_disp_t *disp, lv_disp_rot_t rotation); +void bsp_display_rotate(lv_display_t *disp, lv_disp_rotation_t rotation); /************************************************************************************************** diff --git a/bsp/esp_bsp_generic/idf_component.yml b/bsp/esp_bsp_generic/idf_component.yml index 18866b340..205ee2712 100644 --- a/bsp/esp_bsp_generic/idf_component.yml +++ b/bsp/esp_bsp_generic/idf_component.yml @@ -1,5 +1,5 @@ -version: "1.1.2" +version: "1.2.0" description: Generic Board Support Package (BSP) url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp_bsp_generic @@ -15,7 +15,6 @@ dependencies: esp_lcd_touch_ft5x06: "^1" esp_lcd_ili9341: "^1" esp_lcd_gc9a01: "^1" - lvgl/lvgl: "^8" button: version: ">=2.5,<4.0" diff --git a/bsp/esp_bsp_generic/include/bsp/esp_bsp_generic.h b/bsp/esp_bsp_generic/include/bsp/esp_bsp_generic.h index 8a7e9eb71..dfd162a10 100644 --- a/bsp/esp_bsp_generic/include/bsp/esp_bsp_generic.h +++ b/bsp/esp_bsp_generic/include/bsp/esp_bsp_generic.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -279,7 +279,7 @@ esp_err_t bsp_sdcard_unmount(void); * * @return Pointer to LVGL display or NULL when error occurred */ -lv_disp_t *bsp_display_start(void); +lv_display_t *bsp_display_start(void); /** * @brief Initialize display @@ -291,7 +291,7 @@ lv_disp_t *bsp_display_start(void); * * @return Pointer to LVGL display or NULL when error occurred */ -lv_disp_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg); +lv_display_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg); /** * @brief Get pointer to input device (touch, buttons, ...) @@ -325,7 +325,7 @@ void bsp_display_unlock(void); * @param[in] disp Pointer to LVGL display * @param[in] rotation Angle of the display rotation */ -void bsp_display_rotate(lv_disp_t *disp, lv_disp_rot_t rotation); +void bsp_display_rotate(lv_display_t *disp, lv_disp_rotation_t rotation); #endif //CONFIG_BSP_DISPLAY_ENABLED /************************************************************************************************** * diff --git a/bsp/esp_bsp_generic/src/esp_bsp_generic.c b/bsp/esp_bsp_generic/src/esp_bsp_generic.c index d90236364..9ee87f476 100644 --- a/bsp/esp_bsp_generic/src/esp_bsp_generic.c +++ b/bsp/esp_bsp_generic/src/esp_bsp_generic.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -47,7 +47,7 @@ static const char *TAG = "BSP-Gen"; #if CONFIG_BSP_DISPLAY_ENABLED -static lv_disp_t *disp; +static lv_display_t *disp; static lv_indev_t *disp_indev = NULL; #endif @@ -561,7 +561,7 @@ esp_err_t bsp_display_new(const bsp_display_config_t *config, esp_lcd_panel_hand return ret; } -static lv_disp_t *bsp_display_lcd_init(void) +static lv_display_t *bsp_display_lcd_init(void) { esp_lcd_panel_io_handle_t io_handle = NULL; esp_lcd_panel_handle_t panel_handle = NULL; @@ -600,6 +600,9 @@ static lv_disp_t *bsp_display_lcd_init(void) }, .flags = { .buff_dma = true, +#if LVGL_VERSION_MAJOR >= 9 + .swap_bytes = (BSP_LCD_BIGENDIAN ? true : false), +#endif } }; @@ -663,7 +666,7 @@ esp_err_t bsp_touch_new(const bsp_touch_config_t *config, esp_lcd_touch_handle_t #endif } -static lv_indev_t *bsp_display_indev_init(lv_disp_t *disp) +static lv_indev_t *bsp_display_indev_init(lv_display_t *disp) { BSP_ERROR_CHECK_RETURN_NULL(bsp_touch_new(NULL, &tp)); assert(tp); @@ -678,7 +681,7 @@ static lv_indev_t *bsp_display_indev_init(lv_disp_t *disp) } #endif //CONFIG_BSP_TOUCH_ENABLED -lv_disp_t *bsp_display_start(void) +lv_display_t *bsp_display_start(void) { bsp_display_cfg_t cfg = { .lvgl_port_cfg = ESP_LVGL_PORT_INIT_CONFIG() @@ -686,7 +689,7 @@ lv_disp_t *bsp_display_start(void) return bsp_display_start_with_config(&cfg); } -lv_disp_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg) +lv_display_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg) { assert(cfg != NULL); BSP_ERROR_CHECK_RETURN_NULL(lvgl_port_init(&cfg->lvgl_port_cfg)); @@ -706,7 +709,7 @@ lv_indev_t *bsp_display_get_input_dev(void) return disp_indev; } -void bsp_display_rotate(lv_disp_t *disp, lv_disp_rot_t rotation) +void bsp_display_rotate(lv_display_t *disp, lv_disp_rotation_t rotation) { lv_disp_set_rotation(disp, rotation); } diff --git a/bsp/esp_wrover_kit/esp_wrover_kit.c b/bsp/esp_wrover_kit/esp_wrover_kit.c index d3b9affbf..4b4d35bc1 100644 --- a/bsp/esp_wrover_kit/esp_wrover_kit.c +++ b/bsp/esp_wrover_kit/esp_wrover_kit.c @@ -264,7 +264,7 @@ esp_err_t bsp_display_new(const bsp_display_config_t *config, esp_lcd_panel_hand return ret; } -static lv_disp_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) +static lv_display_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) { assert(cfg != NULL); esp_lcd_panel_io_handle_t io_handle = NULL; @@ -303,13 +303,16 @@ static lv_disp_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) .flags = { .buff_dma = cfg->flags.buff_dma, .buff_spiram = cfg->flags.buff_spiram, +#if LVGL_VERSION_MAJOR >= 9 + .swap_bytes = (BSP_LCD_BIGENDIAN ? true : false), +#endif } }; return lvgl_port_add_disp(&disp_cfg); } -lv_disp_t *bsp_display_start(void) +lv_display_t *bsp_display_start(void) { bsp_display_cfg_t cfg = { .lvgl_port_cfg = ESP_LVGL_PORT_INIT_CONFIG(), @@ -323,9 +326,9 @@ lv_disp_t *bsp_display_start(void) return bsp_display_start_with_config(&cfg); } -lv_disp_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg) +lv_display_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg) { - lv_disp_t *disp = NULL; + lv_display_t *disp = NULL; assert(cfg != NULL); BSP_ERROR_CHECK_RETURN_NULL(lvgl_port_init(&cfg->lvgl_port_cfg)); BSP_NULL_CHECK(disp = bsp_display_lcd_init(cfg), NULL); @@ -337,7 +340,7 @@ lv_indev_t *bsp_display_get_input_dev(void) return NULL; } -void bsp_display_rotate(lv_disp_t *disp, lv_disp_rot_t rotation) +void bsp_display_rotate(lv_display_t *disp, lv_disp_rotation_t rotation) { lv_disp_set_rotation(disp, rotation); } diff --git a/bsp/esp_wrover_kit/idf_component.yml b/bsp/esp_wrover_kit/idf_component.yml index aa3f3ab4f..570ac1594 100644 --- a/bsp/esp_wrover_kit/idf_component.yml +++ b/bsp/esp_wrover_kit/idf_component.yml @@ -1,4 +1,4 @@ -version: "1.5.1" +version: "1.6.0" description: Board Support Package (BSP) for ESP-WROVER-KIT url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp_wrover_kit @@ -10,7 +10,6 @@ tags: dependencies: idf: ">=4.4.5" - lvgl/lvgl: "^8" espressif/esp_lvgl_port: version: "^2" diff --git a/bsp/esp_wrover_kit/include/bsp/esp_wrover_kit.h b/bsp/esp_wrover_kit/include/bsp/esp_wrover_kit.h index c737c73eb..1101162ce 100644 --- a/bsp/esp_wrover_kit/include/bsp/esp_wrover_kit.h +++ b/bsp/esp_wrover_kit/include/bsp/esp_wrover_kit.h @@ -254,7 +254,7 @@ esp_err_t bsp_iot_button_create(button_handle_t btn_array[], int *btn_cnt, int b * * @return Pointer to LVGL display or NULL when error occurred */ -lv_disp_t *bsp_display_start(void); +lv_display_t *bsp_display_start(void); /** * @brief Initialize display @@ -266,7 +266,7 @@ lv_disp_t *bsp_display_start(void); * * @return Pointer to LVGL display or NULL when error occurred */ -lv_disp_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg); +lv_display_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg); /** * @brief Get pointer to input device (touch, buttons, ...) @@ -300,7 +300,7 @@ void bsp_display_unlock(void); * @param[in] disp Pointer to LVGL display * @param[in] rotation Angle of the display rotation */ -void bsp_display_rotate(lv_disp_t *disp, lv_disp_rot_t rotation); +void bsp_display_rotate(lv_display_t *disp, lv_disp_rotation_t rotation); #ifdef __cplusplus } diff --git a/bsp/m5stack_core_s3/README.md b/bsp/m5stack_core_s3/README.md index a99e9fa44..c11dfc691 100644 --- a/bsp/m5stack_core_s3/README.md +++ b/bsp/m5stack_core_s3/README.md @@ -1,6 +1,6 @@ # BSP: M5Stack CoreS3 -> [!WARNING] +> [!WARNING] > The SD card is not working simultaneously with the LCD screen. We are working on a fix. [![Component Registry](https://components.espressif.com/components/espressif/m5stack_core_s3/badge.svg)](https://components.espressif.com/components/espressif/m5stack_core_s3) @@ -20,21 +20,7 @@ Sound output on CoreS3 is optimized with the high-fidelity 16-bit I2S power ampl | Capability | Available | Component |Version| |-------------|------------------|------------------------------------------------------------------------------------------------------------|-------| | DISPLAY |:heavy_check_mark:| [espressif/esp_lcd_ili9341](https://components.espressif.com/components/espressif/esp_lcd_ili9341) | ^1 | -| LVGL_PORT |:heavy_check_mark:| [espressif/esp_lvgl_port](https://components.espressif.com/components/espressif/esp_lvgl_port) | ^1.3 | -| TOUCH |:heavy_check_mark:|[espressif/esp_lcd_touch_ft5x06](https://components.espressif.com/components/espressif/esp_lcd_touch_ft5x06)| ^1 | -| BUTTONS | :x: | | | -| AUDIO |:heavy_check_mark:| [espressif/esp_codec_dev](https://components.espressif.com/components/espressif/esp_codec_dev) | ^1.1 | -|AUDIO_SPEAKER|:heavy_check_mark:| | | -| AUDIO_MIC |:heavy_check_mark:| | | -| SDCARD |:heavy_check_mark:| idf | >=5.0 | -| IMU | :x: | | | - - -### Capabilities and dependencies -| Capability | Available | Component |Version| -|-------------|------------------|------------------------------------------------------------------------------------------------------------|-------| -| DISPLAY |:heavy_check_mark:| [espressif/esp_lcd_ili9341](https://components.espressif.com/components/espressif/esp_lcd_ili9341) | ^1 | -| LVGL_PORT |:heavy_check_mark:| [espressif/esp_lvgl_port](https://components.espressif.com/components/espressif/esp_lvgl_port) | ^1.3 | +| LVGL_PORT |:heavy_check_mark:| [espressif/esp_lvgl_port](https://components.espressif.com/components/espressif/esp_lvgl_port) | ^2 | | TOUCH |:heavy_check_mark:|[espressif/esp_lcd_touch_ft5x06](https://components.espressif.com/components/espressif/esp_lcd_touch_ft5x06)| ^1 | | BUTTONS | :x: | | | | AUDIO |:heavy_check_mark:| [espressif/esp_codec_dev](https://components.espressif.com/components/espressif/esp_codec_dev) | ^1.1 | diff --git a/bsp/m5stack_core_s3/idf_component.yml b/bsp/m5stack_core_s3/idf_component.yml index e61b9d2dc..dfd072b7e 100644 --- a/bsp/m5stack_core_s3/idf_component.yml +++ b/bsp/m5stack_core_s3/idf_component.yml @@ -1,4 +1,4 @@ -version: "1.0.1" +version: "1.1.0" description: Board Support Package (BSP) for M5Stack CoreS3 url: https://github.com/espressif/esp-bsp/tree/master/bsp/m5stack_core_s3 @@ -14,7 +14,7 @@ dependencies: esp_lcd_touch_ft5x06: "^1" espressif/esp_lvgl_port: - version: "^1.3" + version: "^2" public: true esp_codec_dev: diff --git a/bsp/m5stack_core_s3/include/bsp/m5stack_core_s3.h b/bsp/m5stack_core_s3/include/bsp/m5stack_core_s3.h index dfddfbad9..15dc1f6fe 100644 --- a/bsp/m5stack_core_s3/include/bsp/m5stack_core_s3.h +++ b/bsp/m5stack_core_s3/include/bsp/m5stack_core_s3.h @@ -365,7 +365,7 @@ typedef struct { * * @return Pointer to LVGL display or NULL when error occured */ -lv_disp_t *bsp_display_start(void); +lv_display_t *bsp_display_start(void); /** * @brief Initialize display @@ -377,7 +377,7 @@ lv_disp_t *bsp_display_start(void); * * @return Pointer to LVGL display or NULL when error occured */ -lv_disp_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg); +lv_display_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg); /** * @brief Get pointer to input device (touch, buttons, ...) @@ -411,7 +411,7 @@ void bsp_display_unlock(void); * @param[in] disp Pointer to LVGL display * @param[in] rotation Angle of the display rotation */ -void bsp_display_rotate(lv_disp_t *disp, lv_disp_rot_t rotation); +void bsp_display_rotate(lv_display_t *disp, lv_display_rotation_t rotation); #endif // BSP_CONFIG_NO_GRAPHIC_LIB == 0 #ifdef __cplusplus diff --git a/bsp/m5stack_core_s3/m5stack_core_s3.c b/bsp/m5stack_core_s3/m5stack_core_s3.c index 9903688ff..2e5987b9c 100644 --- a/bsp/m5stack_core_s3/m5stack_core_s3.c +++ b/bsp/m5stack_core_s3/m5stack_core_s3.c @@ -23,7 +23,6 @@ #include "bsp/touch.h" #include "esp_lcd_ili9341.h" #include "esp_lcd_touch_ft5x06.h" -#include "esp_lvgl_port.h" #include "bsp_err_check.h" #include "esp_codec_dev_defaults.h" @@ -41,7 +40,7 @@ typedef enum { BSP_FEATURE_CAMERA, } bsp_feature_t; -static lv_disp_t *disp; +static lv_display_t *disp; static lv_indev_t *disp_indev = NULL; static esp_lcd_touch_handle_t tp; // LCD touch handle sdmmc_card_t *bsp_sdcard = NULL; // Global SD card handler @@ -419,7 +418,7 @@ esp_err_t bsp_touch_new(const bsp_touch_config_t *config, esp_lcd_touch_handle_t } #if (BSP_CONFIG_NO_GRAPHIC_LIB == 0) -static lv_disp_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) +static lv_display_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) { assert(cfg != NULL); esp_lcd_panel_io_handle_t io_handle = NULL; @@ -450,13 +449,16 @@ static lv_disp_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg) .flags = { .buff_dma = cfg->flags.buff_dma, .buff_spiram = cfg->flags.buff_spiram, +#if LVGL_VERSION_MAJOR >= 9 + .swap_bytes = (BSP_LCD_BIGENDIAN ? true : false), +#endif } }; return lvgl_port_add_disp(&disp_cfg); } -static lv_indev_t *bsp_display_indev_init(lv_disp_t *disp) +static lv_indev_t *bsp_display_indev_init(lv_display_t *disp) { BSP_ERROR_CHECK_RETURN_NULL(bsp_touch_new(NULL, &tp)); assert(tp); @@ -470,7 +472,7 @@ static lv_indev_t *bsp_display_indev_init(lv_disp_t *disp) return lvgl_port_add_touch(&touch_cfg); } -lv_disp_t *bsp_display_start(void) +lv_display_t *bsp_display_start(void) { bsp_display_cfg_t cfg = { .lvgl_port_cfg = ESP_LVGL_PORT_INIT_CONFIG(), @@ -484,7 +486,7 @@ lv_disp_t *bsp_display_start(void) return bsp_display_start_with_config(&cfg); } -lv_disp_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg) +lv_display_t *bsp_display_start_with_config(const bsp_display_cfg_t *cfg) { assert(cfg != NULL); BSP_ERROR_CHECK_RETURN_NULL(lvgl_port_init(&cfg->lvgl_port_cfg)); @@ -503,7 +505,7 @@ lv_indev_t *bsp_display_get_input_dev(void) return disp_indev; } -void bsp_display_rotate(lv_disp_t *disp, lv_disp_rot_t rotation) +void bsp_display_rotate(lv_display_t *disp, lv_display_rotation_t rotation) { lv_disp_set_rotation(disp, rotation); } diff --git a/components/esp_lvgl_port/CHANGELOG.md b/components/esp_lvgl_port/CHANGELOG.md index c2c54a96f..48b162bab 100644 --- a/components/esp_lvgl_port/CHANGELOG.md +++ b/components/esp_lvgl_port/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 2.2.1 + +### Fixes +- Fixed missing task.h include + ## 2.2.0 ### Features diff --git a/components/esp_lvgl_port/idf_component.yml b/components/esp_lvgl_port/idf_component.yml index b6f78e943..5b81a88f7 100644 --- a/components/esp_lvgl_port/idf_component.yml +++ b/components/esp_lvgl_port/idf_component.yml @@ -1,4 +1,4 @@ -version: "2.2.0" +version: "2.2.1" description: ESP LVGL port url: https://github.com/espressif/esp-bsp/tree/master/components/esp_lvgl_port dependencies: diff --git a/components/esp_lvgl_port/src/lvgl9/esp_lvgl_port_disp.c b/components/esp_lvgl_port/src/lvgl9/esp_lvgl_port_disp.c index 3677e09c8..66afb2547 100644 --- a/components/esp_lvgl_port/src/lvgl9/esp_lvgl_port_disp.c +++ b/components/esp_lvgl_port/src/lvgl9/esp_lvgl_port_disp.c @@ -8,6 +8,7 @@ #include "esp_err.h" #include "esp_check.h" #include "freertos/FreeRTOS.h" +#include "freertos/task.h" #include "esp_heap_caps.h" #include "esp_idf_version.h" #include "esp_lcd_panel_io.h" diff --git a/examples/audio/sdkconfig.bsp.esp32_lyrat b/examples/audio/sdkconfig.bsp.esp32_lyrat index fa7d5cf28..3a92fe3b6 100644 --- a/examples/audio/sdkconfig.bsp.esp32_lyrat +++ b/examples/audio/sdkconfig.bsp.esp32_lyrat @@ -9,9 +9,6 @@ CONFIG_SPIRAM_SPEED_80M=y CONFIG_SPIRAM_USE_MEMMAP=y CONFIG_SPIRAM_MODE_OCT=y CONFIG_SPIFFS_PAGE_SIZE=1024 -CONFIG_LV_COLOR_16_SWAP=y -CONFIG_LV_MEM_CUSTOM=y -CONFIG_LV_MEMCPY_MEMSET_STD=y CONFIG_LV_USE_PERF_MONITOR=y CONFIG_LV_SPRINTF_CUSTOM=y # CONFIG_LV_BUILD_EXAMPLES is not set diff --git a/examples/audio/sdkconfig.bsp.esp32_s2_kaluga_kit b/examples/audio/sdkconfig.bsp.esp32_s2_kaluga_kit index a5f89a4d3..06572aa83 100644 --- a/examples/audio/sdkconfig.bsp.esp32_s2_kaluga_kit +++ b/examples/audio/sdkconfig.bsp.esp32_s2_kaluga_kit @@ -4,9 +4,6 @@ CONFIG_IDF_TARGET="esp32s2" CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y CONFIG_PARTITION_TABLE_CUSTOM=y -CONFIG_LV_COLOR_16_SWAP=y -CONFIG_LV_MEM_CUSTOM=y -CONFIG_LV_MEMCPY_MEMSET_STD=y CONFIG_LV_USE_PERF_MONITOR=y CONFIG_LV_SPRINTF_CUSTOM=y # CONFIG_LV_BUILD_EXAMPLES is not set diff --git a/examples/audio/sdkconfig.bsp.esp32_s3_korvo_2 b/examples/audio/sdkconfig.bsp.esp32_s3_korvo_2 index 85b0074d1..a01b12191 100644 --- a/examples/audio/sdkconfig.bsp.esp32_s3_korvo_2 +++ b/examples/audio/sdkconfig.bsp.esp32_s3_korvo_2 @@ -9,9 +9,6 @@ CONFIG_SPIRAM_SPEED_80M=y CONFIG_SPIRAM_USE_MEMMAP=y CONFIG_SPIRAM_MODE_OCT=y CONFIG_SPIFFS_PAGE_SIZE=1024 -CONFIG_LV_COLOR_16_SWAP=y -CONFIG_LV_MEM_CUSTOM=y -CONFIG_LV_MEMCPY_MEMSET_STD=y CONFIG_LV_USE_PERF_MONITOR=y CONFIG_LV_SPRINTF_CUSTOM=y # CONFIG_LV_BUILD_EXAMPLES is not set diff --git a/examples/audio/sdkconfig.defaults b/examples/audio/sdkconfig.defaults index 85b0074d1..a01b12191 100644 --- a/examples/audio/sdkconfig.defaults +++ b/examples/audio/sdkconfig.defaults @@ -9,9 +9,6 @@ CONFIG_SPIRAM_SPEED_80M=y CONFIG_SPIRAM_USE_MEMMAP=y CONFIG_SPIRAM_MODE_OCT=y CONFIG_SPIFFS_PAGE_SIZE=1024 -CONFIG_LV_COLOR_16_SWAP=y -CONFIG_LV_MEM_CUSTOM=y -CONFIG_LV_MEMCPY_MEMSET_STD=y CONFIG_LV_USE_PERF_MONITOR=y CONFIG_LV_SPRINTF_CUSTOM=y # CONFIG_LV_BUILD_EXAMPLES is not set diff --git a/examples/display/main/CMakeLists.txt b/examples/display/main/CMakeLists.txt index e3cb23fa0..838a18b1d 100644 --- a/examples/display/main/CMakeLists.txt +++ b/examples/display/main/CMakeLists.txt @@ -1,12 +1,6 @@ idf_component_register(SRCS "display_main.c" "lvgl_demo_ui.c" INCLUDE_DIRS ".") -if(COMMAND lvgl_port_create_c_image) - lvgl_port_create_c_image("images/esp_logo.png" "images/" "ARGB8888" "NONE") - lvgl_port_create_c_image("images/esp_text.png" "images/" "ARGB8888" "NONE") - lvgl_port_add_images(${COMPONENT_LIB} "images/") -else() - file(GLOB_RECURSE IMAGE_SOURCES images/*.c) - target_sources(${COMPONENT_LIB} PRIVATE ${IMAGE_SOURCES}) - idf_build_set_property(COMPILE_OPTIONS "-DLV_LVGL_H_INCLUDE_SIMPLE=1" APPEND) -endif() +lvgl_port_create_c_image("images/esp_logo.png" "images/gen/" "ARGB8888" "NONE") +lvgl_port_create_c_image("images/esp_text.png" "images/gen/" "ARGB8888" "NONE") +lvgl_port_add_images(${COMPONENT_LIB} "images/gen/") diff --git a/examples/display/sdkconfig.bsp.esp-box b/examples/display/sdkconfig.bsp.esp-box index c48c9fae6..3ff98e29c 100644 --- a/examples/display/sdkconfig.bsp.esp-box +++ b/examples/display/sdkconfig.bsp.esp-box @@ -4,9 +4,24 @@ CONFIG_IDF_TARGET="esp32s3" CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y CONFIG_ESP_DEFAULT_CPU_FREQ_240=y +CONFIG_LV_SPRINTF_CUSTOM=y +# CONFIG_LV_BUILD_EXAMPLES is not set + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y CONFIG_LV_USE_PERF_MONITOR=y -CONFIG_LV_SPRINTF_CUSTOM=y -# CONFIG_LV_BUILD_EXAMPLES is not set diff --git a/examples/display/sdkconfig.bsp.esp-box-3 b/examples/display/sdkconfig.bsp.esp-box-3 index c48c9fae6..3ff98e29c 100644 --- a/examples/display/sdkconfig.bsp.esp-box-3 +++ b/examples/display/sdkconfig.bsp.esp-box-3 @@ -4,9 +4,24 @@ CONFIG_IDF_TARGET="esp32s3" CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y CONFIG_ESP_DEFAULT_CPU_FREQ_240=y +CONFIG_LV_SPRINTF_CUSTOM=y +# CONFIG_LV_BUILD_EXAMPLES is not set + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y CONFIG_LV_USE_PERF_MONITOR=y -CONFIG_LV_SPRINTF_CUSTOM=y -# CONFIG_LV_BUILD_EXAMPLES is not set diff --git a/examples/display/sdkconfig.bsp.esp-box-lite b/examples/display/sdkconfig.bsp.esp-box-lite index c48c9fae6..3ff98e29c 100644 --- a/examples/display/sdkconfig.bsp.esp-box-lite +++ b/examples/display/sdkconfig.bsp.esp-box-lite @@ -4,9 +4,24 @@ CONFIG_IDF_TARGET="esp32s3" CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y CONFIG_ESP_DEFAULT_CPU_FREQ_240=y +CONFIG_LV_SPRINTF_CUSTOM=y +# CONFIG_LV_BUILD_EXAMPLES is not set + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y CONFIG_LV_USE_PERF_MONITOR=y -CONFIG_LV_SPRINTF_CUSTOM=y -# CONFIG_LV_BUILD_EXAMPLES is not set diff --git a/examples/display/sdkconfig.bsp.esp32_c3_lcdkit b/examples/display/sdkconfig.bsp.esp32_c3_lcdkit index 1cdc7e7b6..0250a4acb 100644 --- a/examples/display/sdkconfig.bsp.esp32_c3_lcdkit +++ b/examples/display/sdkconfig.bsp.esp32_c3_lcdkit @@ -4,9 +4,24 @@ CONFIG_IDF_TARGET="esp32c3" CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y CONFIG_ESP_DEFAULT_CPU_FREQ_240=y +CONFIG_LV_SPRINTF_CUSTOM=y +# CONFIG_LV_BUILD_EXAMPLES is not set + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y CONFIG_LV_USE_PERF_MONITOR=y -CONFIG_LV_SPRINTF_CUSTOM=y -# CONFIG_LV_BUILD_EXAMPLES is not set diff --git a/examples/display/sdkconfig.bsp.esp32_s2_kaluga_kit b/examples/display/sdkconfig.bsp.esp32_s2_kaluga_kit index 4a4e611c5..9eb3f87ff 100644 --- a/examples/display/sdkconfig.bsp.esp32_s2_kaluga_kit +++ b/examples/display/sdkconfig.bsp.esp32_s2_kaluga_kit @@ -4,9 +4,24 @@ CONFIG_IDF_TARGET="esp32s2" CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y CONFIG_ESP_DEFAULT_CPU_FREQ_240=y +CONFIG_LV_SPRINTF_CUSTOM=y +# CONFIG_LV_BUILD_EXAMPLES is not set + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y CONFIG_LV_USE_PERF_MONITOR=y -CONFIG_LV_SPRINTF_CUSTOM=y -# CONFIG_LV_BUILD_EXAMPLES is not set diff --git a/examples/display/sdkconfig.bsp.esp32_s3_eye b/examples/display/sdkconfig.bsp.esp32_s3_eye index b780663bc..8d117a9cc 100644 --- a/examples/display/sdkconfig.bsp.esp32_s3_eye +++ b/examples/display/sdkconfig.bsp.esp32_s3_eye @@ -4,11 +4,26 @@ CONFIG_IDF_TARGET="esp32s3" CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y CONFIG_ESP_DEFAULT_CPU_FREQ_240=y -CONFIG_LV_COLOR_16_SWAP=y -CONFIG_LV_MEM_CUSTOM=y -CONFIG_LV_MEMCPY_MEMSET_STD=y -CONFIG_LV_USE_PERF_MONITOR=y CONFIG_LV_SPRINTF_CUSTOM=y CONFIG_BSP_DISPLAY_LVGL_TICK=5 CONFIG_BSP_DISPLAY_LVGL_MAX_SLEEP=500 # CONFIG_LV_BUILD_EXAMPLES is not set + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y +CONFIG_LV_COLOR_16_SWAP=y +CONFIG_LV_MEM_CUSTOM=y +CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y +CONFIG_LV_USE_PERF_MONITOR=y diff --git a/examples/display/sdkconfig.bsp.esp32_s3_korvo_2 b/examples/display/sdkconfig.bsp.esp32_s3_korvo_2 index c48c9fae6..3ff98e29c 100644 --- a/examples/display/sdkconfig.bsp.esp32_s3_korvo_2 +++ b/examples/display/sdkconfig.bsp.esp32_s3_korvo_2 @@ -4,9 +4,24 @@ CONFIG_IDF_TARGET="esp32s3" CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y CONFIG_ESP_DEFAULT_CPU_FREQ_240=y +CONFIG_LV_SPRINTF_CUSTOM=y +# CONFIG_LV_BUILD_EXAMPLES is not set + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y CONFIG_LV_USE_PERF_MONITOR=y -CONFIG_LV_SPRINTF_CUSTOM=y -# CONFIG_LV_BUILD_EXAMPLES is not set diff --git a/examples/display/sdkconfig.bsp.esp32_s3_usb_otg b/examples/display/sdkconfig.bsp.esp32_s3_usb_otg index c48c9fae6..3ff98e29c 100644 --- a/examples/display/sdkconfig.bsp.esp32_s3_usb_otg +++ b/examples/display/sdkconfig.bsp.esp32_s3_usb_otg @@ -4,9 +4,24 @@ CONFIG_IDF_TARGET="esp32s3" CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y CONFIG_ESP_DEFAULT_CPU_FREQ_240=y +CONFIG_LV_SPRINTF_CUSTOM=y +# CONFIG_LV_BUILD_EXAMPLES is not set + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y CONFIG_LV_USE_PERF_MONITOR=y -CONFIG_LV_SPRINTF_CUSTOM=y -# CONFIG_LV_BUILD_EXAMPLES is not set diff --git a/examples/display/sdkconfig.bsp.esp_wrover_kit b/examples/display/sdkconfig.bsp.esp_wrover_kit index 2ad949605..54b8794fd 100644 --- a/examples/display/sdkconfig.bsp.esp_wrover_kit +++ b/examples/display/sdkconfig.bsp.esp_wrover_kit @@ -4,9 +4,24 @@ CONFIG_IDF_TARGET="esp32" CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y CONFIG_ESP_DEFAULT_CPU_FREQ_240=y +CONFIG_LV_SPRINTF_CUSTOM=y +# CONFIG_LV_BUILD_EXAMPLES is not set + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y CONFIG_LV_USE_PERF_MONITOR=y -CONFIG_LV_SPRINTF_CUSTOM=y -# CONFIG_LV_BUILD_EXAMPLES is not set diff --git a/examples/display/sdkconfig.bsp.m5stack_core_s3 b/examples/display/sdkconfig.bsp.m5stack_core_s3 index a81a29935..978aff3fd 100644 --- a/examples/display/sdkconfig.bsp.m5stack_core_s3 +++ b/examples/display/sdkconfig.bsp.m5stack_core_s3 @@ -4,7 +4,22 @@ CONFIG_IDF_TARGET="esp32s3" CONFIG_ESPTOOLPY_FLASHMODE_QIO=y CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y CONFIG_LV_USE_PERF_MONITOR=y diff --git a/examples/display/sdkconfig.defaults b/examples/display/sdkconfig.defaults index 2ad949605..54b8794fd 100644 --- a/examples/display/sdkconfig.defaults +++ b/examples/display/sdkconfig.defaults @@ -4,9 +4,24 @@ CONFIG_IDF_TARGET="esp32" CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y CONFIG_ESP_DEFAULT_CPU_FREQ_240=y +CONFIG_LV_SPRINTF_CUSTOM=y +# CONFIG_LV_BUILD_EXAMPLES is not set + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y CONFIG_LV_USE_PERF_MONITOR=y -CONFIG_LV_SPRINTF_CUSTOM=y -# CONFIG_LV_BUILD_EXAMPLES is not set diff --git a/examples/display_audio_photo/main/app_disp_fs.c b/examples/display_audio_photo/main/app_disp_fs.c index f4930338c..7918f89f8 100644 --- a/examples/display_audio_photo/main/app_disp_fs.c +++ b/examples/display_audio_photo/main/app_disp_fs.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -112,12 +112,13 @@ void app_disp_lvgl_show(void) bsp_display_lock(0); /* Tabview */ - tabview = lv_tabview_create(lv_scr_act(), LV_DIR_TOP, 40); + tabview = lv_tabview_create(lv_scr_act()); //, LV_DIR_TOP, 40 + lv_tabview_set_tab_bar_size(tabview, 40); lv_obj_set_size(tabview, BSP_LCD_H_RES, BSP_LCD_V_RES); lv_obj_align(tabview, LV_ALIGN_BOTTOM_MID, 0, 0); lv_obj_set_style_text_font(tabview, &lv_font_montserrat_14, 0); /* Change animation time of moving between tabs */ - lv_obj_add_event_cb(lv_tabview_get_content(tabview), scroll_begin_event, LV_EVENT_SCROLL_BEGIN, NULL); + //lv_obj_add_event_cb(lv_tabview_get_content(tabview), scroll_begin_event, LV_EVENT_SCROLL_BEGIN, NULL); lv_obj_add_event_cb(tabview, tab_changed_event, LV_EVENT_VALUE_CHANGED, NULL); /* Tabview buttons style */ @@ -133,7 +134,7 @@ void app_disp_lvgl_show(void) /* Input device group */ lv_indev_t *indev = bsp_display_get_input_dev(); - if (indev && indev->driver && indev->driver->type == LV_INDEV_TYPE_ENCODER) { + if (indev && lv_indev_get_type(indev) == LV_INDEV_TYPE_ENCODER) { filesystem_group = lv_group_create(); recording_group = lv_group_create(); settings_group = lv_group_create(); @@ -226,11 +227,11 @@ static void show_window(const char *path, app_file_type_t type) struct stat st; lv_obj_t *label = NULL; lv_obj_t *btn; - lv_obj_t *win = lv_win_create(lv_scr_act(), 40); + lv_obj_t *win = lv_win_create(lv_scr_act()); //, 40 lv_win_add_title(win, path); /* Close button */ - btn = lv_win_add_btn(win, LV_SYMBOL_CLOSE, 60); + btn = lv_win_add_button(win, LV_SYMBOL_CLOSE, 60); lv_obj_add_event_cb(btn, close_window_handler, LV_EVENT_CLICKED, win); lv_obj_t *cont = lv_win_get_content(win); /*Content can be added here*/ @@ -284,7 +285,7 @@ static void show_window(const char *path, app_file_type_t type) esp_jpeg_image_output_t outimg; esp_jpeg_decode(&jpeg_cfg, &outimg); - lv_canvas_set_buffer(fs_img, file_buffer, outimg.width, outimg.height, LV_IMG_CF_TRUE_COLOR); + lv_canvas_set_buffer(fs_img, file_buffer, outimg.width, outimg.height, LV_COLOR_FORMAT_RGB565); lv_obj_center(fs_img); lv_obj_invalidate(fs_img); } @@ -304,7 +305,7 @@ static void show_window(const char *path, app_file_type_t type) /* Input device group */ lv_indev_t *indev = bsp_display_get_input_dev(); - if (indev && indev->driver && indev->driver->type == LV_INDEV_TYPE_ENCODER) { + if (indev && lv_indev_get_type(indev) == LV_INDEV_TYPE_ENCODER) { lv_group_t *group = lv_group_create(); lv_group_add_obj(group, btn); lv_indev_set_group(indev, group); @@ -465,7 +466,7 @@ static void show_window_wav(const char *path) { lv_obj_t *label; lv_obj_t *btn, *stop_btn, *repeat_btn; - lv_obj_t *win = lv_win_create(lv_scr_act(), 40); + lv_obj_t *win = lv_win_create(lv_scr_act()); //, 40 lv_win_add_title(win, path); strcpy(usb_drive_play_file, path); @@ -476,7 +477,7 @@ static void show_window_wav(const char *path) assert(audio_mux); /* Close button */ - btn = lv_win_add_btn(win, LV_SYMBOL_CLOSE, 60); + btn = lv_win_add_button(win, LV_SYMBOL_CLOSE, 60); lv_obj_add_event_cb(btn, close_window_wav_handler, LV_EVENT_CLICKED, win); lv_obj_t *cont = lv_win_get_content(win); /*Content can be added here*/ @@ -533,7 +534,7 @@ static void show_window_wav(const char *path) /* Input device group */ lv_indev_t *indev = bsp_display_get_input_dev(); - if (indev && indev->driver && indev->driver->type == LV_INDEV_TYPE_ENCODER) { + if (indev && lv_indev_get_type(indev) == LV_INDEV_TYPE_ENCODER) { lv_group_t *group = lv_group_create(); lv_group_add_obj(group, btn); lv_group_add_obj(group, play_btn); @@ -677,6 +678,8 @@ static void app_disp_lvgl_show_files(const char *path) struct dirent *dir; DIR *d; + bsp_display_lock(0); + /* Clean all items in the list */ lv_obj_clean(fs_list); @@ -702,6 +705,8 @@ static void app_disp_lvgl_show_files(const char *path) closedir(d); } + + bsp_display_unlock(); } static void app_disp_lvgl_show_filesystem(lv_obj_t *screen, lv_group_t *group) @@ -986,7 +991,7 @@ static void scroll_begin_event(lv_event_t *e) if (lv_event_get_code(e) == LV_EVENT_SCROLL_BEGIN) { lv_anim_t *a = lv_event_get_param(e); if (a) { - a->time = 300; + lv_anim_set_duration(a, 300); } } } diff --git a/examples/display_audio_photo/main/idf_component.yml b/examples/display_audio_photo/main/idf_component.yml index 6f55073e4..fc28d2928 100644 --- a/examples/display_audio_photo/main/idf_component.yml +++ b/examples/display_audio_photo/main/idf_component.yml @@ -2,5 +2,5 @@ description: BSP Display Audio Photo Example dependencies: esp_jpeg: "*" esp-box: - version: ">=3.0.0" + version: "*" override_path: "../../../bsp/esp-box" diff --git a/examples/display_audio_photo/sdkconfig.bsp.esp-box b/examples/display_audio_photo/sdkconfig.bsp.esp-box index 89fdc4146..9f4a5db40 100644 --- a/examples/display_audio_photo/sdkconfig.bsp.esp-box +++ b/examples/display_audio_photo/sdkconfig.bsp.esp-box @@ -10,9 +10,24 @@ CONFIG_SPIRAM_MODE_OCT=y CONFIG_SPIRAM_SPEED_80M=y CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y CONFIG_SPIFFS_PAGE_SIZE=1024 +CONFIG_LV_SPRINTF_CUSTOM=y +# CONFIG_LV_BUILD_EXAMPLES is not set + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y CONFIG_LV_USE_PERF_MONITOR=y -CONFIG_LV_SPRINTF_CUSTOM=y -# CONFIG_LV_BUILD_EXAMPLES is not set diff --git a/examples/display_audio_photo/sdkconfig.bsp.esp-box-3 b/examples/display_audio_photo/sdkconfig.bsp.esp-box-3 index 89fdc4146..9f4a5db40 100644 --- a/examples/display_audio_photo/sdkconfig.bsp.esp-box-3 +++ b/examples/display_audio_photo/sdkconfig.bsp.esp-box-3 @@ -10,9 +10,24 @@ CONFIG_SPIRAM_MODE_OCT=y CONFIG_SPIRAM_SPEED_80M=y CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y CONFIG_SPIFFS_PAGE_SIZE=1024 +CONFIG_LV_SPRINTF_CUSTOM=y +# CONFIG_LV_BUILD_EXAMPLES is not set + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y CONFIG_LV_USE_PERF_MONITOR=y -CONFIG_LV_SPRINTF_CUSTOM=y -# CONFIG_LV_BUILD_EXAMPLES is not set diff --git a/examples/display_audio_photo/sdkconfig.bsp.esp-box-lite b/examples/display_audio_photo/sdkconfig.bsp.esp-box-lite index 89fdc4146..9f4a5db40 100644 --- a/examples/display_audio_photo/sdkconfig.bsp.esp-box-lite +++ b/examples/display_audio_photo/sdkconfig.bsp.esp-box-lite @@ -10,9 +10,24 @@ CONFIG_SPIRAM_MODE_OCT=y CONFIG_SPIRAM_SPEED_80M=y CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y CONFIG_SPIFFS_PAGE_SIZE=1024 +CONFIG_LV_SPRINTF_CUSTOM=y +# CONFIG_LV_BUILD_EXAMPLES is not set + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y CONFIG_LV_USE_PERF_MONITOR=y -CONFIG_LV_SPRINTF_CUSTOM=y -# CONFIG_LV_BUILD_EXAMPLES is not set diff --git a/examples/display_audio_photo/sdkconfig.bsp.esp32_s3_korvo_2 b/examples/display_audio_photo/sdkconfig.bsp.esp32_s3_korvo_2 index 89fdc4146..9f4a5db40 100644 --- a/examples/display_audio_photo/sdkconfig.bsp.esp32_s3_korvo_2 +++ b/examples/display_audio_photo/sdkconfig.bsp.esp32_s3_korvo_2 @@ -10,9 +10,24 @@ CONFIG_SPIRAM_MODE_OCT=y CONFIG_SPIRAM_SPEED_80M=y CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y CONFIG_SPIFFS_PAGE_SIZE=1024 +CONFIG_LV_SPRINTF_CUSTOM=y +# CONFIG_LV_BUILD_EXAMPLES is not set + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y CONFIG_LV_USE_PERF_MONITOR=y -CONFIG_LV_SPRINTF_CUSTOM=y -# CONFIG_LV_BUILD_EXAMPLES is not set diff --git a/examples/display_audio_photo/sdkconfig.bsp.esp32_s3_lcd_ev_board b/examples/display_audio_photo/sdkconfig.bsp.esp32_s3_lcd_ev_board new file mode 100644 index 000000000..e54db7072 --- /dev/null +++ b/examples/display_audio_photo/sdkconfig.bsp.esp32_s3_lcd_ev_board @@ -0,0 +1,42 @@ +# This file was generated using idf.py save-defconfig. It can be edited manually. +# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration +# +CONFIG_IDF_TARGET="esp32s3" +CONFIG_ESPTOOLPY_FLASHMODE_QIO=y +CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y +CONFIG_PARTITION_TABLE_CUSTOM=y +CONFIG_COMPILER_OPTIMIZATION_PERF=y +CONFIG_SPIRAM=y +CONFIG_SPIRAM_MODE_OCT=y +CONFIG_SPIRAM_FETCH_INSTRUCTIONS=y +CONFIG_SPIRAM_RODATA=y +CONFIG_SPIRAM_SPEED_80M=y +CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y +CONFIG_ESP32S3_DATA_CACHE_LINE_64B=y +CONFIG_FREERTOS_HZ=1000 +CONFIG_BSP_LCD_RGB_BUFFER_NUMS=2 +CONFIG_BSP_LCD_RGB_BOUNCE_BUFFER_MODE=y +CONFIG_BSP_LCD_RGB_BOUNCE_BUFFER_HEIGHT=20 +CONFIG_BSP_DISPLAY_LVGL_TASK_STACK_SIZE=8 +CONFIG_BSP_DISPLAY_LVGL_AVOID_TEAR=y +CONFIG_BSP_DISPLAY_LVGL_DIRECT_MODE=y +CONFIG_LV_ATTRIBUTE_FAST_MEM_USE_IRAM=y + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y +CONFIG_LV_COLOR_16_SWAP=y +CONFIG_LV_MEM_CUSTOM=y +CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y +CONFIG_LV_USE_PERF_MONITOR=y diff --git a/examples/display_audio_photo/sdkconfig.bsp.m5stack_core_s3 b/examples/display_audio_photo/sdkconfig.bsp.m5stack_core_s3 index 4e8064c11..9b5ac84ed 100644 --- a/examples/display_audio_photo/sdkconfig.bsp.m5stack_core_s3 +++ b/examples/display_audio_photo/sdkconfig.bsp.m5stack_core_s3 @@ -9,9 +9,24 @@ CONFIG_SPIRAM=y CONFIG_SPIRAM_SPEED_80M=y CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y CONFIG_SPIFFS_PAGE_SIZE=1024 +CONFIG_LV_SPRINTF_CUSTOM=y +# CONFIG_LV_BUILD_EXAMPLES is not set + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y CONFIG_LV_USE_PERF_MONITOR=y -CONFIG_LV_SPRINTF_CUSTOM=y -# CONFIG_LV_BUILD_EXAMPLES is not set diff --git a/examples/display_audio_photo/sdkconfig.defaults b/examples/display_audio_photo/sdkconfig.defaults index 89fdc4146..9f4a5db40 100644 --- a/examples/display_audio_photo/sdkconfig.defaults +++ b/examples/display_audio_photo/sdkconfig.defaults @@ -10,9 +10,24 @@ CONFIG_SPIRAM_MODE_OCT=y CONFIG_SPIRAM_SPEED_80M=y CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y CONFIG_SPIFFS_PAGE_SIZE=1024 +CONFIG_LV_SPRINTF_CUSTOM=y +# CONFIG_LV_BUILD_EXAMPLES is not set + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y CONFIG_LV_USE_PERF_MONITOR=y -CONFIG_LV_SPRINTF_CUSTOM=y -# CONFIG_LV_BUILD_EXAMPLES is not set diff --git a/examples/display_camera/main/display_camera.c b/examples/display_camera/main/display_camera.c index 50570a793..067f81eaf 100644 --- a/examples/display_camera/main/display_camera.c +++ b/examples/display_camera/main/display_camera.c @@ -49,7 +49,7 @@ void app_main(void) pic = esp_camera_fb_get(); if (pic) { bsp_display_lock(0); - lv_canvas_set_buffer(camera_canvas, pic->buf, pic->width, pic->height, LV_IMG_CF_TRUE_COLOR); + lv_canvas_set_buffer(camera_canvas, pic->buf, pic->width, pic->height, LV_COLOR_FORMAT_RGB565); bsp_display_unlock(); esp_camera_fb_return(pic); } else { diff --git a/examples/display_camera/sdkconfig.bsp.esp32_s2_kaluga_kit b/examples/display_camera/sdkconfig.bsp.esp32_s2_kaluga_kit index d14403491..a928bf8d8 100644 --- a/examples/display_camera/sdkconfig.bsp.esp32_s2_kaluga_kit +++ b/examples/display_camera/sdkconfig.bsp.esp32_s2_kaluga_kit @@ -9,6 +9,23 @@ CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=8192 CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y +# CONFIG_LV_BUILD_EXAMPLES is not set + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y +CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y -# CONFIG_LV_BUILD_EXAMPLES is not set + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y +CONFIG_LV_USE_PERF_MONITOR=y diff --git a/examples/display_camera/sdkconfig.bsp.esp32_s3_eye b/examples/display_camera/sdkconfig.bsp.esp32_s3_eye index 1dbdec8e4..802982842 100644 --- a/examples/display_camera/sdkconfig.bsp.esp32_s3_eye +++ b/examples/display_camera/sdkconfig.bsp.esp32_s3_eye @@ -15,9 +15,24 @@ CONFIG_SPIRAM_SPEED_80M=y CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=8192 CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y +CONFIG_LV_SPRINTF_CUSTOM=y +# CONFIG_LV_BUILD_EXAMPLES is not set + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y CONFIG_LV_USE_PERF_MONITOR=y -CONFIG_LV_SPRINTF_CUSTOM=y -# CONFIG_LV_BUILD_EXAMPLES is not set diff --git a/examples/display_camera/sdkconfig.bsp.esp32_s3_korvo_2 b/examples/display_camera/sdkconfig.bsp.esp32_s3_korvo_2 index ec2fa94cf..5d4badb52 100644 --- a/examples/display_camera/sdkconfig.bsp.esp32_s3_korvo_2 +++ b/examples/display_camera/sdkconfig.bsp.esp32_s3_korvo_2 @@ -12,9 +12,24 @@ CONFIG_SPIRAM_SPEED_80M=y CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=8192 CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y +CONFIG_LV_SPRINTF_CUSTOM=y +# CONFIG_LV_BUILD_EXAMPLES is not set + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y CONFIG_LV_USE_PERF_MONITOR=y -CONFIG_LV_SPRINTF_CUSTOM=y -# CONFIG_LV_BUILD_EXAMPLES is not set \ No newline at end of file diff --git a/examples/display_camera/sdkconfig.bsp.m5stack_core_s3 b/examples/display_camera/sdkconfig.bsp.m5stack_core_s3 index 76f3de7be..7f148f378 100644 --- a/examples/display_camera/sdkconfig.bsp.m5stack_core_s3 +++ b/examples/display_camera/sdkconfig.bsp.m5stack_core_s3 @@ -12,9 +12,24 @@ CONFIG_SPIRAM_SPEED_80M=y CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=8192 CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y +CONFIG_LV_SPRINTF_CUSTOM=y +# CONFIG_LV_BUILD_EXAMPLES is not set + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y CONFIG_LV_USE_PERF_MONITOR=y -CONFIG_LV_SPRINTF_CUSTOM=y -# CONFIG_LV_BUILD_EXAMPLES is not set diff --git a/examples/display_camera/sdkconfig.defaults b/examples/display_camera/sdkconfig.defaults index d14403491..a928bf8d8 100644 --- a/examples/display_camera/sdkconfig.defaults +++ b/examples/display_camera/sdkconfig.defaults @@ -9,6 +9,23 @@ CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=8192 CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y +# CONFIG_LV_BUILD_EXAMPLES is not set + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y +CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y -# CONFIG_LV_BUILD_EXAMPLES is not set + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y +CONFIG_LV_USE_PERF_MONITOR=y diff --git a/examples/display_lvgl_demos/sdkconfig.bsp.esp-box b/examples/display_lvgl_demos/sdkconfig.bsp.esp-box index 15d99b183..c3be3a320 100644 --- a/examples/display_lvgl_demos/sdkconfig.bsp.esp-box +++ b/examples/display_lvgl_demos/sdkconfig.bsp.esp-box @@ -4,6 +4,7 @@ CONFIG_IDF_TARGET="esp32s3" CONFIG_ESPTOOLPY_FLASHMODE_QIO=y CONFIG_COMPILER_OPTIMIZATION_PERF=y +CONFIG_PARTITION_TABLE_CUSTOM=y CONFIG_SPIRAM=y CONFIG_SPIRAM_MODE_OCT=y CONFIG_SPIRAM_FETCH_INSTRUCTIONS=y @@ -11,10 +12,7 @@ CONFIG_SPIRAM_RODATA=y CONFIG_SPIRAM_SPEED_80M=y CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y CONFIG_FREERTOS_HZ=1000 -CONFIG_LV_COLOR_16_SWAP=y -CONFIG_LV_MEM_CUSTOM=y -CONFIG_LV_MEMCPY_MEMSET_STD=y -CONFIG_LV_USE_PERF_MONITOR=y +CONFIG_LV_MEM_SIZE_KILOBYTES=48 CONFIG_LV_ATTRIBUTE_FAST_MEM_USE_IRAM=y CONFIG_LV_FONT_MONTSERRAT_12=y CONFIG_LV_FONT_MONTSERRAT_16=y @@ -23,3 +21,22 @@ CONFIG_LV_USE_DEMO_BENCHMARK=y CONFIG_LV_USE_DEMO_STRESS=y CONFIG_LV_USE_DEMO_MUSIC=y CONFIG_LV_DEMO_MUSIC_AUTO_PLAY=y + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y +CONFIG_LV_COLOR_16_SWAP=y +CONFIG_LV_MEM_CUSTOM=y +CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y +CONFIG_LV_USE_PERF_MONITOR=y diff --git a/examples/display_lvgl_demos/sdkconfig.bsp.esp-box-3 b/examples/display_lvgl_demos/sdkconfig.bsp.esp-box-3 index 15d99b183..c3be3a320 100644 --- a/examples/display_lvgl_demos/sdkconfig.bsp.esp-box-3 +++ b/examples/display_lvgl_demos/sdkconfig.bsp.esp-box-3 @@ -4,6 +4,7 @@ CONFIG_IDF_TARGET="esp32s3" CONFIG_ESPTOOLPY_FLASHMODE_QIO=y CONFIG_COMPILER_OPTIMIZATION_PERF=y +CONFIG_PARTITION_TABLE_CUSTOM=y CONFIG_SPIRAM=y CONFIG_SPIRAM_MODE_OCT=y CONFIG_SPIRAM_FETCH_INSTRUCTIONS=y @@ -11,10 +12,7 @@ CONFIG_SPIRAM_RODATA=y CONFIG_SPIRAM_SPEED_80M=y CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y CONFIG_FREERTOS_HZ=1000 -CONFIG_LV_COLOR_16_SWAP=y -CONFIG_LV_MEM_CUSTOM=y -CONFIG_LV_MEMCPY_MEMSET_STD=y -CONFIG_LV_USE_PERF_MONITOR=y +CONFIG_LV_MEM_SIZE_KILOBYTES=48 CONFIG_LV_ATTRIBUTE_FAST_MEM_USE_IRAM=y CONFIG_LV_FONT_MONTSERRAT_12=y CONFIG_LV_FONT_MONTSERRAT_16=y @@ -23,3 +21,22 @@ CONFIG_LV_USE_DEMO_BENCHMARK=y CONFIG_LV_USE_DEMO_STRESS=y CONFIG_LV_USE_DEMO_MUSIC=y CONFIG_LV_DEMO_MUSIC_AUTO_PLAY=y + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y +CONFIG_LV_COLOR_16_SWAP=y +CONFIG_LV_MEM_CUSTOM=y +CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y +CONFIG_LV_USE_PERF_MONITOR=y diff --git a/examples/display_lvgl_demos/sdkconfig.bsp.esp-box-lite b/examples/display_lvgl_demos/sdkconfig.bsp.esp-box-lite index 15d99b183..c3be3a320 100644 --- a/examples/display_lvgl_demos/sdkconfig.bsp.esp-box-lite +++ b/examples/display_lvgl_demos/sdkconfig.bsp.esp-box-lite @@ -4,6 +4,7 @@ CONFIG_IDF_TARGET="esp32s3" CONFIG_ESPTOOLPY_FLASHMODE_QIO=y CONFIG_COMPILER_OPTIMIZATION_PERF=y +CONFIG_PARTITION_TABLE_CUSTOM=y CONFIG_SPIRAM=y CONFIG_SPIRAM_MODE_OCT=y CONFIG_SPIRAM_FETCH_INSTRUCTIONS=y @@ -11,10 +12,7 @@ CONFIG_SPIRAM_RODATA=y CONFIG_SPIRAM_SPEED_80M=y CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y CONFIG_FREERTOS_HZ=1000 -CONFIG_LV_COLOR_16_SWAP=y -CONFIG_LV_MEM_CUSTOM=y -CONFIG_LV_MEMCPY_MEMSET_STD=y -CONFIG_LV_USE_PERF_MONITOR=y +CONFIG_LV_MEM_SIZE_KILOBYTES=48 CONFIG_LV_ATTRIBUTE_FAST_MEM_USE_IRAM=y CONFIG_LV_FONT_MONTSERRAT_12=y CONFIG_LV_FONT_MONTSERRAT_16=y @@ -23,3 +21,22 @@ CONFIG_LV_USE_DEMO_BENCHMARK=y CONFIG_LV_USE_DEMO_STRESS=y CONFIG_LV_USE_DEMO_MUSIC=y CONFIG_LV_DEMO_MUSIC_AUTO_PLAY=y + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y +CONFIG_LV_COLOR_16_SWAP=y +CONFIG_LV_MEM_CUSTOM=y +CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y +CONFIG_LV_USE_PERF_MONITOR=y diff --git a/examples/display_lvgl_demos/sdkconfig.bsp.esp32_s2_kaluga_kit b/examples/display_lvgl_demos/sdkconfig.bsp.esp32_s2_kaluga_kit index 681443bcd..9e3ba7523 100644 --- a/examples/display_lvgl_demos/sdkconfig.bsp.esp32_s2_kaluga_kit +++ b/examples/display_lvgl_demos/sdkconfig.bsp.esp32_s2_kaluga_kit @@ -4,16 +4,14 @@ CONFIG_IDF_TARGET="esp32s2" CONFIG_ESPTOOLPY_FLASHMODE_QIO=y CONFIG_COMPILER_OPTIMIZATION_PERF=y +CONFIG_PARTITION_TABLE_CUSTOM=y CONFIG_SPIRAM=y CONFIG_SPIRAM_FETCH_INSTRUCTIONS=y CONFIG_SPIRAM_RODATA=y CONFIG_SPIRAM_SPEED_80M=y CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y CONFIG_FREERTOS_HZ=1000 -CONFIG_LV_COLOR_16_SWAP=y -CONFIG_LV_MEM_CUSTOM=y -CONFIG_LV_MEMCPY_MEMSET_STD=y -CONFIG_LV_USE_PERF_MONITOR=y +CONFIG_LV_MEM_SIZE_KILOBYTES=48 CONFIG_LV_ATTRIBUTE_FAST_MEM_USE_IRAM=y CONFIG_LV_FONT_MONTSERRAT_12=y CONFIG_LV_FONT_MONTSERRAT_16=y @@ -22,3 +20,22 @@ CONFIG_LV_USE_DEMO_BENCHMARK=y CONFIG_LV_USE_DEMO_STRESS=y CONFIG_LV_USE_DEMO_MUSIC=y CONFIG_LV_DEMO_MUSIC_AUTO_PLAY=y + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y +CONFIG_LV_COLOR_16_SWAP=y +CONFIG_LV_MEM_CUSTOM=y +CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y +CONFIG_LV_USE_PERF_MONITOR=y diff --git a/examples/display_lvgl_demos/sdkconfig.bsp.esp32_s3_eye b/examples/display_lvgl_demos/sdkconfig.bsp.esp32_s3_eye index 15d99b183..c3be3a320 100644 --- a/examples/display_lvgl_demos/sdkconfig.bsp.esp32_s3_eye +++ b/examples/display_lvgl_demos/sdkconfig.bsp.esp32_s3_eye @@ -4,6 +4,7 @@ CONFIG_IDF_TARGET="esp32s3" CONFIG_ESPTOOLPY_FLASHMODE_QIO=y CONFIG_COMPILER_OPTIMIZATION_PERF=y +CONFIG_PARTITION_TABLE_CUSTOM=y CONFIG_SPIRAM=y CONFIG_SPIRAM_MODE_OCT=y CONFIG_SPIRAM_FETCH_INSTRUCTIONS=y @@ -11,10 +12,7 @@ CONFIG_SPIRAM_RODATA=y CONFIG_SPIRAM_SPEED_80M=y CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y CONFIG_FREERTOS_HZ=1000 -CONFIG_LV_COLOR_16_SWAP=y -CONFIG_LV_MEM_CUSTOM=y -CONFIG_LV_MEMCPY_MEMSET_STD=y -CONFIG_LV_USE_PERF_MONITOR=y +CONFIG_LV_MEM_SIZE_KILOBYTES=48 CONFIG_LV_ATTRIBUTE_FAST_MEM_USE_IRAM=y CONFIG_LV_FONT_MONTSERRAT_12=y CONFIG_LV_FONT_MONTSERRAT_16=y @@ -23,3 +21,22 @@ CONFIG_LV_USE_DEMO_BENCHMARK=y CONFIG_LV_USE_DEMO_STRESS=y CONFIG_LV_USE_DEMO_MUSIC=y CONFIG_LV_DEMO_MUSIC_AUTO_PLAY=y + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y +CONFIG_LV_COLOR_16_SWAP=y +CONFIG_LV_MEM_CUSTOM=y +CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y +CONFIG_LV_USE_PERF_MONITOR=y diff --git a/examples/display_lvgl_demos/sdkconfig.bsp.esp32_s3_korvo_2 b/examples/display_lvgl_demos/sdkconfig.bsp.esp32_s3_korvo_2 index 15d99b183..c3be3a320 100644 --- a/examples/display_lvgl_demos/sdkconfig.bsp.esp32_s3_korvo_2 +++ b/examples/display_lvgl_demos/sdkconfig.bsp.esp32_s3_korvo_2 @@ -4,6 +4,7 @@ CONFIG_IDF_TARGET="esp32s3" CONFIG_ESPTOOLPY_FLASHMODE_QIO=y CONFIG_COMPILER_OPTIMIZATION_PERF=y +CONFIG_PARTITION_TABLE_CUSTOM=y CONFIG_SPIRAM=y CONFIG_SPIRAM_MODE_OCT=y CONFIG_SPIRAM_FETCH_INSTRUCTIONS=y @@ -11,10 +12,7 @@ CONFIG_SPIRAM_RODATA=y CONFIG_SPIRAM_SPEED_80M=y CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y CONFIG_FREERTOS_HZ=1000 -CONFIG_LV_COLOR_16_SWAP=y -CONFIG_LV_MEM_CUSTOM=y -CONFIG_LV_MEMCPY_MEMSET_STD=y -CONFIG_LV_USE_PERF_MONITOR=y +CONFIG_LV_MEM_SIZE_KILOBYTES=48 CONFIG_LV_ATTRIBUTE_FAST_MEM_USE_IRAM=y CONFIG_LV_FONT_MONTSERRAT_12=y CONFIG_LV_FONT_MONTSERRAT_16=y @@ -23,3 +21,22 @@ CONFIG_LV_USE_DEMO_BENCHMARK=y CONFIG_LV_USE_DEMO_STRESS=y CONFIG_LV_USE_DEMO_MUSIC=y CONFIG_LV_DEMO_MUSIC_AUTO_PLAY=y + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y +CONFIG_LV_COLOR_16_SWAP=y +CONFIG_LV_MEM_CUSTOM=y +CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y +CONFIG_LV_USE_PERF_MONITOR=y diff --git a/examples/display_lvgl_demos/sdkconfig.defaults b/examples/display_lvgl_demos/sdkconfig.defaults index 91bd01473..bc27b6d8d 100644 --- a/examples/display_lvgl_demos/sdkconfig.defaults +++ b/examples/display_lvgl_demos/sdkconfig.defaults @@ -4,6 +4,7 @@ CONFIG_IDF_TARGET="esp32s3" CONFIG_ESPTOOLPY_FLASHMODE_QIO=y CONFIG_COMPILER_OPTIMIZATION_PERF=y +CONFIG_PARTITION_TABLE_CUSTOM=y CONFIG_SPIRAM=y CONFIG_SPIRAM_MODE_OCT=y CONFIG_SPIRAM_FETCH_INSTRUCTIONS=y @@ -16,8 +17,7 @@ CONFIG_BSP_LCD_RGB_BUFFER_NUMS=2 CONFIG_BSP_LCD_RGB_BOUNCE_BUFFER_MODE=y CONFIG_BSP_DISPLAY_LVGL_AVOID_TEAR=y CONFIG_BSP_DISPLAY_LVGL_DIRECT_MODE=y -CONFIG_LV_MEM_CUSTOM=y -CONFIG_LV_MEMCPY_MEMSET_STD=y +CONFIG_LV_MEM_SIZE_KILOBYTES=48 CONFIG_LV_USE_PERF_MONITOR=y CONFIG_LV_ATTRIBUTE_FAST_MEM_USE_IRAM=y CONFIG_LV_FONT_MONTSERRAT_12=y diff --git a/examples/display_rotation/main/CMakeLists.txt b/examples/display_rotation/main/CMakeLists.txt index d1e80f216..914c3a10d 100644 --- a/examples/display_rotation/main/CMakeLists.txt +++ b/examples/display_rotation/main/CMakeLists.txt @@ -1,11 +1,5 @@ idf_component_register(SRCS "main.c" INCLUDE_DIRS ".") -if(COMMAND lvgl_port_create_c_image) - lvgl_port_create_c_image("images/esp_logo.png" "images/" "ARGB8888" "NONE") - lvgl_port_add_images(${COMPONENT_LIB} "images/") -else() - file(GLOB_RECURSE IMAGE_SOURCES images/*.c) - target_sources(${COMPONENT_LIB} PRIVATE ${IMAGE_SOURCES}) - idf_build_set_property(COMPILE_OPTIONS "-DLV_LVGL_H_INCLUDE_SIMPLE=1" APPEND) -endif() +lvgl_port_create_c_image("images/esp_logo.png" "images/gen/" "ARGB8888" "NONE") +lvgl_port_add_images(${COMPONENT_LIB} "images/gen/") diff --git a/examples/display_rotation/main/idf_component.yml b/examples/display_rotation/main/idf_component.yml index 621521bc7..2f5161392 100644 --- a/examples/display_rotation/main/idf_component.yml +++ b/examples/display_rotation/main/idf_component.yml @@ -1,5 +1,5 @@ description: BSP Display rotation example dependencies: - esp-box: + m5stack_core_s3: version: "*" - override_path: "../../../bsp/esp-box" + override_path: "../../../bsp/m5stack_core_s3" diff --git a/examples/display_rotation/main/main.c b/examples/display_rotation/main/main.c index b5da5437f..51e410479 100644 --- a/examples/display_rotation/main/main.c +++ b/examples/display_rotation/main/main.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: CC0-1.0 */ @@ -18,7 +18,7 @@ LV_IMG_DECLARE(esp_logo) static lv_disp_t *display; static lv_obj_t *lbl_rotation; -static lv_disp_rot_t rotation = LV_DISP_ROT_NONE; +static lv_disp_rotation_t rotation = LV_DISPLAY_ROTATION_0; #if BSP_CAPS_IMU static icm42670_handle_t imu = NULL; #endif @@ -28,16 +28,16 @@ static icm42670_handle_t imu = NULL; * Private functions *******************************************************************************/ -static uint16_t app_lvgl_get_rotation_degrees(lv_disp_rot_t rotation) +static uint16_t app_lvgl_get_rotation_degrees(lv_disp_rotation_t rotation) { switch (rotation) { - case LV_DISP_ROT_NONE: + case LV_DISPLAY_ROTATION_0: return 0; - case LV_DISP_ROT_90: + case LV_DISPLAY_ROTATION_90: return 90; - case LV_DISP_ROT_180: + case LV_DISPLAY_ROTATION_180: return 180; - case LV_DISP_ROT_270: + case LV_DISPLAY_ROTATION_270: return 270; } @@ -46,8 +46,8 @@ static uint16_t app_lvgl_get_rotation_degrees(lv_disp_rot_t rotation) static void app_lvgl_btn_right_cb(lv_event_t *e) { - if (rotation == LV_DISP_ROT_270) { - rotation = LV_DISP_ROT_NONE; + if (rotation == LV_DISPLAY_ROTATION_270) { + rotation = LV_DISPLAY_ROTATION_0; } else { rotation++; } @@ -62,8 +62,8 @@ static void app_lvgl_btn_right_cb(lv_event_t *e) static void app_lvgl_btn_left_cb(lv_event_t *e) { - if (rotation == LV_DISP_ROT_NONE) { - rotation = LV_DISP_ROT_270; + if (rotation == LV_DISPLAY_ROTATION_0) { + rotation = LV_DISPLAY_ROTATION_270; } else { rotation--; } @@ -125,7 +125,7 @@ static void app_lvgl_display(void) /* Input device group */ lv_indev_t *indev = bsp_display_get_input_dev(); - if (indev && indev->driver && indev->driver->type == LV_INDEV_TYPE_ENCODER) { + if (indev && lv_indev_get_type(indev) == LV_INDEV_TYPE_ENCODER) { lv_group_t *main_group = lv_group_create(); lv_group_add_obj(main_group, btn_left); lv_group_add_obj(main_group, btn_right); @@ -176,32 +176,32 @@ static void app_imu_read(void) ESP_LOGI(TAG, "Angle roll: %.2f pitch: %.2f ", angle.roll, angle.pitch); if (acce_val.x > 5) { - if (rotation != LV_DISP_ROT_NONE) { - rotation = LV_DISP_ROT_NONE; + if (rotation != LV_DISPLAY_ROTATION_0) { + rotation = LV_DISPLAY_ROTATION_0; bsp_display_lock(0); bsp_display_rotate(display, rotation); lv_label_set_text_fmt(lbl_rotation, "Rotation %d°", app_lvgl_get_rotation_degrees(rotation)); bsp_display_unlock(); } } else if (acce_val.x < -5) { - if (rotation != LV_DISP_ROT_180) { - rotation = LV_DISP_ROT_180; + if (rotation != LV_DISPLAY_ROTATION_180) { + rotation = LV_DISPLAY_ROTATION_180; bsp_display_lock(0); bsp_display_rotate(display, rotation); lv_label_set_text_fmt(lbl_rotation, "Rotation %d°", app_lvgl_get_rotation_degrees(rotation)); bsp_display_unlock(); } } else if (acce_val.y > 5) { - if (rotation != LV_DISP_ROT_270) { - rotation = LV_DISP_ROT_270; + if (rotation != LV_DISPLAY_ROTATION_270) { + rotation = LV_DISPLAY_ROTATION_270; bsp_display_lock(0); bsp_display_rotate(display, rotation); lv_label_set_text_fmt(lbl_rotation, "Rotation %d°", app_lvgl_get_rotation_degrees(rotation)); bsp_display_unlock(); } } else if (acce_val.y < -5) { - if (rotation != LV_DISP_ROT_90) { - rotation = LV_DISP_ROT_90; + if (rotation != LV_DISPLAY_ROTATION_90) { + rotation = LV_DISPLAY_ROTATION_90; bsp_display_lock(0); bsp_display_rotate(display, rotation); lv_label_set_text_fmt(lbl_rotation, "Rotation %d°", app_lvgl_get_rotation_degrees(rotation)); @@ -214,9 +214,6 @@ static void app_imu_read(void) void app_main(void) { - /* Initialize I2C (for touch and audio) */ - bsp_i2c_init(); - /* Initialize display and LVGL */ display = bsp_display_start(); diff --git a/examples/display_rotation/sdkconfig.bsp.esp-box b/examples/display_rotation/sdkconfig.bsp.esp-box index b9cf09db2..c862604df 100644 --- a/examples/display_rotation/sdkconfig.bsp.esp-box +++ b/examples/display_rotation/sdkconfig.bsp.esp-box @@ -2,8 +2,23 @@ # Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration # CONFIG_IDF_TARGET="esp32s3" +# CONFIG_LV_BUILD_EXAMPLES is not set + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y CONFIG_LV_USE_PERF_MONITOR=y -# CONFIG_LV_BUILD_EXAMPLES is not set diff --git a/examples/display_rotation/sdkconfig.bsp.esp-box-3 b/examples/display_rotation/sdkconfig.bsp.esp-box-3 index b9cf09db2..c862604df 100644 --- a/examples/display_rotation/sdkconfig.bsp.esp-box-3 +++ b/examples/display_rotation/sdkconfig.bsp.esp-box-3 @@ -2,8 +2,23 @@ # Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration # CONFIG_IDF_TARGET="esp32s3" +# CONFIG_LV_BUILD_EXAMPLES is not set + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y CONFIG_LV_USE_PERF_MONITOR=y -# CONFIG_LV_BUILD_EXAMPLES is not set diff --git a/examples/display_rotation/sdkconfig.bsp.esp-box-lite b/examples/display_rotation/sdkconfig.bsp.esp-box-lite index b9cf09db2..c862604df 100644 --- a/examples/display_rotation/sdkconfig.bsp.esp-box-lite +++ b/examples/display_rotation/sdkconfig.bsp.esp-box-lite @@ -2,8 +2,23 @@ # Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration # CONFIG_IDF_TARGET="esp32s3" +# CONFIG_LV_BUILD_EXAMPLES is not set + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y CONFIG_LV_USE_PERF_MONITOR=y -# CONFIG_LV_BUILD_EXAMPLES is not set diff --git a/examples/display_rotation/sdkconfig.bsp.esp32_s3_korvo_2 b/examples/display_rotation/sdkconfig.bsp.esp32_s3_korvo_2 index b9cf09db2..c862604df 100644 --- a/examples/display_rotation/sdkconfig.bsp.esp32_s3_korvo_2 +++ b/examples/display_rotation/sdkconfig.bsp.esp32_s3_korvo_2 @@ -2,8 +2,23 @@ # Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration # CONFIG_IDF_TARGET="esp32s3" +# CONFIG_LV_BUILD_EXAMPLES is not set + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y CONFIG_LV_USE_PERF_MONITOR=y -# CONFIG_LV_BUILD_EXAMPLES is not set diff --git a/examples/display_rotation/sdkconfig.bsp.esp32_s3_lcd_ev_board b/examples/display_rotation/sdkconfig.bsp.esp32_s3_lcd_ev_board new file mode 100644 index 000000000..7d8a5cdf1 --- /dev/null +++ b/examples/display_rotation/sdkconfig.bsp.esp32_s3_lcd_ev_board @@ -0,0 +1,37 @@ +# This file was generated using idf.py save-defconfig. It can be edited manually. +# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration +# +CONFIG_IDF_TARGET="esp32s3" +CONFIG_ESPTOOLPY_FLASHMODE_QIO=y +CONFIG_COMPILER_OPTIMIZATION_PERF=y +CONFIG_SPIRAM=y +CONFIG_SPIRAM_MODE_OCT=y +CONFIG_SPIRAM_FETCH_INSTRUCTIONS=y +CONFIG_SPIRAM_RODATA=y +CONFIG_SPIRAM_SPEED_80M=y +CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y +CONFIG_ESP32S3_DATA_CACHE_LINE_64B=y +CONFIG_FREERTOS_HZ=1000 +CONFIG_BSP_LCD_RGB_BUFFER_NUMS=2 +CONFIG_BSP_LCD_RGB_BOUNCE_BUFFER_MODE=y +CONFIG_BSP_DISPLAY_LVGL_DIRECT_MODE=y +CONFIG_LV_ATTRIBUTE_FAST_MEM_USE_IRAM=y + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y +CONFIG_LV_COLOR_16_SWAP=y +CONFIG_LV_MEM_CUSTOM=y +CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y +CONFIG_LV_USE_PERF_MONITOR=y diff --git a/examples/display_rotation/sdkconfig.bsp.m5stack_core_s3 b/examples/display_rotation/sdkconfig.bsp.m5stack_core_s3 index a81a29935..969a42677 100644 --- a/examples/display_rotation/sdkconfig.bsp.m5stack_core_s3 +++ b/examples/display_rotation/sdkconfig.bsp.m5stack_core_s3 @@ -4,7 +4,23 @@ CONFIG_IDF_TARGET="esp32s3" CONFIG_ESPTOOLPY_FLASHMODE_QIO=y CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y +CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y CONFIG_LV_USE_PERF_MONITOR=y diff --git a/examples/display_rotation/sdkconfig.defaults b/examples/display_rotation/sdkconfig.defaults index b9cf09db2..c862604df 100644 --- a/examples/display_rotation/sdkconfig.defaults +++ b/examples/display_rotation/sdkconfig.defaults @@ -2,8 +2,23 @@ # Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration # CONFIG_IDF_TARGET="esp32s3" +# CONFIG_LV_BUILD_EXAMPLES is not set + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y CONFIG_LV_USE_PERF_MONITOR=y -# CONFIG_LV_BUILD_EXAMPLES is not set diff --git a/examples/display_sensors/main/sensors_example.c b/examples/display_sensors/main/sensors_example.c index 3e4a56341..dea5bb52d 100644 --- a/examples/display_sensors/main/sensors_example.c +++ b/examples/display_sensors/main/sensors_example.c @@ -43,7 +43,7 @@ static void display_show_signs(void) lv_obj_t *label = lv_label_create(main_screen); lv_label_set_text_static(label, LV_SYMBOL_WIFI" "LV_SYMBOL_USB" "LV_SYMBOL_BELL" "LV_SYMBOL_GPS" "LV_SYMBOL_BATTERY_EMPTY); lv_obj_set_style_text_align(label, LV_TEXT_ALIGN_CENTER, 0); - lv_obj_set_width(label, disp->driver->hor_res); + lv_obj_set_width(label, lv_display_get_physical_horizontal_resolution(disp)); lv_obj_align(label, LV_ALIGN_TOP_MID, 0, 0); bsp_display_unlock(); } @@ -247,7 +247,7 @@ void app_main(void) main_label = lv_label_create(main_screen); lv_label_set_text_static(main_label, "Magnetometer\ncalibration"); lv_obj_set_style_text_align(main_label, LV_TEXT_ALIGN_CENTER, 0); - lv_obj_set_width(main_label, disp->driver->hor_res); + lv_obj_set_width(main_label, lv_display_get_physical_horizontal_resolution(disp)); lv_obj_align(main_label, LV_ALIGN_TOP_MID, 0, 15); bsp_display_unlock(); diff --git a/examples/display_sensors/sdkconfig.bsp.esp32_azure_iot_kit b/examples/display_sensors/sdkconfig.bsp.esp32_azure_iot_kit index c37f61292..fbb1dbe96 100644 --- a/examples/display_sensors/sdkconfig.bsp.esp32_azure_iot_kit +++ b/examples/display_sensors/sdkconfig.bsp.esp32_azure_iot_kit @@ -4,3 +4,11 @@ CONFIG_IDF_TARGET="esp32" CONFIG_LV_SPRINTF_USE_FLOAT=y # CONFIG_LV_BUILD_EXAMPLES is not set + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y diff --git a/examples/display_sensors/sdkconfig.defaults b/examples/display_sensors/sdkconfig.defaults index c37f61292..7a45b85c5 100644 --- a/examples/display_sensors/sdkconfig.defaults +++ b/examples/display_sensors/sdkconfig.defaults @@ -2,5 +2,14 @@ # Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration # CONFIG_IDF_TARGET="esp32" +CONFIG_LV_USE_FLOAT=y CONFIG_LV_SPRINTF_USE_FLOAT=y # CONFIG_LV_BUILD_EXAMPLES is not set + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y diff --git a/examples/display_usb_hid/sdkconfig.defaults b/examples/display_usb_hid/sdkconfig.defaults index 80a2848c3..c3ebb38fe 100644 --- a/examples/display_usb_hid/sdkconfig.defaults +++ b/examples/display_usb_hid/sdkconfig.defaults @@ -2,7 +2,22 @@ # Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration # CONFIG_IDF_TARGET="esp32s3" + +## LVGL8 ## +CONFIG_LV_USE_PERF_MONITOR=y CONFIG_LV_COLOR_16_SWAP=y CONFIG_LV_MEM_CUSTOM=y CONFIG_LV_MEMCPY_MEMSET_STD=y + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y + +# Performance monitor +CONFIG_LV_USE_OBSERVER=y +CONFIG_LV_USE_SYSMON=y CONFIG_LV_USE_PERF_MONITOR=y diff --git a/examples/mqtt_example/main/mqtt_example_main.c b/examples/mqtt_example/main/mqtt_example_main.c index 36dc16bb9..b3b73f2bd 100644 --- a/examples/mqtt_example/main/mqtt_example_main.c +++ b/examples/mqtt_example/main/mqtt_example_main.c @@ -136,7 +136,7 @@ void app_main(void) lv_obj_t *main_label = lv_label_create(main_screen); lv_label_set_text_static(main_label, LV_SYMBOL_WIFI"\nWifi\nconnecting..."); lv_obj_set_style_text_align(main_label, LV_TEXT_ALIGN_CENTER, 0); - lv_obj_set_width(main_label, disp->driver->hor_res); + lv_obj_set_width(main_label, lv_display_get_physical_horizontal_resolution(disp)); lv_obj_align(main_label, LV_ALIGN_TOP_MID, 0, 0); bsp_display_unlock(); diff --git a/examples/mqtt_example/sdkconfig.bsp.esp32_azure_iot_kit b/examples/mqtt_example/sdkconfig.bsp.esp32_azure_iot_kit index dd3133998..752f58b66 100644 --- a/examples/mqtt_example/sdkconfig.bsp.esp32_azure_iot_kit +++ b/examples/mqtt_example/sdkconfig.bsp.esp32_azure_iot_kit @@ -6,3 +6,11 @@ CONFIG_LV_SPRINTF_USE_FLOAT=y CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y CONFIG_PARTITION_TABLE_CUSTOM=y # CONFIG_LV_BUILD_EXAMPLES is not set + +## LVGL9 ## +CONFIG_LV_CONF_SKIP=y + +#CLIB default +CONFIG_LV_USE_CLIB_MALLOC=y +CONFIG_LV_USE_CLIB_SPRINTF=y +CONFIG_LV_USE_CLIB_STRING=y