diff --git a/.config b/.config index d26fa54..7c00849 100644 --- a/.config +++ b/.config @@ -75,7 +75,7 @@ CONFIG_RT_USING_HEAP=y # end of Memory Management CONFIG_RT_USING_DEVICE=y -# CONFIG_RT_USING_DEVICE_OPS is not set +CONFIG_RT_USING_DEVICE_OPS=y # CONFIG_RT_USING_INTERRUPT_INFO is not set # CONFIG_RT_USING_THREADSAFE_PRINTF is not set # CONFIG_RT_USING_SCHED_THREAD_CTX is not set @@ -222,7 +222,7 @@ CONFIG_RT_SFUD_SPI_MAX_HZ=50000000 # CONFIG_RT_USING_AUDIO is not set # CONFIG_RT_USING_SENSOR is not set # CONFIG_RT_USING_TOUCH is not set -# CONFIG_RT_USING_LCD is not set +CONFIG_RT_USING_LCD=y # CONFIG_RT_USING_HWCRYPTO is not set # CONFIG_RT_USING_PULSE_ENCODER is not set # CONFIG_RT_USING_INPUT_CAPTURE is not set @@ -517,7 +517,34 @@ CONFIG_PKG_CJSON_VER="v1.7.17" # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LVGL is not set +CONFIG_PKG_USING_LVGL=y +CONFIG_PKG_LVGL_PATH="/packages/multimedia/LVGL/LVGL" +CONFIG_PKG_LVGL_THREAD_PRIO=20 +CONFIG_PKG_LVGL_THREAD_STACK_SIZE=4096 +CONFIG_PKG_LVGL_DISP_REFR_PERIOD=5 +# CONFIG_PKG_USING_LVGL_SQUARELINE is not set +# CONFIG_PKG_LVGL_USING_EXAMPLES is not set +# CONFIG_PKG_LVGL_USING_DEMOS is not set +CONFIG_PKG_LVGL_USING_V080311=y +# CONFIG_PKG_LVGL_USING_V080310 is not set +# CONFIG_PKG_LVGL_USING_V08039 is not set +# CONFIG_PKG_LVGL_USING_V08038 is not set +# CONFIG_PKG_LVGL_USING_V08037 is not set +# CONFIG_PKG_LVGL_USING_V08036 is not set +# CONFIG_PKG_LVGL_USING_V08035 is not set +# CONFIG_PKG_LVGL_USING_V08034 is not set +# CONFIG_PKG_LVGL_USING_V08033 is not set +# CONFIG_PKG_LVGL_USING_V08032 is not set +# CONFIG_PKG_LVGL_USING_V08031 is not set +# CONFIG_PKG_LVGL_USING_V08030 is not set +# CONFIG_PKG_LVGL_USING_V08020 is not set +# CONFIG_PKG_LVGL_USING_V8_3_LATEST is not set +# CONFIG_PKG_LVGL_USING_V8_4_LATEST is not set +# CONFIG_PKG_LVGL_USING_V09000 is not set +# CONFIG_PKG_LVGL_USING_V09010 is not set +# CONFIG_PKG_LVGL_USING_LATEST is not set +CONFIG_PKG_LVGL_VER_NUM=0x080311 +CONFIG_PKG_LVGL_VER="v8.3.11" # CONFIG_PKG_USING_LV_MUSIC_DEMO is not set # CONFIG_PKG_USING_GUI_GUIDER_DEMO is not set # end of LVGL: powerful and easy-to-use embedded GUI library diff --git a/.cproject b/.cproject index 4c2a8f9..3d0bb6a 100644 --- a/.cproject +++ b/.cproject @@ -1,255 +1,673 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.project b/.project index f059ea4..350c330 100644 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - 828F + project diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index 2071896..3f6195d 100644 --- a/.settings/language.settings.xml +++ b/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + diff --git a/applications/QSPI_elmfatfs.c b/applications/disk/QSPI_elmfatfs.c similarity index 100% rename from applications/QSPI_elmfatfs.c rename to applications/disk/QSPI_elmfatfs.c diff --git a/applications/SDIO_elmfatfs.c b/applications/disk/SDIO_elmfatfs.c similarity index 100% rename from applications/SDIO_elmfatfs.c rename to applications/disk/SDIO_elmfatfs.c diff --git a/applications/TMPFS_root.c b/applications/disk/TMPFS_root.c similarity index 100% rename from applications/TMPFS_root.c rename to applications/disk/TMPFS_root.c diff --git a/applications/fal_cfg.h b/applications/disk/fal_cfg.h similarity index 100% rename from applications/fal_cfg.h rename to applications/disk/fal_cfg.h diff --git a/applications/sdram_port.c b/applications/sdram/sdram_port.c similarity index 100% rename from applications/sdram_port.c rename to applications/sdram/sdram_port.c diff --git a/applications/sdram_port.h b/applications/sdram/sdram_port.h similarity index 100% rename from applications/sdram_port.h rename to applications/sdram/sdram_port.h diff --git a/applications/DB_SQLite.c b/applications/sql/DB_SQLite.c similarity index 100% rename from applications/DB_SQLite.c rename to applications/sql/DB_SQLite.c diff --git a/applications/DB_SQLite.h b/applications/sql/DB_SQLite.h similarity index 100% rename from applications/DB_SQLite.h rename to applications/sql/DB_SQLite.h diff --git a/exclude_list.json b/exclude_list.json index 773c782..4320063 100644 --- a/exclude_list.json +++ b/exclude_list.json @@ -1 +1 @@ -[{"config_name":"Debug","exclude_files":["packages/sqlite-v3.19.3/dbhelper.c","packages/sqlite-v3.19.3/rtthread_vfs.c"]}] \ No newline at end of file +[{"config_name":"Debug","exclude_files":["packages/sqlite-v3.19.3/dbhelper.c","packages/sqlite-v3.19.3/rtthread_vfs.c","applications/lvgl","packages/LVGL-v8.3.11"]}] \ No newline at end of file diff --git a/packages/packages.dbsqlite b/packages/packages.dbsqlite index 2c0b57e..844513c 100644 Binary files a/packages/packages.dbsqlite and b/packages/packages.dbsqlite differ diff --git a/packages/pkgs.json b/packages/pkgs.json index 6542332..b3be19d 100644 --- a/packages/pkgs.json +++ b/packages/pkgs.json @@ -4,6 +4,11 @@ "ver": "v1.7.17", "name": "CJSON" }, + { + "path": "/packages/multimedia/LVGL/LVGL", + "ver": "v8.3.11", + "name": "LVGL" + }, { "path": "/packages/system/sqlite", "ver": "v3.19.3", diff --git a/rtconfig.h b/rtconfig.h index df60c83..6ae7341 100644 --- a/rtconfig.h +++ b/rtconfig.h @@ -48,6 +48,7 @@ #define RT_USING_HEAP /* end of Memory Management */ #define RT_USING_DEVICE +#define RT_USING_DEVICE_OPS #define RT_USING_CONSOLE #define RT_CONSOLEBUF_SIZE 256 #define RT_CONSOLE_DEVICE_NAME "uart3" @@ -140,6 +141,7 @@ #define RT_SFUD_USING_FLASH_INFO_TABLE #define RT_SFUD_USING_QSPI #define RT_SFUD_SPI_MAX_HZ 50000000 +#define RT_USING_LCD #define RT_USING_DEV_BUS #define RT_USING_PIN @@ -241,6 +243,12 @@ /* LVGL: powerful and easy-to-use embedded GUI library */ +#define PKG_USING_LVGL +#define PKG_LVGL_THREAD_PRIO 20 +#define PKG_LVGL_THREAD_STACK_SIZE 4096 +#define PKG_LVGL_DISP_REFR_PERIOD 5 +#define PKG_LVGL_USING_V080311 +#define PKG_LVGL_VER_NUM 0x080311 /* end of LVGL: powerful and easy-to-use embedded GUI library */ /* u8g2: a monochrome graphic library */