From 4ebd010883d10d6b072646232d38f207d6d55c88 Mon Sep 17 00:00:00 2001 From: fvanroie <15969459+fvanroie@users.noreply.github.com> Date: Thu, 3 Jun 2021 16:36:03 +0200 Subject: [PATCH] Update lv_lib_png repo and gitsubmodules --- .gitmodules | 3 --- README.md | 22 ---------------------- platformio.ini | 2 +- user_setups/linux_sdl/linux_sdl_64bits.ini | 2 +- user_setups/win32/windows_sdl_64bits.ini | 2 +- 5 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index fa137f9e..00000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "lib/lv_lib_qrlodepng"] - path = lib/lv_lib_qrlodepng - url = https://github.com/littlevgl/lv_lib_lodepng diff --git a/README.md b/README.md index 4b1f2c3b..820dbd4b 100644 --- a/README.md +++ b/README.md @@ -38,28 +38,6 @@ openHASP also adds ESP32 and STM32F4 support to take advantage of the additional | PNG images | :x: no | :grey_question: tbd | :grey_question: tbd | Network | :white_check_mark: Wifi | :white_check_mark: Wifi | :white_check_mark: Ethernet -## Cloning - -Make sure to add the `--recursive` parameter when cloning the project. Otherwise git will not download the required submodules in the `/lib` subdirectory. - -```bash -git clone --recursive https://github.com/HASwitchPlate/openHASP -``` - -If you already cloned openHASP without the submodules, you can fetch the submodules seperately using: - -```bash -git submodule update --init --recursive -``` - -To build a defierent branch use: - -```bash -git clone --recursive https://github.com/HASwitchPlate/openHASP -cd openHASP -git checkout 0.4.0 -git submodule update --init --recursive -``` ## Getting Started diff --git a/platformio.ini b/platformio.ini index 8dbd205b..34fd4d57 100644 --- a/platformio.ini +++ b/platformio.ini @@ -150,7 +150,7 @@ lib_ignore = lib_deps = LittleFS_esp32 - git+https://github.com/lvgl/lv_lib_png.git#7ff6168764893d658375a9c3173337506ff4eb1b + git+https://github.com/lvgl/lv_lib_png.git#release/v7 ps_ram = -DBOARD_HAS_PSRAM diff --git a/user_setups/linux_sdl/linux_sdl_64bits.ini b/user_setups/linux_sdl/linux_sdl_64bits.ini index b44efc69..9584f7a6 100644 --- a/user_setups/linux_sdl/linux_sdl_64bits.ini +++ b/user_setups/linux_sdl/linux_sdl_64bits.ini @@ -61,7 +61,7 @@ lib_deps = https://github.com/eclipse/paho.mqtt.c.git bblanchon/ArduinoJson@^6.17.2 ; Json(l) parser https://github.com/fvanroie/lv_drivers - git+https://github.com/lvgl/lv_lib_png.git#7ff6168764893d658375a9c3173337506ff4eb1b + git+https://github.com/lvgl/lv_lib_png.git#release/v7 lib_ignore = paho diff --git a/user_setups/win32/windows_sdl_64bits.ini b/user_setups/win32/windows_sdl_64bits.ini index 5913330d..edfe3417 100644 --- a/user_setups/win32/windows_sdl_64bits.ini +++ b/user_setups/win32/windows_sdl_64bits.ini @@ -83,7 +83,7 @@ lib_deps = https://github.com/eclipse/paho.mqtt.c.git bblanchon/ArduinoJson@^6.17.2 ; Json(l) parser https://github.com/fvanroie/lv_drivers - git+https://github.com/lvgl/lv_lib_png.git#7ff6168764893d658375a9c3173337506ff4eb1b + git+https://github.com/lvgl/lv_lib_png.git#release/v7 lib_ignore = paho