You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2022/08/13 12:36:53 UTC
[incubator-nuttx] 02/03: Added default config for lvgl configs based on both fb and lcddev.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit df0604a4bef363245991e664731bdcf9a85016f6
Author: Tiago Medicci Serrano <ti...@espressif.com>
AuthorDate: Thu Aug 11 18:12:06 2022 -0300
Added default config for lvgl configs based on both fb and lcddev.
In order to better test the lcdddev driver and framebuffer, newer
board configs (for the TTGO T-Display and for the simulator) were
added.
Adjusted references of the sim:lvgl_(fb/lcd) config.
---
Documentation/platforms/sim/sim/index.rst | 2 +-
boards/sim/sim/sim/configs/{lvgl => lvgl_fb}/defconfig | 0
boards/sim/sim/sim/configs/{lvgl => lvgl_lcd}/defconfig | 4 ++--
.../esp32/ttgo_t_display_esp32/configs/{lvgl => lvgl_fb}/defconfig | 0
.../esp32/ttgo_t_display_esp32/configs/{lvgl => lvgl_lcd}/defconfig | 4 +---
tools/ci/testlist/sim-01.dat | 3 ++-
6 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/Documentation/platforms/sim/sim/index.rst b/Documentation/platforms/sim/sim/index.rst
index 29337a1e0d..5d17d2eb69 100644
--- a/Documentation/platforms/sim/sim/index.rst
+++ b/Documentation/platforms/sim/sim/index.rst
@@ -62,7 +62,7 @@ It is possible to run the LVGL Demo directly in the NuttX simulator ::
$ make distclean
- $ ./tools/configure.sh sim:lvgl
+ $ ./tools/configure.sh sim:lvgl_fb
$ make -j
diff --git a/boards/sim/sim/sim/configs/lvgl/defconfig b/boards/sim/sim/sim/configs/lvgl_fb/defconfig
similarity index 100%
copy from boards/sim/sim/sim/configs/lvgl/defconfig
copy to boards/sim/sim/sim/configs/lvgl_fb/defconfig
diff --git a/boards/sim/sim/sim/configs/lvgl/defconfig b/boards/sim/sim/sim/configs/lvgl_lcd/defconfig
similarity index 97%
rename from boards/sim/sim/sim/configs/lvgl/defconfig
rename to boards/sim/sim/sim/configs/lvgl_lcd/defconfig
index 5b81d10054..1c3ebd8df7 100644
--- a/boards/sim/sim/sim/configs/lvgl/defconfig
+++ b/boards/sim/sim/sim/configs/lvgl_lcd/defconfig
@@ -23,13 +23,14 @@ CONFIG_DEBUG_WARN=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_POSIX_TIMERS=y
-CONFIG_DRIVERS_VIDEO=y
CONFIG_EXAMPLES_LVGLDEMO=y
CONFIG_EXAMPLES_LVGLDEMO_STACKSIZE=32768
CONFIG_GRAPHICS_LVGL=y
CONFIG_IDLETHREAD_STACKSIZE=4096
CONFIG_INIT_ENTRYPOINT="lvgldemo_main"
CONFIG_INPUT=y
+CONFIG_LCD=y
+CONFIG_LCD_DEV=y
CONFIG_LV_COLOR_DEPTH=32
CONFIG_LV_HOR_RES=640
CONFIG_LV_VER_RES=480
@@ -53,4 +54,3 @@ CONFIG_START_DAY=28
CONFIG_START_MONTH=11
CONFIG_START_YEAR=2008
CONFIG_SYSTEM_NSH=y
-CONFIG_VIDEO_FB=y
diff --git a/boards/xtensa/esp32/ttgo_t_display_esp32/configs/lvgl/defconfig b/boards/xtensa/esp32/ttgo_t_display_esp32/configs/lvgl_fb/defconfig
similarity index 100%
copy from boards/xtensa/esp32/ttgo_t_display_esp32/configs/lvgl/defconfig
copy to boards/xtensa/esp32/ttgo_t_display_esp32/configs/lvgl_fb/defconfig
diff --git a/boards/xtensa/esp32/ttgo_t_display_esp32/configs/lvgl/defconfig b/boards/xtensa/esp32/ttgo_t_display_esp32/configs/lvgl_lcd/defconfig
similarity index 96%
rename from boards/xtensa/esp32/ttgo_t_display_esp32/configs/lvgl/defconfig
rename to boards/xtensa/esp32/ttgo_t_display_esp32/configs/lvgl_lcd/defconfig
index db48202010..69a6bcd023 100644
--- a/boards/xtensa/esp32/ttgo_t_display_esp32/configs/lvgl/defconfig
+++ b/boards/xtensa/esp32/ttgo_t_display_esp32/configs/lvgl_lcd/defconfig
@@ -20,7 +20,6 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_XTENSA=y
CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
-CONFIG_DRIVERS_VIDEO=y
CONFIG_ESP32_SPI2=y
CONFIG_ESP32_SPI2_CLKPIN=18
CONFIG_ESP32_SPI2_CSPIN=5
@@ -37,7 +36,7 @@ CONFIG_IDLETHREAD_STACKSIZE=3072
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LCD=y
-CONFIG_LCD_FRAMEBUFFER=y
+CONFIG_LCD_DEV=y
CONFIG_LCD_ST7789=y
CONFIG_LCD_ST7789_XOFFSET=53
CONFIG_LCD_ST7789_XRES=135
@@ -63,4 +62,3 @@ CONFIG_START_MONTH=12
CONFIG_START_YEAR=2011
CONFIG_SYSTEM_NSH=y
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_VIDEO_FB=y
diff --git a/tools/ci/testlist/sim-01.dat b/tools/ci/testlist/sim-01.dat
index c8f9298512..45bb40225b 100644
--- a/tools/ci/testlist/sim-01.dat
+++ b/tools/ci/testlist/sim-01.dat
@@ -18,7 +18,8 @@
-Darwin,sim:linuxspi
# macOS doesn't have X11
--Darwin,sim:lvgl
+-Darwin,sim:lvgl_fb
+-Darwin,sim:lvgl_lcd
-Darwin,sim:nsh2
-Darwin,sim:nx11
-Darwin,sim:nxlines