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

重命名socket_configs

Browse Source
This commit is contained in:
zogodo
2020-02-08 23:34:47 +08:00
parent d60c92ece8
commit b3b420d63d
6 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
TC1/mqtt_server/user_function.c
View File

@@ -251,10 +251,10 @@ bool json_socket_analysis(int udp_flag, unsigned char x, cJSON * pJsonRoot, cJSO
if (cJSON_IsString(p_socket_setting_name))
{
return_flag = true;
sprintf(user_config->socket[x].name, p_socket_setting_name->valuestring);
sprintf(user_config->socket_configs[x].name, p_socket_setting_name->valuestring);
user_mqtt_hass_auto_name(x);
}
cJSON_AddStringToObject(json_socket_setting_send, "name", user_config->socket[x].name);
cJSON_AddStringToObject(json_socket_setting_send, "name", user_config->socket_configs[x].name);
}
//解析socket中setting中task----------------------------------------
@@ -267,7 +267,7 @@ bool json_socket_analysis(int udp_flag, unsigned char x, cJSON * pJsonRoot, cJSO
cJSON_AddItemToObject(json_socket_send, "setting", json_socket_setting_send);
}
}
cJSON_AddNumberToObject(json_socket_send, "on", user_config->socket[x].on);
cJSON_AddNumberToObject(json_socket_send, "on", user_config->socket_configs[x].on);
cJSON_AddItemToObject(pJsonSend, socket_str, json_socket_send);
return return_flag;
@@ -308,19 +308,19 @@ bool json_socket_task_analysis(unsigned char x, unsigned char y, cJSON * pJsonRo
&& cJSON_IsNumber(p_socket_task_on))
{
return_flag = true;
user_config->socket[x].time_tasks[y].hour = p_socket_task_hour->valueint;
user_config->socket[x].time_tasks[y].minute = p_socket_task_minute->valueint;
user_config->socket[x].time_tasks[y].repeat = p_socket_task_repeat->valueint;
user_config->socket[x].time_tasks[y].action = p_socket_task_action->valueint;
user_config->socket[x].time_tasks[y].on = p_socket_task_on->valueint;
user_config->socket_configs[x].time_tasks[y].hour = p_socket_task_hour->valueint;
user_config->socket_configs[x].time_tasks[y].minute = p_socket_task_minute->valueint;
user_config->socket_configs[x].time_tasks[y].repeat = p_socket_task_repeat->valueint;
user_config->socket_configs[x].time_tasks[y].action = p_socket_task_action->valueint;
user_config->socket_configs[x].time_tasks[y].on = p_socket_task_on->valueint;
}
}
cJSON_AddNumberToObject(json_socket_task_send, "hour", user_config->socket[x].time_tasks[y].hour);
cJSON_AddNumberToObject(json_socket_task_send, "minute", user_config->socket[x].time_tasks[y].minute);
cJSON_AddNumberToObject(json_socket_task_send, "repeat", user_config->socket[x].time_tasks[y].repeat);
cJSON_AddNumberToObject(json_socket_task_send, "action", user_config->socket[x].time_tasks[y].action);
cJSON_AddNumberToObject(json_socket_task_send, "on", user_config->socket[x].time_tasks[y].on);
cJSON_AddNumberToObject(json_socket_task_send, "hour", user_config->socket_configs[x].time_tasks[y].hour);
cJSON_AddNumberToObject(json_socket_task_send, "minute", user_config->socket_configs[x].time_tasks[y].minute);
cJSON_AddNumberToObject(json_socket_task_send, "repeat", user_config->socket_configs[x].time_tasks[y].repeat);
cJSON_AddNumberToObject(json_socket_task_send, "action", user_config->socket_configs[x].time_tasks[y].action);
cJSON_AddNumberToObject(json_socket_task_send, "on", user_config->socket_configs[x].time_tasks[y].on);
cJSON_AddItemToObject(pJsonSend, socket_task_str, json_socket_task_send);
return return_flag;

4
TC1/mqtt_server/user_mqtt_client.c
View File

@@ -519,7 +519,7 @@ OSStatus user_mqtt_send_socket_state(char socket_id)
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[(int)socket_id].on);
sprintf(send_buf, "{\"mac\":\"%s\",\"socket_%d\":{\"on\":%d}}", strMac, socket_id, (int)user_config->socket_configs[(int)socket_id].on);
oss_status = user_mqtt_send_topic(topic_buf, send_buf, 1);
}
if (send_buf) free(send_buf);
@@ -568,7 +568,7 @@ void user_mqtt_hass_auto_name(char socket_id)
"\"pl_on\":\"{\\\"mac\\\":\\\"%s\\\",\\\"socket_%d\\\":{\\\"on\\\":1}}\","
"\"pl_off\":\"{\\\"mac\\\":\\\"%s\\\",\\\"socket_%d\\\":{\\\"on\\\":0}}\""
"}",
user_config->socket[(int)socket_id].name, strMac, socket_id, strMac, socket_id, strMac, socket_id);
user_config->socket_configs[(int)socket_id].name, strMac, socket_id, strMac, socket_id, strMac, socket_id);
user_mqtt_send_topic(topic_buf, send_buf, 0);
}
if (send_buf)