|
|
@ -123,7 +123,7 @@ void pasre_DAT(const char *api, const char *json_str) |
|
|
cJSON_AddItemToObject(dat,"SYSKEY",cJSON_CreateString(machine_ID)); |
|
|
cJSON_AddItemToObject(dat,"SYSKEY",cJSON_CreateString(machine_ID)); |
|
|
cJSON_AddItemToObject(dat,"Groups",cJSON_CreateString(machine_ID)); |
|
|
cJSON_AddItemToObject(dat,"Groups",cJSON_CreateString(machine_ID)); |
|
|
} |
|
|
} |
|
|
if (strcmp(api, "SC801") == 0) |
|
|
else if (strcmp(api, "SC801") == 0) |
|
|
{// 处理 SC801系统信息
|
|
|
{// 处理 SC801系统信息
|
|
|
char systime[18] = {0}; // 初始化为 0
|
|
|
char systime[18] = {0}; // 初始化为 0
|
|
|
rt_snprintf(systime, sizeof(systime),"%d-%d-%d_%d:%d:%d", |
|
|
rt_snprintf(systime, sizeof(systime),"%d-%d-%d_%d:%d:%d", |
|
|
@ -416,6 +416,7 @@ void pasre_DAT(const char *api, const char *json_str) |
|
|
cJSON_AddItemToObject(dat,"Process",cJSON_CreateString(Process)); |
|
|
cJSON_AddItemToObject(dat,"Process",cJSON_CreateString(Process)); |
|
|
cJSON_AddItemToObject(dat,"Step",cJSON_CreateString(Step)); |
|
|
cJSON_AddItemToObject(dat,"Step",cJSON_CreateString(Step)); |
|
|
cJSON_AddItemToObject(dat,"User",cJSON_CreateBool(MACHINE_USER)); |
|
|
cJSON_AddItemToObject(dat,"User",cJSON_CreateBool(MACHINE_USER)); |
|
|
|
|
|
cJSON_AddItemToObject(dat,"UserB",cJSON_CreateString("False")); |
|
|
cJSON_AddItemToObject(dat,"InfoS",cJSON_CreateNumber(UserInfoStart)); |
|
|
cJSON_AddItemToObject(dat,"InfoS",cJSON_CreateNumber(UserInfoStart)); |
|
|
cJSON_AddItemToObject(dat,"Info",cJSON_CreateString(Info)); |
|
|
cJSON_AddItemToObject(dat,"Info",cJSON_CreateString(Info)); |
|
|
cJSON_AddItemToObject(dat,"RUN",cJSON_CreateNumber(RUN)); |
|
|
cJSON_AddItemToObject(dat,"RUN",cJSON_CreateNumber(RUN)); |
|
|
@ -549,15 +550,8 @@ void proc_thread_entry(void *parameter) |
|
|
}else { |
|
|
}else { |
|
|
p += strlen("]"); |
|
|
p += strlen("]"); |
|
|
} |
|
|
} |
|
|
//清空输入队列
|
|
|
|
|
|
for(int16_t i=0;i<MAX_INPUT_LEN;i++) |
|
|
|
|
|
{ |
|
|
|
|
|
req->input[i]=0; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//处理指令分析
|
|
|
//处理指令分析
|
|
|
pasre_DAT(DATA_api,p); |
|
|
pasre_DAT(DATA_api,p); |
|
|
|
|
|
|
|
|
// 回复
|
|
|
// 回复
|
|
|
int16_t total_len = strlen(machine_ID) + strlen(json_buffer) + 8; |
|
|
int16_t total_len = strlen(machine_ID) + strlen(json_buffer) + 8; |
|
|
char t_buffer[total_len]; |
|
|
char t_buffer[total_len]; |
|
|
@ -566,7 +560,11 @@ void proc_thread_entry(void *parameter) |
|
|
}else{ |
|
|
}else{ |
|
|
req->output_len=0; |
|
|
req->output_len=0; |
|
|
} |
|
|
} |
|
|
|
|
|
//清空输入队列
|
|
|
|
|
|
for(int16_t i=0;i<MAX_INPUT_LEN;i++) |
|
|
|
|
|
{ |
|
|
|
|
|
req->input[i]=0; |
|
|
|
|
|
} |
|
|
// 通知 UART 线程可以发送了
|
|
|
// 通知 UART 线程可以发送了
|
|
|
if (req->sem) |
|
|
if (req->sem) |
|
|
{ |
|
|
{ |
|
|
|