GitHub/zTC1
1
0
Fork 0
mirror of https://github.com/oopuuu/zTC1.git synced 2025-12-12 21:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

str_mac

Browse Source
This commit is contained in:
zogodo
2020-02-16 18:44:24 +08:00
parent 6cca9a0afa
commit c7a323091d
5 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
TC1/main.c
View File

@@ -14,7 +14,6 @@
char rtc_init = 0; //sntp校时成功标志位 char rtc_init = 0; //sntp校时成功标志位
uint32_t total_time = 0; uint32_t total_time = 0;
char strMac[16] = { 0 };
char str_mac[16] = { 0 }; char str_mac[16] = { 0 };
uint32_t power = 0; uint32_t power = 0;
@@ -106,7 +105,6 @@ int application_start(void)
if (sys_config->micoSystemConfig.name[0] == 1) if (sys_config->micoSystemConfig.name[0] == 1)
{ {
strcpy(strMac, str_mac);
sprintf(sys_config->micoSystemConfig.name, ZTC1_NAME, str_mac+8); sprintf(sys_config->micoSystemConfig.name, ZTC1_NAME, str_mac+8);
} }
@@ -152,7 +150,7 @@ int application_start(void)
last_p_count = p_count; last_p_count = p_count;
//SetPowerRecord(&power_record, power2); //SetPowerRecord(&power_record, power2);
sprintf(power_buf, "{\"mac\":\"%s\",\"power\":\"%u.%u\",\"total_time\":%u}", 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); UserSend(0, power_buf);
UserMqttHassPower(); UserMqttHassPower();

1
TC1/main.h
View File

@@ -53,7 +53,6 @@ typedef struct
extern char rtc_init; extern char rtc_init;
extern uint32_t total_time; extern uint32_t total_time;
extern char strMac[16];
extern char str_mac[16]; extern char str_mac[16];
extern uint32_t power; extern uint32_t power;
extern system_config_t* sys_config; extern system_config_t* sys_config;

6
TC1/mqtt_server/user_function.c
View File

