部分修正
This commit is contained in:
1 parent
c52f1f665f
commit
efee86fab9
8 files changed
+15
-17
No files matched your search
@@ -89,7 +89,7 @@ void uart_thread_entry(void *parameter)
|
||||
|
||||
int start_uart_thread(void)
|
||||
{
|
||||
rt_thread_t tid = rt_thread_create("sccm",uart_thread_entry,RT_NULL,2048,21,10);
|
||||
rt_thread_t tid = rt_thread_create("sccm",uart_thread_entry,RT_NULL,2048,11,10);
|
||||
if (tid != RT_NULL)
|
||||
{
|
||||
rt_thread_startup(tid);
|
||||
|
||||
@@ -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,"Groups",cJSON_CreateString(machine_ID));
|
||||
}
|
||||
if (strcmp(api, "SC801") == 0)
|
||||
else if (strcmp(api, "SC801") == 0)
|
||||
{// 处理 SC801系统信息
|
||||
char systime[18] = {0}; // 初始化为 0
|
||||
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,"Step",cJSON_CreateString(Step));
|
||||
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,"Info",cJSON_CreateString(Info));
|
||||
cJSON_AddItemToObject(dat,"RUN",cJSON_CreateNumber(RUN));
|
||||
@@ -549,15 +550,8 @@ void proc_thread_entry(void *parameter)
|
||||
}else {
|
||||
p += strlen("]");
|
||||
}
|
||||
//清空输入队列
|
||||
for(int16_t i=0;i<MAX_INPUT_LEN;i++)
|
||||
{
|
||||
req->input[i]=0;
|
||||
}
|
||||
|
||||
//处理指令分析
|
||||
pasre_DAT(DATA_api,p);
|
||||
|
||||
// 回复
|
||||
int16_t total_len = strlen(machine_ID) + strlen(json_buffer) + 8;
|
||||
char t_buffer[total_len];
|
||||
@@ -566,7 +560,11 @@ void proc_thread_entry(void *parameter)
|
||||
}else{
|
||||
req->output_len=0;
|
||||
}
|
||||
|
||||
//清空输入队列
|
||||
for(int16_t i=0;i<MAX_INPUT_LEN;i++)
|
||||
{
|
||||
req->input[i]=0;
|
||||
}
|
||||
// 通知 UART 线程可以发送了
|
||||
if (req->sem)
|
||||
{
|
||||
|
||||
+1
-1
@@ -69,4 +69,4 @@ static int wdt_sample()
|
||||
return ret;
|
||||
}
|
||||
|
||||
INIT_APP_EXPORT(wdt_sample);
|
||||
//INIT_APP_EXPORT(wdt_sample);
|
||||
Reference in new issue
Block a user