autotest
/
xiuos
forked from xuos/xiuos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add reopen zigbee and modify the stacksize of zigbee receive thread

This commit is contained in:
Wang_Weigen 2021-09-27 16:32:44 +08:00
parent b0f717bee4
commit 626cbb084d
3 changed files with 17 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
APP_Framework/Framework/connection/adapter_agent.c
View File

@ -369,7 +369,7 @@ static int ATAgentInit(ATAgentType agent)
strncpy(at_utask.name, "recv_task", strlen("recv_task")); strncpy(at_utask.name, "recv_task", strlen("recv_task"));
at_utask.func_entry = ATAgentReceiveProcess; at_utask.func_entry = ATAgentReceiveProcess;
at_utask.func_param = agent; at_utask.func_param = agent;
at_utask.stack_size = 1024; at_utask.stack_size = 2048;
at_utask.prio = 18; at_utask.prio = 18;
agent->at_handler = UserTaskCreate(at_utask); agent->at_handler = UserTaskCreate(at_utask);
@ -448,7 +448,7 @@ ATReplyType CreateATReply(uint32 reply_max_len)
free(reply); free(reply);
return NULL; return NULL;
} }
memset(reply->reply_buffer,0,reply_max_len);
return reply; return reply;
} }

30
APP_Framework/Framework/connection/zigbee/E18/e18.c
View File

@ -159,15 +159,8 @@ static int E18NetworkModeConfig(struct Adapter *adapter)
break; break;
} }
if(!ret){
ret = AtCmdConfigAndCheck(adapter->agent, cmd_exit, "+OK");
if(ret < 0) {
printf("%s %d cmd[%s] config failed!\n",__func__,__LINE__,cmd_exit);
ret = -1;
}
}
out: out:
AtCmdConfigAndCheck(adapter->agent, cmd_exit, "+OK");
return ret; return ret;
} }
@ -221,20 +214,16 @@ static int E18NetRoleConfig(struct Adapter *adapter)
ret = -1; ret = -1;
break; break;
} }
if(!ret){
ret = AtCmdConfigAndCheck(adapter->agent, cmd_exit, "+OK");
if(ret < 0) {
printf("%s %d cmd[%s] config failed!\n",__func__,__LINE__,cmd_exit);
ret = -1;
}
}
out: out:
AtCmdConfigAndCheck(adapter->agent, cmd_exit, "+OK");
return ret; return ret;
} }
static int E18Open(struct Adapter *adapter) static int E18Open(struct Adapter *adapter)
{ {
int ret = 0; int ret = 0;
int try_times = 5;
if (NULL == adapter) { if (NULL == adapter) {
return -1; return -1;
@ -255,7 +244,16 @@ static int E18Open(struct Adapter *adapter)
ATAgentType at_agent = GetATAgent(agent_name); ATAgentType at_agent = GetATAgent(agent_name);
adapter->agent = at_agent; adapter->agent = at_agent;
} }
ret = E18NetRoleConfig(adapter);
try_again:
while(try_times--){
ret = E18NetRoleConfig(adapter);
if(ret < 0){
printf("E18NetRoleConfig failed [%d] times.\n",try_times);
goto try_again;
}
}
if(ret < 0){ if(ret < 0){
printf("E18NetRoleConfig failed\n"); printf("E18NetRoleConfig failed\n");
return -1; return -1;

22
APP_Framework/Framework/connection/zigbee/adapter_zigbee.c
View File

@ -91,11 +91,9 @@ int AdapterZigbeeInit(void)
return ret; return ret;
} }
/******************4G TEST*********************/ /******************TEST*********************/
int openzigbee(void) int openzigbee(void)
{ {
const char *send_msg = "SendHeart";
char recv_msg[128];
int ret = 0; int ret = 0;
struct Adapter* adapter = AdapterDeviceFindByName(ADAPTER_ZIGBEE_NAME); struct Adapter* adapter = AdapterDeviceFindByName(ADAPTER_ZIGBEE_NAME);
@ -118,24 +116,6 @@ int openzigbee(void)
printf("join adapter failed\n"); printf("join adapter failed\n");
return -1; return -1;
} }
adapter->net_role = COORDINATOR;
ret = AdapterDeviceControl(adapter, CONFIG_ZIGBEE_NET_ROLE, NULL);
if(ret < 0){
printf("control adapter failed\n");
return -1;
}
// while (1) {
// ret = AdapterDeviceSend(adapter, send_msg, strlen(send_msg));
// if(ret < 0){
// printf(" adapter send failed\n");
// break;
// }
// printf("zigbee send msg %s\n", send_msg);
// AdapterDeviceRecv(adapter, recv_msg, 128);
// printf("zigbee recv msg %s\n", recv_msg);
// }
#endif #endif
return 0; return 0;