From 29b1142bf80f8d8b5f5b17c78e66aa55921387f1 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Wed, 17 Aug 2022 15:38:21 +0200 Subject: [PATCH] components update --- main/main.c | 4 ++++ sdkconfig | 18 ++++++++++++++++++ sdkconfig.old | 24 +++++++++++++++++++++--- 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/main/main.c b/main/main.c index ed8e5a8..505681e 100644 --- a/main/main.c +++ b/main/main.c @@ -66,11 +66,15 @@ void app_main(void) (CONFIG_WEBGUIAPP_WIFI_ENABLE && GetSysConf()->wifiSettings.Flags1.bIsAP)) { StartTimeGet(); + +#if CONFIG_WEBGUIAPP_MQTT_ENABLE if (GetSysConf()->mqttStation[0].Flags1.bIsGlobalEnabled || GetSysConf()->mqttStation[1].Flags1.bIsGlobalEnabled) { MQTTRun(); } +#endif + } /*Start web server*/ diff --git a/sdkconfig b/sdkconfig index 96dc51f..e5c4398 100644 --- a/sdkconfig +++ b/sdkconfig @@ -1253,6 +1253,10 @@ CONFIG_WEBGUIAPP_WIFI_GATEWAY_STA="192.168.1.150" # CONFIG_WEBGUIAPP_ETHERNET_ENABLE=y CONFIG_WEBGUIAPP_ETHERNET_ON=y +CONFIG_WEBGUIAPP_ETH_IP_DEFAULT="192.168.1.150" +CONFIG_WEBGUIAPP_ETH_MASK_DEFAULT="255.255.255.0" +CONFIG_WEBGUIAPP_ETH_GATEWAY_DEFAULT="192.168.1.150" +CONFIG_WEBGUIAPP_ETHERNET_DHCP_DEFAULT=y CONFIG_GPIO_RANGE_MIN=0 CONFIG_GPIO_RANGE_MAX=36 # CONFIG_USE_INTERNAL_ETHERNET is not set @@ -1297,6 +1301,20 @@ CONFIG_MODEM_UART_TX_BUFFER_SIZE=512 CONFIG_MODEM_UART_RX_BUFFER_SIZE=1024 # end of UART Configuration # end of GPRS settings + +# +# MQTT settings +# +CONFIG_WEBGUIAPP_MQTT_ENABLE=y +CONFIG_MQTT_CLIENTS_NUM=1 +CONFIG_MQTT_ON=y +CONFIG_MQTT_SERVER_URL="myfirstmqttserver.com" +CONFIG_MQTT_SERVER_PORT=1883 +CONFIG_MQTT_CLIENT_ID_1="DEVID1" +CONFIG_MQTT_ROOT_TOPIC="ROOTTOPIC" +CONFIG_MQTT_USERNAME="username" +CONFIG_MQTT_PASSWORD="password" +# end of MQTT settings # end of WebGuiApp configuration # diff --git a/sdkconfig.old b/sdkconfig.old index 74767d8..9afbfd3 100644 --- a/sdkconfig.old +++ b/sdkconfig.old @@ -91,11 +91,11 @@ CONFIG_ESPTOOLPY_FLASHFREQ_40M=y # CONFIG_ESPTOOLPY_FLASHFREQ_20M is not set CONFIG_ESPTOOLPY_FLASHFREQ="40m" # CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set -CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y -# CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set +# CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set +CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y # CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set # CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set -CONFIG_ESPTOOLPY_FLASHSIZE="2MB" +CONFIG_ESPTOOLPY_FLASHSIZE="4MB" CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y CONFIG_ESPTOOLPY_BEFORE_RESET=y # CONFIG_ESPTOOLPY_BEFORE_NORESET is not set @@ -1253,6 +1253,10 @@ CONFIG_WEBGUIAPP_WIFI_GATEWAY_STA="192.168.1.150" # CONFIG_WEBGUIAPP_ETHERNET_ENABLE=y CONFIG_WEBGUIAPP_ETHERNET_ON=y +CONFIG_WEBGUIAPP_ETH_IP_DEFAULT="192.168.1.150" +CONFIG_WEBGUIAPP_ETH_MASK_DEFAULT="255.255.255.0" +CONFIG_WEBGUIAPP_ETH_GATEWAY_DEFAULT="192.168.1.150" +# 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 @@ -1297,6 +1301,20 @@ CONFIG_MODEM_UART_TX_BUFFER_SIZE=512 CONFIG_MODEM_UART_RX_BUFFER_SIZE=1024 # end of UART Configuration # end of GPRS settings + +# +# MQTT settings +# +CONFIG_WEBGUIAPP_MQTT_ENABLE=y +CONFIG_MQTT_CLIENTS_NUM=1 +CONFIG_MQTT_ON=y +CONFIG_MQTT_SERVER_URL="myfirstmqttserver.com" +CONFIG_MQTT_SERVER_PORT=1883 +CONFIG_MQTT_CLIENT_ID_1="DEVID1" +CONFIG_MQTT_ROOT_TOPIC="ROOTTOPIC" +CONFIG_MQTT_USERNAME="username" +CONFIG_MQTT_PASSWORD="password" +# end of MQTT settings # end of WebGuiApp configuration #