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

重命名time_tasks

Browse Source
This commit is contained in:
zogodo
2020-02-08 23:26:12 +08:00
parent 4eb854b388
commit d60c92ece8
5 changed files with 37 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
TC1/mqtt_server/user_function.c
View File

@@ -258,7 +258,7 @@ bool json_socket_analysis(int udp_flag, unsigned char x, cJSON * pJsonRoot, cJSO
}
//解析socket中setting中task----------------------------------------
for (i = 0; i < SOCKET_TIME_TASK_NUM; i++)
for (i = 0; i < 5; i++)
{
if (json_socket_task_analysis(x, i, p_socket_setting, json_socket_setting_send))
return_flag = true;
@@ -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].task[y].hour = p_socket_task_hour->valueint;
user_config->socket[x].task[y].minute = p_socket_task_minute->valueint;
user_config->socket[x].task[y].repeat = p_socket_task_repeat->valueint;
user_config->socket[x].task[y].action = p_socket_task_action->valueint;
user_config->socket[x].task[y].on = p_socket_task_on->valueint;
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;
}
}
cJSON_AddNumberToObject(json_socket_task_send, "hour", user_config->socket[x].task[y].hour);
cJSON_AddNumberToObject(json_socket_task_send, "minute", user_config->socket[x].task[y].minute);
cJSON_AddNumberToObject(json_socket_task_send, "repeat", user_config->socket[x].task[y].repeat);
cJSON_AddNumberToObject(json_socket_task_send, "action", user_config->socket[x].task[y].action);
cJSON_AddNumberToObject(json_socket_task_send, "on", user_config->socket[x].task[y].on);
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_AddItemToObject(pJsonSend, socket_task_str, json_socket_task_send);
return return_flag;