@@ -46,7 +46,7 @@ void UserFunctionCmdReceived(int udp_flag, char* pusrdata)
{ {
cJSON *pRoot = cJSON_CreateObject(); cJSON *pRoot = cJSON_CreateObject();
cJSON_AddStringToObject(pRoot, "name", sys_config->micoSystemConfig.name); 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_AddNumberToObject(pRoot, "type", TYPE);
cJSON_AddStringToObject(pRoot, "type_name", TYPE_NAME); 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 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 *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) if(p_cmd && cJSON_IsString(p_cmd) && strcmp(p_cmd->valuestring, "restart") == 0)

28
TC1/mqtt_server/user_mqtt_client.c
View File

@@ -146,7 +146,7 @@ void UserMqttTimerFunc(void *arg)
break; break;
case 15: case 15:
if (buf1 == NULL) break; 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); UserFunctionCmdReceived(0, buf1);
free(buf1); free(buf1);
break; break;
@@ -164,7 +164,7 @@ OSStatus UserMqttInit(void)
OSStatus err = kNoErr; OSStatus err = kNoErr;
sprintf(topic_set, MQTT_CLIENT_SUB_TOPIC1); 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 #ifdef MQTT_CLIENT_SSL_ENABLE
int mqtt_thread_stack_size = 0x3000; int mqtt_thread_stack_size = 0x3000;
@@ -315,7 +315,7 @@ void MqttClientThread(mico_thread_arg_t arg)
/* 3. create mqtt client connection */ /* 3. create mqtt client connection */
connectData.willFlag = 0; connectData.willFlag = 0;
connectData.MQTTVersion = 4; // 3: 3.1, 4: v3.1.1 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.username.cstring = user_config->mqtt_user;
connectData.password.cstring = user_config->mqtt_password; connectData.password.cstring = user_config->mqtt_password;
connectData.keepAliveInterval = MQTT_CLIENT_KEEPALIVE; connectData.keepAliveInterval = MQTT_CLIENT_KEEPALIVE;
@@ -499,8 +499,8 @@ OSStatus UserMqttSendSocketState(char socket_id)
OSStatus oss_status = kUnknownErr; OSStatus oss_status = kUnknownErr;
if (send_buf != NULL && topic_buf != NULL) if (send_buf != NULL && topic_buf != NULL)
{ {
sprintf(topic_buf, "homeassistant/switch/%s/socket_%d/state", strMac, (int)socket_id); sprintf(topic_buf, "homeassistant/switch/%s/socket_%d/state", str_mac, (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(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); oss_status = UserMqttSendTopic(topic_buf, send_buf, 1);
} }
if (send_buf) free(send_buf); if (send_buf) free(send_buf);
@@ -518,7 +518,7 @@ void UserMqttHassAuto(char socket_id)
topic_buf = malloc(128); // topic_buf = malloc(128); //
if (send_buf != NULL && topic_buf != NULL) 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, "{" sprintf(send_buf, "{"
"\"name\":\"zTC1_socket%d_%s\"," "\"name\":\"zTC1_socket%d_%s\","
"\"stat_t\":\"homeassistant/switch/%s/socket_%d/state\"," "\"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_on\":\"{\\\"mac\\\":\\\"%s\\\",\\\"socket_%d\\\":{\\\"on\\\":1}}\","
"\"pl_off\":\"{\\\"mac\\\":\\\"%s\\\",\\\"socket_%d\\\":{\\\"on\\\":0}}\"" "\"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); UserMqttSendTopic(topic_buf, send_buf, 1);
} }
if (send_buf) free(send_buf); if (send_buf) free(send_buf);
@@ -541,7 +541,7 @@ void UserMqttHassAutoName(char socket_id)
topic_buf = (char *) malloc(64); topic_buf = (char *) malloc(64);
if (send_buf != NULL && topic_buf != NULL) 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, "{" sprintf(send_buf, "{"
"\"name\":\"%s\"," "\"name\":\"%s\","
"\"stat_t\":\"homeassistant/switch/%s/socket_%d/state\"," "\"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_on\":\"{\\\"mac\\\":\\\"%s\\\",\\\"socket_%d\\\":{\\\"on\\\":1}}\","
"\"pl_off\":\"{\\\"mac\\\":\\\"%s\\\",\\\"socket_%d\\\":{\\\"on\\\":0}}\"" "\"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); UserMqttSendTopic(topic_buf, send_buf, 0);
} }
if (send_buf) if (send_buf)
@@ -566,7 +566,7 @@ void UserMqttHassAutoPower(void)
topic_buf = malloc(128); // topic_buf = malloc(128); //
if (send_buf != NULL && topic_buf != NULL) 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, "{" sprintf(send_buf, "{"
"\"name\":\"zTC1_power_%s\"," "\"name\":\"zTC1_power_%s\","
"\"state_topic\":\"homeassistant/sensor/%s/power/state\"," "\"state_topic\":\"homeassistant/sensor/%s/power/state\","
@@ -574,7 +574,7 @@ void UserMqttHassAutoPower(void)
"\"icon\":\"mdi:gauge\"," "\"icon\":\"mdi:gauge\","
"\"value_template\":\"{{ value_json.power }}\"" "\"value_template\":\"{{ value_json.power }}\""
"}", "}",
strMac + 8, strMac); str_mac + 8, str_mac);
UserMqttSendTopic(topic_buf, send_buf, 1); UserMqttSendTopic(topic_buf, send_buf, 1);
} }
@@ -589,7 +589,7 @@ void UserMqttHassAutoPowerName(void)
topic_buf = (char *) malloc(64); // topic_buf = (char *) malloc(64); //
if (send_buf != NULL && topic_buf != NULL) 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, "{" sprintf(send_buf, "{"
"\"name\":\"zTC1xxxxxx\"," "\"name\":\"zTC1xxxxxx\","
"\"state_topic\":\"homeassistant/sensor/%s/power/state\"," "\"state_topic\":\"homeassistant/sensor/%s/power/state\","
@@ -597,7 +597,7 @@ void UserMqttHassAutoPowerName(void)
"\"icon\":\"mdi:gauge\"," "\"icon\":\"mdi:gauge\","
"\"value_template\":\"{{ value_json.power }}\"" "\"value_template\":\"{{ value_json.power }}\""
"}", "}",
strMac); str_mac);
send_buf[13] = 0xe5; send_buf[13] = 0xe5;
send_buf[14] = 0x8a; send_buf[14] = 0x8a;
send_buf[15] = 0x9f; send_buf[15] = 0x9f;
@@ -620,7 +620,7 @@ void UserMqttHassPower(void)
topic_buf = malloc(128); // topic_buf = malloc(128); //
if (send_buf != NULL && topic_buf != NULL) 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)); sprintf(send_buf, "{\"power\":\"%d.%d\"}", (int)(power/10), (int)(power%10));
UserMqttSendTopic(topic_buf, send_buf, 0); UserMqttSendTopic(topic_buf, send_buf, 0);
} }

6
TC1/ota_server/user_ota.c
View File

@@ -19,16 +19,16 @@ static void OtaServerStatusHandler(OTA_STATE_E state, float progress)
ota_progress = progress; ota_progress = progress;
os_log("ota server is loading, progress %.2f%%", progress); os_log("ota server is loading, progress %.2f%%", progress);
if (((int) progress)%10 == 1) 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; break;
case OTA_SUCCE: case OTA_SUCCE:
ota_progress = 100; ota_progress = 100;
os_log("ota server daemons success"); os_log("ota server daemons success");
sprintf(str, "{\"mac\":\"%s\",\"ota_progress\":100}", strMac); sprintf(str, "{\"mac\":\"%s\",\"ota_progress\":100}", str_mac);
break; break;
case OTA_FAIL: case OTA_FAIL:
os_log("ota server daemons failed"); os_log("ota server daemons failed");
sprintf(str, "{\"mac\":\"%s\",\"ota_progress\":-1}", strMac); sprintf(str, "{\"mac\":\"%s\",\"ota_progress\":-1}", str_mac);
break; break;
default: default:
break; break;