From da4934d8310c728cbbd0e3c7896e557c2b7ab7d4 Mon Sep 17 00:00:00 2001 From: fvanroie <15969459+fvanroie@users.noreply.github.com> Date: Wed, 2 Feb 2022 08:05:36 +0100 Subject: [PATCH] Add 16bit BMP decoder for local files --- platformio.ini | 5 +++-- user_setups/darwin_sdl/darwin_sdl_64bits.ini | 2 +- user_setups/esp32/_esp32.ini | 2 +- user_setups/esp32s2/_esp32s2.ini | 2 +- user_setups/linux_sdl/linux_sdl_64bits.ini | 2 +- user_setups/win32/windows_sdl_64bits.ini | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/platformio.ini b/platformio.ini index a0039047..4795c51f 100644 --- a/platformio.ini +++ b/platformio.ini @@ -80,10 +80,11 @@ lib_deps = ;git+https://github.com/andrethomas/TasmotaSlave.git ;git+https://github.com/lvgl/lvgl.git git+https://github.com/lvgl/lvgl.git#release/v7 + ;git+https://github.com/lvgl/lv_fs_if.git#release/v7 ;lvgl/lvgl@^7.11.0 ; from PIO library git+https://github.com/lvgl/lv_lib_png.git#release/v7 - ;git+https://github.com/lvgl/lv_lib_bmp.git#release/v7 - ;git+https://github.com/lvgl/lv_lib_gif.git#release/v7 + git+https://github.com/lvgl/lv_lib_bmp.git#release/v7 + git+https://github.com/lvgl/lv_lib_gif.git#release/v7 ;git+https://github.com/lvgl/lv_lib_split_jpg.git ; ------ Unused / Test libraries ;https://github.com/netwizeBE/TFT_eSPI.git diff --git a/user_setups/darwin_sdl/darwin_sdl_64bits.ini b/user_setups/darwin_sdl/darwin_sdl_64bits.ini index 82f5fa28..997c5286 100644 --- a/user_setups/darwin_sdl/darwin_sdl_64bits.ini +++ b/user_setups/darwin_sdl/darwin_sdl_64bits.ini @@ -29,7 +29,7 @@ build_flags = -D HASP_USE_CONFIG=0 ; Standalone application, as library -D HASP_USE_DEBUG=1 -D HASP_USE_PNGDECODE=1 - -D HASP_USE_BMPDECODE=0 + -D HASP_USE_BMPDECODE=1 -D HASP_USE_GIFDECODE=0 -D HASP_USE_JPGDECODE=0 -D HASP_USE_MQTT=1 diff --git a/user_setups/esp32/_esp32.ini b/user_setups/esp32/_esp32.ini index baa6d82e..9fbfdd4e 100644 --- a/user_setups/esp32/_esp32.ini +++ b/user_setups/esp32/_esp32.ini @@ -30,7 +30,7 @@ build_flags = -D HASP_USE_CONFIG=1 ; Native application, not library -D LV_LOG_TRACE_TIMER=1 -D HASP_USE_PNGDECODE=1 - -D HASP_USE_BMPDECODE=0 + -D HASP_USE_BMPDECODE=1 -D HASP_USE_JPGDECODE=0 -D HASP_USE_GIFDECODE=0 ; -- LittleFS build options ------------------------ diff --git a/user_setups/esp32s2/_esp32s2.ini b/user_setups/esp32s2/_esp32s2.ini index c098afa3..ba399c4e 100644 --- a/user_setups/esp32s2/_esp32s2.ini +++ b/user_setups/esp32s2/_esp32s2.ini @@ -45,7 +45,7 @@ build_flags = -D HASP_USE_CONFIG=1 ; Native application, not library -D LV_LOG_TRACE_TIMER=1 -D HASP_USE_PNGDECODE=1 - -D HASP_USE_BMPDECODE=0 + -D HASP_USE_BMPDECODE=1 -D HASP_USE_JPGDECODE=0 -D HASP_USE_GIFDECODE=0 ; -- LittleFS build options ------------------------ diff --git a/user_setups/linux_sdl/linux_sdl_64bits.ini b/user_setups/linux_sdl/linux_sdl_64bits.ini index f8e27de9..9d2f4dab 100644 --- a/user_setups/linux_sdl/linux_sdl_64bits.ini +++ b/user_setups/linux_sdl/linux_sdl_64bits.ini @@ -28,7 +28,7 @@ build_flags = -D HASP_USE_CONFIG=0 ; Standalone application, as library -D HASP_USE_DEBUG=1 -D HASP_USE_PNGDECODE=1 - -D HASP_USE_BMPDECODE=0 + -D HASP_USE_BMPDECODE=1 -D HASP_USE_GIFDECODE=0 -D HASP_USE_JPGDECODE=0 -D HASP_USE_MQTT=1 diff --git a/user_setups/win32/windows_sdl_64bits.ini b/user_setups/win32/windows_sdl_64bits.ini index b112c7a1..a5f9132f 100644 --- a/user_setups/win32/windows_sdl_64bits.ini +++ b/user_setups/win32/windows_sdl_64bits.ini @@ -28,7 +28,7 @@ build_flags = -D HASP_USE_CONFIG=0 ; Standalone application, as library -D HASP_USE_DEBUG=1 -D HASP_USE_PNGDECODE=1 - -D HASP_USE_BMPDECODE=0 + -D HASP_USE_BMPDECODE=1 -D HASP_USE_GIFDECODE=0 -D HASP_USE_JPGDECODE=0 -D HASP_USE_MQTT=1