diff --git a/TC1/http_server/app_httpd.c b/TC1/http_server/app_httpd.c index 5ba8474..45c26ef 100644 --- a/TC1/http_server/app_httpd.c +++ b/TC1/http_server/app_httpd.c @@ -46,6 +46,7 @@ #include "web_log.h" #include "timed_task/timed_task.h" #include "ota_server/user_ota.h" +#include "mqtt_server/user_mqtt_client.h" static bool is_http_init; static bool is_handlers_registered; @@ -108,7 +109,7 @@ static int HttpGetTc1Status(httpd_request_t *req) char* tc1_status = malloc(412); sprintf(tc1_status, TC1_STATUS_JSON, sockets, ip_status.mode, sys_config->micoSystemConfig.ssid, sys_config->micoSystemConfig.user_key, - ap_name, ap_key, MQTT_SERVER, MQTT_PORT, VERSION, ip_status.ip, ip_status.mask, ip_status.gateway, 0L); + ap_name, ap_key, MQTT_SERVER, MQTT_SERVER_PORT, VERSION, ip_status.ip, ip_status.mask, ip_status.gateway, 0L); OSStatus err = kNoErr; send_http(tc1_status, strlen(tc1_status), exit, &err); @@ -237,12 +238,11 @@ static int HttpSetMqttConfig(httpd_request_t *req) int buf_size = 97; char *buf = malloc(buf_size); - int mode = -1; err = httpd_get_data(req, buf, buf_size); require_noerr(err, exit); - sscanf(buf, "%s %d", MQTT_SERVER, &MQTT_PORT); + sscanf(buf, "%s %d", MQTT_SERVER, &MQTT_SERVER_PORT); user_mqtt_init(); send_http("OK", 2, exit, &err); diff --git a/TC1/mqtt_server/user_mqtt_client.c b/TC1/mqtt_server/user_mqtt_client.c index a2f755b..02627d5 100644 --- a/TC1/mqtt_server/user_mqtt_client.c +++ b/TC1/mqtt_server/user_mqtt_client.c @@ -38,7 +38,7 @@ #define MAX_MQTT_SEND_QUEUE_SIZE (10) char MQTT_SERVER[64] = "192.168.33.219"; -int MQTT_SERVER_PORT = 1883; +int MQTT_SERVER_PORT = 1883; #ifdef MQTT_CLIENT_SSL_ENABLE char* mqtt_server_ssl_cert_str = diff --git a/TC1/mqtt_server/user_mqtt_client.h b/TC1/mqtt_server/user_mqtt_client.h index f42d056..1dd37cb 100644 --- a/TC1/mqtt_server/user_mqtt_client.h +++ b/TC1/mqtt_server/user_mqtt_client.h @@ -10,6 +10,8 @@ #define MQTT_CMD_TIMEOUT 5000 // 5s #define MQTT_YIELD_TMIE 5000 // 5s +extern char MQTT_SERVER[64]; +extern int MQTT_SERVER_PORT; extern OSStatus user_mqtt_init(void); extern OSStatus user_mqtt_send(char *arg);