diff --git a/.gitignore b/.gitignore index 716485d..d79ba05 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ build/ sdkconfig.old sdkconfig.defaults.bak -dependencies.lock # ESP Component Manager downloads managed_components/ diff --git a/dependencies.lock b/dependencies.lock new file mode 100644 index 0000000..b2d3d67 --- /dev/null +++ b/dependencies.lock @@ -0,0 +1,55 @@ +dependencies: + espressif/esp_jpeg: + component_hash: defb83669293cbf86d0fa86b475ba5517aceed04ed70db435388c151ab37b5d7 + dependencies: + - name: idf + require: private + version: '>=5.0' + source: + registry_url: https://components.espressif.com/ + type: service + version: 1.3.1 + espressif/esp_lvgl_port: + component_hash: d3c020b45c3dfc0d1706a83b63a1c34a6eb444a6e935f9afff79f92b7b94dcef + dependencies: + - name: idf + require: private + version: '>=5.2' + - name: lvgl/lvgl + registry_url: https://components.espressif.com + require: public + version: '>=8,<10' + source: + registry_url: https://components.espressif.com/ + type: service + version: 2.9.0 + idf: + source: + type: idf + version: 5.5.5 + joltwallet/littlefs: + component_hash: 3af20a3d75c49db9dc2286fd50862c34055c9f578419ad1f2bf7ed3ed01391fe + dependencies: + - name: idf + require: private + version: '>=5.0' + source: + registry_url: https://components.espressif.com/ + type: service + version: 1.22.3 + lvgl/lvgl: + component_hash: d7c1ac037ae6e85d94897f807d6e7ba0946a83e720074fc95a4f6241da9f9f53 + dependencies: [] + source: + registry_url: https://components.espressif.com/ + type: service + version: 8.4.0 +direct_dependencies: +- espressif/esp_jpeg +- espressif/esp_lvgl_port +- idf +- joltwallet/littlefs +- lvgl/lvgl +manifest_hash: 2386ea3980a579a41642d521494a1377dbeef5b30a665d77640d0c1d1c7aba30 +target: esp32 +version: 2.0.0 diff --git a/main/idf_component.yml b/main/idf_component.yml index 67f0ee7..be1795b 100644 --- a/main/idf_component.yml +++ b/main/idf_component.yml @@ -4,5 +4,5 @@ dependencies: idf: ">=5.0" joltwallet/littlefs: "*" esp_jpeg: ">=1.0.2" - lvgl/lvgl: "^8.3.11" - espressif/esp_lvgl_port: "^2.0.0" \ No newline at end of file + lvgl/lvgl: "~8.4.0" + espressif/esp_lvgl_port: "~2.9.0" \ No newline at end of file diff --git a/sdkconfig.defaults b/sdkconfig.defaults index 4d95f29..30541d2 100644 --- a/sdkconfig.defaults +++ b/sdkconfig.defaults @@ -21,6 +21,7 @@ CONFIG_LV_FONT_MONTSERRAT_12=y CONFIG_LV_FONT_MONTSERRAT_14=y CONFIG_LV_FONT_MONTSERRAT_20=y CONFIG_LV_FONT_MONTSERRAT_48=y +CONFIG_LV_USE_FREETYPE=n # tjpgd JPEG Decoder (RGB565 output) CONFIG_JD_USE_ROM=n