diff --git a/components/WebGUIAppComponent b/components/WebGUIAppComponent index cabc290..4b8b8a3 160000 --- a/components/WebGUIAppComponent +++ b/components/WebGUIAppComponent @@ -1 +1 @@ -Subproject commit cabc2904ea64e27dc8deb604d6b5594a048136cb +Subproject commit 4b8b8a36d327713a0c08998a7d11b538fd3a8a06 diff --git a/main/HTTPPrintCustom.c b/main/HTTPPrintCustom.c index a46e117..a1696c7 100644 --- a/main/HTTPPrintCustom.c +++ b/main/HTTPPrintCustom.c @@ -28,6 +28,11 @@ static void HTTPPrint_DEF(char *VarData, void *arg) snprintf(VarData, MAX_DYNVAR_LENGTH, "#DEF"); } +void HTTPPrint_topic2(char *VarData, void *arg) +{ + snprintf(VarData, MAX_DYNVAR_LENGTH, "%s", "custom-dyn_var"); +} + static void HTTPPrint_status_fail(char *VarData, void *arg) { snprintf(VarData, MAX_DYNVAR_LENGTH, "none"); @@ -36,6 +41,7 @@ static void HTTPPrint_status_fail(char *VarData, void *arg) dyn_var_handler_t HANDLERS_ARRAY_CUST[] = { /*ERROR report*/ + { "topic2", sizeof("topic2") - 1, &HTTPPrint_topic2 }, { "status_fail", sizeof("status_fail") - 1, &HTTPPrint_status_fail }, }; diff --git a/sdkconfig b/sdkconfig index bb4d9bc..13948d4 100644 --- a/sdkconfig +++ b/sdkconfig @@ -1292,12 +1292,12 @@ CONFIG_ETH_SPI_PHY_ADDR0=1 CONFIG_WEBGUIAPP_MQTT_ENABLE=y CONFIG_MQTT_CLIENTS_NUM=1 CONFIG_MQTT_ON=y -CONFIG_MQTT_SERVER_URL="myfirstmqttserver.com" +CONFIG_MQTT_SERVER_URL="iotronic.cloud" CONFIG_MQTT_SERVER_PORT=1883 CONFIG_MQTT_CLIENT_ID_1="DEVID1" -CONFIG_MQTT_ROOT_TOPIC="ROOTTOPIC" -CONFIG_MQTT_USERNAME="username" -CONFIG_MQTT_PASSWORD="password" +CONFIG_MQTT_ROOT_TOPIC="CHARGEPOINT" +CONFIG_MQTT_USERNAME="chargepoint" +CONFIG_MQTT_PASSWORD="chargepoint" # end of MQTT settings # diff --git a/sdkconfig.old b/sdkconfig.old index 98bcbcb..a28fba5 100644 --- a/sdkconfig.old +++ b/sdkconfig.old @@ -1215,7 +1215,7 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y # # WebGuiApp configuration # -CONFIG_WEBGUIAPP_PROJECT_VER="0.0.0.0000" +CONFIG_WEBGUIAPP_PROJECT_VER="0.0.0.0001" CONFIG_WEBGUIAPP_HOSTNAME="DEVICE_HOSTNAME" CONFIG_WEBGUIAPP_USERNAME="user" CONFIG_WEBGUIAPP_USERPASS="password" @@ -1290,14 +1290,15 @@ CONFIG_ETH_SPI_PHY_ADDR0=1 # MQTT settings # CONFIG_WEBGUIAPP_MQTT_ENABLE=y -CONFIG_MQTT_CLIENTS_NUM=1 +CONFIG_MQTT_CLIENTS_NUM=2 CONFIG_MQTT_ON=y -CONFIG_MQTT_SERVER_URL="myfirstmqttserver.com" +CONFIG_MQTT_SERVER_URL="iotronic.cloud" CONFIG_MQTT_SERVER_PORT=1883 CONFIG_MQTT_CLIENT_ID_1="DEVID1" -CONFIG_MQTT_ROOT_TOPIC="ROOTTOPIC" -CONFIG_MQTT_USERNAME="username" -CONFIG_MQTT_PASSWORD="password" +CONFIG_MQTT_CLIENT_ID_2="DEVID2" +CONFIG_MQTT_ROOT_TOPIC="CHARGEPOINT" +CONFIG_MQTT_USERNAME="chargepoint" +CONFIG_MQTT_PASSWORD="chargepoint" # end of MQTT settings #