userbogd/webguiapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'gitlab/main' into main

Browse Source
This commit is contained in:
Bogdan Pilyugin 2024-09-29 19:01:59 +02:00
commit 60f8299f59
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/MQTT.c
View File

@ -549,8 +549,8 @@ static void start_mqtt()
mqtt_cfg.password = GetSysConf()->mqttStation[i].UserPass; mqtt_cfg.password = GetSysConf()->mqttStation[i].UserPass;
#endif #endif
strcpy(tmp, GetSysConf()->mqttStation[i].ClientID); strcpy(tmp, GetSysConf()->mqttStation[i].ClientID);
strcat(tmp, "-"); //strcat(tmp, "-");
strcat(tmp, GetSysConf()->ID); //strcat(tmp, GetSysConf()->ID);
#if ESP_IDF_VERSION_MAJOR >= 5 #if ESP_IDF_VERSION_MAJOR >= 5
mqtt_cfg.credentials.client_id = tmp; mqtt_cfg.credentials.client_id = tmp;
mqtt_cfg.network.reconnect_timeout_ms = MQTT_RECONNECT_TIMEOUT * 1000; mqtt_cfg.network.reconnect_timeout_ms = MQTT_RECONNECT_TIMEOUT * 1000;