From c7a323091df78cdaa898ef71e3b3f539055d3191 Mon Sep 17 00:00:00 2001 From: zogodo <742782908@qq.com> Date: Sun, 16 Feb 2020 18:44:24 +0800 Subject: [PATCH] str_mac --- TC1/main.c | 4 +--- TC1/main.h | 1 - TC1/mqtt_server/user_function.c | 6 +++--- TC1/mqtt_server/user_mqtt_client.c | 28 ++++++++++++++-------------- TC1/ota_server/user_ota.c | 6 +++--- 5 files changed, 21 insertions(+), 24 deletions(-) diff --git a/TC1/main.c b/TC1/main.c index 6eb7974..d8777be 100644 --- a/TC1/main.c +++ b/TC1/main.c @@ -14,7 +14,6 @@ char rtc_init = 0; //sntp校时成功标志位 uint32_t total_time = 0; -char strMac[16] = { 0 }; char str_mac[16] = { 0 }; uint32_t power = 0; @@ -106,7 +105,6 @@ int application_start(void) if (sys_config->micoSystemConfig.name[0] == 1) { - strcpy(strMac, str_mac); sprintf(sys_config->micoSystemConfig.name, ZTC1_NAME, str_mac+8); } @@ -152,7 +150,7 @@ int application_start(void) last_p_count = p_count; //SetPowerRecord(&power_record, power2); sprintf(power_buf, "{\"mac\":\"%s\",\"power\":\"%u.%u\",\"total_time\":%u}", - strMac, (unsigned int)(power2 / 10), (unsigned int)(power2 % 10), (unsigned int)total_time); + str_mac, (unsigned int)(power2 / 10), (unsigned int)(power2 % 10), (unsigned int)total_time); UserSend(0, power_buf); UserMqttHassPower(); diff --git a/TC1/main.h b/TC1/main.h index 62cf99b..6f42420 100644 --- a/TC1/main.h +++ b/TC1/main.h @@ -53,7 +53,6 @@ typedef struct extern char rtc_init; extern uint32_t total_time; -extern char strMac[16]; extern char str_mac[16]; extern uint32_t power; extern system_config_t* sys_config; diff --git a/TC1/mqtt_server/user_function.c b/TC1/mqtt_server/user_function.c index c6f79e0..65ed087 100644 --- a/TC1/mqtt_server/user_function.c +++ b/TC1/mqtt_server/user_function.c @@ -46,7 +46,7 @@ void UserFunctionCmdReceived(int udp_flag, char* pusrdata) { cJSON *pRoot = cJSON_CreateObject(); cJSON_AddStringToObject(pRoot, "name", sys_config->micoSystemConfig.name); - cJSON_AddStringToObject(pRoot, "mac", strMac); + cJSON_AddStringToObject(pRoot, "mac", str_mac); cJSON_AddNumberToObject(pRoot, "type", TYPE); cJSON_AddStringToObject(pRoot, "type_name", TYPE_NAME); @@ -66,11 +66,11 @@ void UserFunctionCmdReceived(int udp_flag, char* pusrdata) //开始正式处理所有命令 if ((p_name && cJSON_IsString(p_name) && strcmp(p_name->valuestring, sys_config->micoSystemConfig.name) == 0) //name - || (p_mac && cJSON_IsString(p_mac) && strcmp(p_mac->valuestring, strMac) == 0) //mac + || (p_mac && cJSON_IsString(p_mac) && strcmp(p_mac->valuestring, str_mac) == 0) //mac ) { cJSON *json_send = cJSON_CreateObject(); - cJSON_AddStringToObject(json_send, "mac", strMac); + cJSON_AddStringToObject(json_send, "mac", str_mac); //解析重启命令 if(p_cmd && cJSON_IsString(p_cmd) && strcmp(p_cmd->valuestring, "restart") == 0) diff --git a/TC1/mqtt_server/user_mqtt_client.c b/TC1/mqtt_server/user_mqtt_client.c index ba843b2..55a0aab 100644 --- a/TC1/mqtt_server/user_mqtt_client.c +++ b/TC1/mqtt_server/user_mqtt_client.c @@ -146,7 +146,7 @@ void UserMqttTimerFunc(void *arg) break; case 15: if (buf1 == NULL) break; - sprintf(buf1, "{\"mac\":\"%s\",\"version\":null,\"socket_0\":{\"on\":null,\"setting\":{\"name\":null}},\"socket_1\":{\"on\":null,\"setting\":{\"name\":null}},\"socket_2\":{\"on\":null,\"setting\":{\"name\":null}},\"socket_3\":{\"on\":null,\"setting\":{\"name\":null}},\"socket_4\":{\"on\":null,\"setting\":{\"name\":null}},\"socket_5\":{\"on\":null,\"setting\":{\"name\":null}}}", strMac); + sprintf(buf1, "{\"mac\":\"%s\",\"version\":null,\"socket_0\":{\"on\":null,\"setting\":{\"name\":null}},\"socket_1\":{\"on\":null,\"setting\":{\"name\":null}},\"socket_2\":{\"on\":null,\"setting\":{\"name\":null}},\"socket_3\":{\"on\":null,\"setting\":{\"name\":null}},\"socket_4\":{\"on\":null,\"setting\":{\"name\":null}},\"socket_5\":{\"on\":null,\"setting\":{\"name\":null}}}", str_mac); UserFunctionCmdReceived(0, buf1); free(buf1); break; @@ -164,7 +164,7 @@ OSStatus UserMqttInit(void) OSStatus err = kNoErr; sprintf(topic_set, MQTT_CLIENT_SUB_TOPIC1); - sprintf(topic_state, MQTT_CLIENT_PUB_TOPIC, strMac); + sprintf(topic_state, MQTT_CLIENT_PUB_TOPIC, str_mac); #ifdef MQTT_CLIENT_SSL_ENABLE int mqtt_thread_stack_size = 0x3000; @@ -315,7 +315,7 @@ void MqttClientThread(mico_thread_arg_t arg) /* 3. create mqtt client connection */ connectData.willFlag = 0; connectData.MQTTVersion = 4; // 3: 3.1, 4: v3.1.1 - connectData.clientID.cstring = strMac; + connectData.clientID.cstring = str_mac; connectData.username.cstring = user_config->mqtt_user; connectData.password.cstring = user_config->mqtt_password; connectData.keepAliveInterval = MQTT_CLIENT_KEEPALIVE; @@ -499,8 +499,8 @@ OSStatus UserMqttSendSocketState(char socket_id) OSStatus oss_status = kUnknownErr; if (send_buf != NULL && topic_buf != NULL) { - sprintf(topic_buf, "homeassistant/switch/%s/socket_%d/state", strMac, (int)socket_id); - sprintf(send_buf, "{\"mac\":\"%s\",\"socket_%d\":{\"on\":%d}}", strMac, socket_id, (int)user_config->socket_configs[(int)socket_id].on); + sprintf(topic_buf, "homeassistant/switch/%s/socket_%d/state", str_mac, (int)socket_id); + sprintf(send_buf, "{\"mac\":\"%s\",\"socket_%d\":{\"on\":%d}}", str_mac, socket_id, (int)user_config->socket_configs[(int)socket_id].on); oss_status = UserMqttSendTopic(topic_buf, send_buf, 1); } if (send_buf) free(send_buf); @@ -518,7 +518,7 @@ void UserMqttHassAuto(char socket_id) topic_buf = malloc(128); // if (send_buf != NULL && topic_buf != NULL) { - sprintf(topic_buf, "homeassistant/switch/%s/socket_%d/config", strMac, socket_id); + sprintf(topic_buf, "homeassistant/switch/%s/socket_%d/config", str_mac, socket_id); sprintf(send_buf, "{" "\"name\":\"zTC1_socket%d_%s\"," "\"stat_t\":\"homeassistant/switch/%s/socket_%d/state\"," @@ -526,7 +526,7 @@ void UserMqttHassAuto(char socket_id) "\"pl_on\":\"{\\\"mac\\\":\\\"%s\\\",\\\"socket_%d\\\":{\\\"on\\\":1}}\"," "\"pl_off\":\"{\\\"mac\\\":\\\"%s\\\",\\\"socket_%d\\\":{\\\"on\\\":0}}\"" "}", - socket_id, strMac + 8, strMac, socket_id, strMac, socket_id, strMac, socket_id); + socket_id, str_mac + 8, str_mac, socket_id, str_mac, socket_id, str_mac, socket_id); UserMqttSendTopic(topic_buf, send_buf, 1); } if (send_buf) free(send_buf); @@ -541,7 +541,7 @@ void UserMqttHassAutoName(char socket_id) topic_buf = (char *) malloc(64); if (send_buf != NULL && topic_buf != NULL) { - sprintf(topic_buf, "homeassistant/switch/%s/socket_%d/config", strMac, socket_id); + sprintf(topic_buf, "homeassistant/switch/%s/socket_%d/config", str_mac, socket_id); sprintf(send_buf, "{" "\"name\":\"%s\"," "\"stat_t\":\"homeassistant/switch/%s/socket_%d/state\"," @@ -549,7 +549,7 @@ void UserMqttHassAutoName(char socket_id) "\"pl_on\":\"{\\\"mac\\\":\\\"%s\\\",\\\"socket_%d\\\":{\\\"on\\\":1}}\"," "\"pl_off\":\"{\\\"mac\\\":\\\"%s\\\",\\\"socket_%d\\\":{\\\"on\\\":0}}\"" "}", - user_config->socket_configs[(int)socket_id].name, strMac, socket_id, strMac, socket_id, strMac, socket_id); + user_config->socket_configs[(int)socket_id].name, str_mac, socket_id, str_mac, socket_id, str_mac, socket_id); UserMqttSendTopic(topic_buf, send_buf, 0); } if (send_buf) @@ -566,7 +566,7 @@ void UserMqttHassAutoPower(void) topic_buf = malloc(128); // if (send_buf != NULL && topic_buf != NULL) { - sprintf(topic_buf, "homeassistant/sensor/%s/power/config", strMac); + sprintf(topic_buf, "homeassistant/sensor/%s/power/config", str_mac); sprintf(send_buf, "{" "\"name\":\"zTC1_power_%s\"," "\"state_topic\":\"homeassistant/sensor/%s/power/state\"," @@ -574,7 +574,7 @@ void UserMqttHassAutoPower(void) "\"icon\":\"mdi:gauge\"," "\"value_template\":\"{{ value_json.power }}\"" "}", - strMac + 8, strMac); + str_mac + 8, str_mac); UserMqttSendTopic(topic_buf, send_buf, 1); } @@ -589,7 +589,7 @@ void UserMqttHassAutoPowerName(void) topic_buf = (char *) malloc(64); // if (send_buf != NULL && topic_buf != NULL) { - sprintf(topic_buf, "homeassistant/sensor/%s/power/config", strMac); + sprintf(topic_buf, "homeassistant/sensor/%s/power/config", str_mac); sprintf(send_buf, "{" "\"name\":\"zTC1xxxxxx\"," "\"state_topic\":\"homeassistant/sensor/%s/power/state\"," @@ -597,7 +597,7 @@ void UserMqttHassAutoPowerName(void) "\"icon\":\"mdi:gauge\"," "\"value_template\":\"{{ value_json.power }}\"" "}", - strMac); + str_mac); send_buf[13] = 0xe5; send_buf[14] = 0x8a; send_buf[15] = 0x9f; @@ -620,7 +620,7 @@ void UserMqttHassPower(void) topic_buf = malloc(128); // if (send_buf != NULL && topic_buf != NULL) { - sprintf(topic_buf, "homeassistant/sensor/%s/power/state", strMac); + sprintf(topic_buf, "homeassistant/sensor/%s/power/state", str_mac); sprintf(send_buf, "{\"power\":\"%d.%d\"}", (int)(power/10), (int)(power%10)); UserMqttSendTopic(topic_buf, send_buf, 0); } diff --git a/TC1/ota_server/user_ota.c b/TC1/ota_server/user_ota.c index 61f79ef..daca853 100644 --- a/TC1/ota_server/user_ota.c +++ b/TC1/ota_server/user_ota.c @@ -19,16 +19,16 @@ static void OtaServerStatusHandler(OTA_STATE_E state, float progress) ota_progress = progress; os_log("ota server is loading, progress %.2f%%", progress); if (((int) progress)%10 == 1) - sprintf(str, "{\"mac\":\"%s\",\"ota_progress\":%d}", strMac,((int) progress)); + sprintf(str, "{\"mac\":\"%s\",\"ota_progress\":%d}", str_mac,((int) progress)); break; case OTA_SUCCE: ota_progress = 100; os_log("ota server daemons success"); - sprintf(str, "{\"mac\":\"%s\",\"ota_progress\":100}", strMac); + sprintf(str, "{\"mac\":\"%s\",\"ota_progress\":100}", str_mac); break; case OTA_FAIL: os_log("ota server daemons failed"); - sprintf(str, "{\"mac\":\"%s\",\"ota_progress\":-1}", strMac); + sprintf(str, "{\"mac\":\"%s\",\"ota_progress\":-1}", str_mac); break; default: break;