From 99b071d6a8104337a71227a4b32aa0b11e3417d3 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Tue, 3 Jan 2023 12:15:30 +0200 Subject: [PATCH] updated esp_modem and webguiapp components --- HTML/index.html | 14 -------------- components/esp_modem | 2 +- components/webguiapp | 2 +- dependencies.lock | 2 +- sdkconfig | 30 +++++++++--------------------- sdkconfig.old | 24 ++++++++++++++++-------- 6 files changed, 28 insertions(+), 46 deletions(-) diff --git a/HTML/index.html b/HTML/index.html index 66f2707..cd0e268 100644 --- a/HTML/index.html +++ b/HTML/index.html @@ -30,20 +30,6 @@ - -
-
-
-











-
-
- -
-
-
-











-
-
diff --git a/components/esp_modem b/components/esp_modem index 50453dd..9c2cf0c 160000 --- a/components/esp_modem +++ b/components/esp_modem @@ -1 +1 @@ -Subproject commit 50453dd0600b1e128bdd681ac55dfa1edc07cf23 +Subproject commit 9c2cf0c292500892ae4b80bfae7430d47c0cb98f diff --git a/components/webguiapp b/components/webguiapp index 6627b3f..f6d881a 160000 --- a/components/webguiapp +++ b/components/webguiapp @@ -1 +1 @@ -Subproject commit 6627b3fc35a26caa7ccebaefa9d3ed79c432af1c +Subproject commit f6d881a4f175f9880a935843c763b9759ee41cdc diff --git a/dependencies.lock b/dependencies.lock index 04f9280..5b5c880 100644 --- a/dependencies.lock +++ b/dependencies.lock @@ -10,6 +10,6 @@ dependencies: source: type: idf version: 4.4.3 -manifest_hash: 194e96f5e2cda141e22c9245b7af761212d9681f1b1e02a09a2c1969241928a1 +manifest_hash: ee305fb8b586a689dfc8bad0cc6735161db782014e3d3a685ed4ffc723d6ee80 target: esp32 version: 1.0.0 diff --git a/sdkconfig b/sdkconfig index d2461f6..869b9ac 100644 --- a/sdkconfig +++ b/sdkconfig @@ -1228,6 +1228,13 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y # CONFIG_PORTS_EXTENDER_ENABLE is not set # end of Virtual GPO configuration +# +# esp-modem +# +CONFIG_ESP_MODEM_CMUX_DEFRAGMENT_PAYLOAD=y +CONFIG_ESP_MODEM_CMUX_DELAY_AFTER_DLCI_SETUP=0 +# end of esp-modem + # # libespfs # @@ -1315,25 +1322,7 @@ CONFIG_WEBGUIAPP_WIFI_GATEWAY_STA="192.168.150.1" # # Ethernet settings # -CONFIG_WEBGUIAPP_ETHERNET_ENABLE=y -CONFIG_WEBGUIAPP_ETHERNET_ON=y -CONFIG_WEBGUIAPP_ETH_IP_DEFAULT="192.168.160.1" -CONFIG_WEBGUIAPP_ETH_MASK_DEFAULT="255.255.255.0" -CONFIG_WEBGUIAPP_ETH_GATEWAY_DEFAULT="192.168.160.1" -# CONFIG_WEBGUIAPP_ETHERNET_DHCP_DEFAULT is not set -CONFIG_GPIO_RANGE_MIN=0 -CONFIG_GPIO_RANGE_MAX=36 -# CONFIG_USE_INTERNAL_ETHERNET is not set -CONFIG_USE_SPI_ETHERNET=y -CONFIG_SPI_ETHERNETS_NUM=1 -# CONFIG_DM9051 is not set -# CONFIG_KSZ8851SNL is not set -CONFIG_W5500=y -CONFIG_ETH_SPI_CLOCK_MHZ=12 -CONFIG_ETH_SPI_CS0_GPIO=23 -CONFIG_ETH_SPI_INT0_GPIO=35 -CONFIG_ETH_SPI_PHY_RST0_GPIO=4 -CONFIG_ETH_SPI_PHY_ADDR0=1 +# CONFIG_WEBGUIAPP_ETHERNET_ENABLE is not set # end of Ethernet settings # @@ -1352,13 +1341,12 @@ CONFIG_ETH_SPI_PHY_ADDR0=1 # MQTT settings # CONFIG_WEBGUIAPP_MQTT_ENABLE=y -CONFIG_WEBGUIAPP_MQTT_CLIENTS_NUM=2 +CONFIG_WEBGUIAPP_MQTT_CLIENTS_NUM=1 CONFIG_WEBGUIAPP_MQTT_ON=y CONFIG_WEBGUIAPP_MQTT_MAX_TOPIC_LENGTH=64 CONFIG_WEBGUIAPP_MQTT_SERVER_URL="myfirstmqttserver.com" CONFIG_WEBGUIAPP_MQTT_SERVER_PORT=1883 CONFIG_WEBGUIAPP_MQTT_CLIENT_ID_1="DEVID1" -CONFIG_WEBGUIAPP_MQTT_CLIENT_ID_2="DEVID2" CONFIG_WEBGUIAPP_MQTT_SYSTEM_NAME="SYSTEMNAME" CONFIG_WEBGUIAPP_MQTT_GROUP_NAME="GROUPNAME" CONFIG_WEBGUIAPP_MQTT_USERNAME="username" diff --git a/sdkconfig.old b/sdkconfig.old index 7c67401..26e74ef 100644 --- a/sdkconfig.old +++ b/sdkconfig.old @@ -51,7 +51,8 @@ CONFIG_BOOTLOADER_LOG_LEVEL_INFO=y # CONFIG_BOOTLOADER_LOG_LEVEL_DEBUG is not set # CONFIG_BOOTLOADER_LOG_LEVEL_VERBOSE is not set CONFIG_BOOTLOADER_LOG_LEVEL=3 -# CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_8V is not set +# CONFIG_BOOTLOADER_SPI_CUSTOM_WP_PIN is not set +CONFIG_BOOTLOADER_SPI_WP_PIN=7 CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y # CONFIG_BOOTLOADER_FACTORY_RESET is not set # CONFIG_BOOTLOADER_APP_TEST is not set @@ -81,17 +82,17 @@ CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT=y # CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200 # CONFIG_ESPTOOLPY_NO_STUB is not set -# CONFIG_ESPTOOLPY_FLASHMODE_QIO is not set +CONFIG_ESPTOOLPY_FLASHMODE_QIO=y # CONFIG_ESPTOOLPY_FLASHMODE_QOUT is not set -CONFIG_ESPTOOLPY_FLASHMODE_DIO=y +# CONFIG_ESPTOOLPY_FLASHMODE_DIO is not set # CONFIG_ESPTOOLPY_FLASHMODE_DOUT is not set CONFIG_ESPTOOLPY_FLASH_SAMPLE_MODE_STR=y CONFIG_ESPTOOLPY_FLASHMODE="dio" -# CONFIG_ESPTOOLPY_FLASHFREQ_80M is not set -CONFIG_ESPTOOLPY_FLASHFREQ_40M=y +CONFIG_ESPTOOLPY_FLASHFREQ_80M=y +# CONFIG_ESPTOOLPY_FLASHFREQ_40M is not set # CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set # CONFIG_ESPTOOLPY_FLASHFREQ_20M is not set -CONFIG_ESPTOOLPY_FLASHFREQ="40m" +CONFIG_ESPTOOLPY_FLASHFREQ="80m" # CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set # CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y @@ -1227,6 +1228,13 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y # CONFIG_PORTS_EXTENDER_ENABLE is not set # end of Virtual GPO configuration +# +# esp-modem +# +CONFIG_ESP_MODEM_CMUX_DEFRAGMENT_PAYLOAD=y +CONFIG_ESP_MODEM_CMUX_DELAY_AFTER_DLCI_SETUP=0 +# end of esp-modem + # # libespfs # @@ -1391,9 +1399,9 @@ CONFIG_LOG_BOOTLOADER_LEVEL_INFO=y CONFIG_LOG_BOOTLOADER_LEVEL=3 # CONFIG_APP_ROLLBACK_ENABLE is not set # CONFIG_FLASH_ENCRYPTION_ENABLED is not set -# CONFIG_FLASHMODE_QIO is not set +CONFIG_FLASHMODE_QIO=y # CONFIG_FLASHMODE_QOUT is not set -CONFIG_FLASHMODE_DIO=y +# CONFIG_FLASHMODE_DIO is not set # CONFIG_FLASHMODE_DOUT is not set # CONFIG_MONITOR_BAUD_9600B is not set # CONFIG_MONITOR_BAUD_57600B is not set