From 83fbb887f092adc4a3a53737cc4cc7b48a6ae587 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Tue, 3 Jan 2023 17:44:45 +0200 Subject: [PATCH] webguiapp update implemented --- .gitmodules | 3 --- CMakeLists.txt | 2 +- components/libespfs | 1 - components/ttn-esp32 | 2 +- components/webguiapp | 2 +- sdkconfig | 32 +++++++++++++------------------- 6 files changed, 16 insertions(+), 26 deletions(-) delete mode 160000 components/libespfs diff --git a/.gitmodules b/.gitmodules index e216348..c0a64d3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "components/libespfs"] - path = components/libespfs - url = git@github.com:userbogd/libespfs.git [submodule "components/webguiapp"] path = components/webguiapp url = git@gitlab.com:userbogd/webguiapp.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f5e7c8..4a582af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,5 +8,5 @@ string(REPLACE " " "_" ProjectId ${ProjectId}) project(${ProjectId}) # Include espfs ROM in foldef HTML -include(components/libespfs/cmake/include.cmake) +include(components/webguiapp/extlibs/libespfs/cmake/include.cmake) target_add_espfs(webguiapp_ref_implement.elf espfs HTML) \ No newline at end of file diff --git a/components/libespfs b/components/libespfs deleted file mode 160000 index a646e3e..0000000 --- a/components/libespfs +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a646e3ee0594ec2301e9b3fe6373ea274eb39e39 diff --git a/components/ttn-esp32 b/components/ttn-esp32 index 2ac5320..c03aab8 160000 --- a/components/ttn-esp32 +++ b/components/ttn-esp32 @@ -1 +1 @@ -Subproject commit 2ac532050de44a27fa46796e702e07610e60ec88 +Subproject commit c03aab83ad6332bddb6925b516f52a8266232d4a diff --git a/components/webguiapp b/components/webguiapp index f6d881a..46ed2b6 160000 --- a/components/webguiapp +++ b/components/webguiapp @@ -1 +1 @@ -Subproject commit f6d881a4f175f9880a935843c763b9759ee41cdc +Subproject commit 46ed2b645b0f4d571f1aeb1e0c726df6064af299 diff --git a/sdkconfig b/sdkconfig index 869b9ac..046dfdb 100644 --- a/sdkconfig +++ b/sdkconfig @@ -1222,12 +1222,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y # CONFIG_WPA_DPP_SUPPORT is not set # end of Supplicant -# -# Virtual GPO configuration -# -# CONFIG_PORTS_EXTENDER_ENABLE is not set -# end of Virtual GPO configuration - # # esp-modem # @@ -1235,19 +1229,6 @@ CONFIG_ESP_MODEM_CMUX_DEFRAGMENT_PAYLOAD=y CONFIG_ESP_MODEM_CMUX_DELAY_AFTER_DLCI_SETUP=0 # end of esp-modem -# -# libespfs -# -# CONFIG_ESPFS_LOG_LEVEL_NONE is not set -# CONFIG_ESPFS_LOG_LEVEL_ERROR is not set -CONFIG_ESPFS_LOG_LEVEL_WARNING=y -# CONFIG_ESPFS_LOG_LEVEL_INFO is not set -# CONFIG_ESPFS_LOG_LEVEL_DEBUG is not set -# CONFIG_ESPFS_LOG_LEVEL_VERBOSE is not set -CONFIG_ESPFS_MAX_PARTITIONS=1 -CONFIG_ESPFS_USE_HEATSHRINK=y -# end of libespfs - # # The Things Network # @@ -1360,6 +1341,19 @@ CONFIG_WEBGUIAPP_DNS1_ADDRESS_DEFAULT="8.8.8.8" CONFIG_WEBGUIAPP_DNS2_ADDRESS_DEFAULT="8.8.4.4" CONFIG_WEBGUIAPP_DNS3_ADDRESS_DEFAULT="1.1.1.1" # end of DNS settings + +# +# libespfs +# +# CONFIG_ESPFS_LOG_LEVEL_NONE is not set +# CONFIG_ESPFS_LOG_LEVEL_ERROR is not set +CONFIG_ESPFS_LOG_LEVEL_WARNING=y +# CONFIG_ESPFS_LOG_LEVEL_INFO is not set +# CONFIG_ESPFS_LOG_LEVEL_DEBUG is not set +# CONFIG_ESPFS_LOG_LEVEL_VERBOSE is not set +CONFIG_ESPFS_MAX_PARTITIONS=1 +CONFIG_ESPFS_USE_HEATSHRINK=y +# end of libespfs # end of WebGUIApp # end of Component config