From 97d99d55351faa8a1e40c4752f6d72d6e7b47733 Mon Sep 17 00:00:00 2001 From: bogd Date: Tue, 20 Feb 2024 12:12:27 +0200 Subject: [PATCH] added submodules from gitlab --- .gitmodules | 6 ++++++ WEBUI_SRC/src/components/webguicomp | 1 + components/webguiapp | 1 + dependencies.lock | 6 +++--- main/idf_component.yml | 2 +- sdkconfig | 1 + 6 files changed, 13 insertions(+), 4 deletions(-) create mode 160000 WEBUI_SRC/src/components/webguicomp create mode 160000 components/webguiapp diff --git a/.gitmodules b/.gitmodules index 8b13789..3f6c01f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1 +1,7 @@ +[submodule "WEBUI_SRC/src/components/webguicomp"] + path = WEBUI_SRC/src/components/webguicomp + url = https://gitlab.com/userbogd/webguicomp.git +[submodule "components/webguiapp"] + path = components/webguiapp + url = https://gitlab.com/userbogd/webguiapp.git diff --git a/WEBUI_SRC/src/components/webguicomp b/WEBUI_SRC/src/components/webguicomp new file mode 160000 index 0000000..bb61573 --- /dev/null +++ b/WEBUI_SRC/src/components/webguicomp @@ -0,0 +1 @@ +Subproject commit bb61573661b3bfcef23478349bbc9aaf5b28ff6f diff --git a/components/webguiapp b/components/webguiapp new file mode 160000 index 0000000..89cddc5 --- /dev/null +++ b/components/webguiapp @@ -0,0 +1 @@ +Subproject commit 89cddc53a33a65ce9a263096f398ab71f953c895 diff --git a/dependencies.lock b/dependencies.lock index 8302ddb..e4a0649 100644 --- a/dependencies.lock +++ b/dependencies.lock @@ -1,10 +1,10 @@ dependencies: espressif/esp_modem: - component_hash: eaf036beecd76e9d1eed568f3f26036f076c4a5b02677cb742bcbecac0eec2bb + component_hash: e48da33fee082dd9d9a97a354a228057e07a14ac108766b40ad84e018205410a source: service_url: https://api.components.espressif.com/ type: service - version: 1.0.4 + version: 1.1.0 idf: component_hash: null source: @@ -24,6 +24,6 @@ dependencies: path: . type: git version: b42825192c6455569f1a047b21140d6d1fe5e4ef -manifest_hash: 10bf4fadcc1d0529947d607575fa9dd61a8ddc3c5d34e19cede6c86d4d73bf5c +manifest_hash: 90cab1184d16388de19caf118e4ca86bb9fc8d9eb03c930a246bd81fb024e623 target: esp32s3 version: 1.0.0 diff --git a/main/idf_component.yml b/main/idf_component.yml index a207e17..b97fff2 100644 --- a/main/idf_component.yml +++ b/main/idf_component.yml @@ -5,7 +5,7 @@ dependencies: userbogd/esp_cron: version: main git: https://github.com/userbogd/esp_cron.git - espressif/esp_modem: "==1.0.4" + espressif/esp_modem: ">=1.1.0" ## Required IDF version idf: version: ">=5.1.1" diff --git a/sdkconfig b/sdkconfig index bdd6fa2..e5ee2fe 100644 --- a/sdkconfig +++ b/sdkconfig @@ -1929,6 +1929,7 @@ CONFIG_ESP_MODEM_CMUX_DEFRAGMENT_PAYLOAD=y # CONFIG_ESP_MODEM_USE_INFLATABLE_BUFFER_IF_NEEDED is not set CONFIG_ESP_MODEM_CMUX_DELAY_AFTER_DLCI_SETUP=0 # CONFIG_ESP_MODEM_CMUX_USE_SHORT_PAYLOADS_ONLY is not set +# CONFIG_ESP_MODEM_ADD_CUSTOM_MODULE is not set # end of esp-modem #