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

debug nbiot pass with some modification

This commit is contained in:
Wang_Weigen 2021-10-21 15:17:14 +08:00
parent abe138ab27
commit 281a3b672a
6 changed files with 98 additions and 430 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

@ -309,9 +309,9 @@ static int GetCompleteATReply(ATAgentType agent)
while (1) {
PrivRead(agent->fd, &ch, 1);
#ifdef CONNECTION_FRAMEWORK_DEBUG
printf(" %c (0x%x)\n", ch, ch);
#endif
if (agent->receive_mode == ENTM_MODE){
if (agent->entm_recv_len < ENTM_RECV_MAX) {
PrivMutexObtain(&agent->lock);

7
APP_Framework/Framework/connection/nbiot/adapter_nbiot.c
View File

@ -124,7 +124,7 @@ int closenb(void)
struct Adapter* adapter = AdapterDeviceFindByName(ADAPTER_NBIOT_NAME);
ret = AdapterDeviceConnect(adapter, 1, "192.168.131.20","3333",1);
ret = AdapterDeviceConnect(adapter, 1, "101.68.82.219","9898",1);
if(ret < 0){
printf(" adapter send failed\n");
return -1;
@ -139,12 +139,13 @@ int closenb(void)
int sendnb(int argc, char *argv[])
{
const char *send_msg = argv[1];
int msg_len = atoi(argv[2]);
int ret = 0;
struct Adapter* adapter = AdapterDeviceFindByName(ADAPTER_NBIOT_NAME);
printf("send argv1 %s\n",argv[1]);
ret = AdapterDeviceSend(adapter, send_msg, strlen(send_msg));
printf("send argv1 %s len = %d\n",argv[1],msg_len);
ret = AdapterDeviceSend(adapter, send_msg, msg_len);
if(ret < 0){
printf(" adapter send failed\n");
return -1;

2
APP_Framework/Framework/connection/nbiot/bc28/Kconfig
View File

@ -17,7 +17,7 @@ if ADD_XIUOS_FETURES
config ADAPTER_BC28_DRIVER
string "BC28 device uart driver path"
default "/dev/uart2_dev2"
default "/dev/usart2_dev2"
depends on !ADAPTER_BC28_DRIVER_EXTUART
if ADAPTER_BC28_DRIVER_EXTUART

94
APP_Framework/Framework/connection/nbiot/bc28/bc28.c
View File

@ -100,6 +100,76 @@ static void BC28PowerSet(void)
PrivClose(pin_fd);
}
int NBIoTStatusCheck(struct Adapter *adapter )
{
int32 result = 0;
if (!adapter ){
return -1;
}
char at_cmd[64] = {0};
AtSetReplyEndChar(adapter->agent, 0x4F, 0x4B); /* set receive end flag as 'OK'*/
memcpy(at_cmd, "AT+CSQ", 6);
strcat(at_cmd, "\n");
printf("cmd : %s\n", at_cmd);
result = AtCmdConfigAndCheck(adapter->agent, at_cmd, "OK");
if(result < 0) {
printf("%s %d cmd[%s] config failed!\n",__func__,__LINE__,at_cmd);
result = -1;
}
memcpy(at_cmd, "AT+CFUN?", 8);
strcat(at_cmd, "\n");
printf("cmd : %s\n", at_cmd);
result = AtCmdConfigAndCheck(adapter->agent, at_cmd, "OK");
if(result < 0) {
printf("%s %d cmd[%s] config failed!\n",__func__,__LINE__,at_cmd);
result = -1;
}
memcpy(at_cmd, "AT+CIMI", 7);
strcat(at_cmd, "\n");
printf("cmd : %s\n", at_cmd);
result = AtCmdConfigAndCheck(adapter->agent, at_cmd, "OK");
if(result < 0) {
printf("%s %d cmd[%s] config failed!\n",__func__,__LINE__,at_cmd);
result = -1;
}
memcpy(at_cmd, "AT+CEREG?", 9);
strcat(at_cmd, "\n");
printf("cmd : %s\n", at_cmd);
result = AtCmdConfigAndCheck(adapter->agent, at_cmd, "OK");
if(result < 0) {
printf("%s %d cmd[%s] config failed!\n",__func__,__LINE__,at_cmd);
result = -1;
}
memcpy(at_cmd, "AT+CGATT?", 9);
strcat(at_cmd, "\n");
printf("cmd : %s\n", at_cmd);
result = AtCmdConfigAndCheck(adapter->agent, at_cmd, "OK");
if(result < 0) {
printf("%s %d cmd[%s] config failed!\n",__func__,__LINE__,at_cmd);
result = -1;
}
memcpy(at_cmd, "AT+CGPADDR", 10);
strcat(at_cmd, "\n");
printf("cmd : %s\n", at_cmd);
result = AtCmdConfigAndCheck(adapter->agent, at_cmd, "OK");
if(result < 0) {
printf("%s %d cmd[%s] config failed!\n",__func__,__LINE__,at_cmd);
result = -1;
}
return result;
}
/**
* @description: NBIoT device create a socket connection
* @param adapter - NBIoT adapter AT
@ -175,6 +245,9 @@ int NBIoTSocketCreate(struct Adapter *adapter, struct Socket *socket )
strcat(at_cmd, "\n");
printf("cmd : %s\n", at_cmd);
AtSetReplyEndChar(adapter->agent, 0x4F, 0x4B); /* set receive end flag as 'OK'*/
result = AtCmdConfigAndCheck(adapter->agent, at_cmd, "OK");
if(result < 0) {
printf("%s %d cmd[%s] config failed!\n",__func__,__LINE__,at_cmd);
@ -212,6 +285,7 @@ int NBIoTSocketDelete(struct Adapter *adapter )
strcat(at_cmd, "\n");
printf("cmd : %s\n", at_cmd);
AtSetReplyCharNum(adapter->agent, 1);
ATOrderSend(adapter->agent, REPLY_TIME_OUT, NULL, at_cmd);
PrivTaskDelay(300);
@ -246,9 +320,14 @@ static int BC28Open(struct Adapter *adapter)
}
create_socket.type = SOCKET_TYPE_STREAM;
create_socket.listen_port = 0;
create_socket.socket_id = 0;
create_socket.socket_id = 1;
create_socket.af_type = NET_TYPE_AF_INET;
BC28PowerSet(); /* reset bc28 module by set reset pin */
PrivTaskDelay(6000);
NBIoTStatusCheck(adapter); /* ask module status*/
/*step3: create a tcp socket default */
ret = NBIoTSocketCreate(adapter, &create_socket);
if(ret < 0){
@ -323,6 +402,7 @@ static int BC28Connect(struct Adapter *adapter, enum NetRoleType net_role, const
strcat(at_cmd, "\n");
printf("cmd : %s\n", at_cmd);
AtSetReplyEndChar(adapter->agent, 0x4F, 0x4B);
result = AtCmdConfigAndCheck(adapter->agent, at_cmd, "OK");
if(result < 0) {
printf("%s %d cmd[%s] config failed!\n",__func__,__LINE__,at_cmd);
@ -376,6 +456,7 @@ static int BC28Send(struct Adapter *adapter, const void *buf, size_t len)
}
printf("cmd : %s\n", at_cmd);
AtSetReplyEndChar(adapter->agent, 0x4F, 0x4B);
result = AtCmdConfigAndCheck(adapter->agent, at_cmd, "OK");
if(result < 0) {
printf("%s %d cmd[%s] config failed!\n",__func__,__LINE__,at_cmd);
@ -390,6 +471,7 @@ static int BC28Recv(struct Adapter *adapter, void *buf, size_t len)
char at_cmd[64] = {0};
char str_fd[2] = {0};
char size[2] = {0};
char *result = NULL;
ATReplyType reply = CreateATReply(64);
if (NULL == reply) {
@ -398,7 +480,7 @@ static int BC28Recv(struct Adapter *adapter, void *buf, size_t len)
}
itoa(adapter->socket.socket_id, str_fd, 10);
size[0] = len + '0';
itoa(len, size, 10);
memcpy(at_cmd, "AT+NSORF=", 9);
strcat(at_cmd, str_fd);
@ -409,11 +491,12 @@ static int BC28Recv(struct Adapter *adapter, void *buf, size_t len)
printf("cmd : %s\n", at_cmd);
ATOrderSend(adapter->agent, REPLY_TIME_OUT, reply, at_cmd);
PrivTaskDelay(300);
buf = GetReplyText(reply);
if (!buf) {
result = GetReplyText(reply);
if (!result) {
printf("%s %n get reply failed.\n",__func__,__LINE__);
}
memcpy(buf, result, reply->reply_len);
if (reply) {
DeleteATReply(reply);
@ -461,7 +544,6 @@ AdapterProductInfoType BC28Attach(struct Adapter *adapter)
strncpy(product_info->model_name, ADAPTER_NBIOT_BC28,sizeof(product_info->model_name));
product_info->model_done = (void *)&BC28_done;
BC28PowerSet();
return product_info;
}

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

@ -1,417 +0,0 @@
/*
* Copyright (c) 2020 AIIT XUOS Lab
* XiUOS is licensed under Mulan PSL v2.
* You can use this software according to the terms and conditions of the Mulan PSL v2.
* You may obtain a copy of Mulan PSL v2 at:
* http://license.coscl.org.cn/MulanPSL2
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
* See the Mulan PSL v2 for more details.
*/
/**
* @file e18.c
* @brief Implement the connection zigbee adapter function, using E18 device
* @version 1.1
* @author AIIT XUOS Lab
* @date 2021.09.15
*/
#include <adapter.h>
#include <at_agent.h>
#include "../adapter_zigbee.h"
#include "e18.h"
char *cmd_hex2at = "+++";
char *cmd_exit = "AT+EXIT";
char *cmd_ask_panid = "AT+PANID=?";
char *cmd_set_panid = "AT+PANID=A1B2";
char *cmd_ask_mode = "AT+MODE=?";
char *cmd_mode_as_tt = "AT+MODE=1"; /*mode 1:transparent transmission*/
char *cmd_mode_as_stt = "AT+MODE=2"; /*mode 2:Semi transparent transmission*/
char *cmd_mode_as_protocol = "AT+MODE=3"; /*mode 3:Protocol mode*/
char *cmd_ask_role = "AT+DEV=?";
char *cmd_role_as_c = "AT+DEV=C"; /*set device type for coordinater*/
char *cmd_role_as_e = "AT+DEV=E"; /*set device type for end device*/
char *cmd_role_as_r = "AT+DEV=R"; /*set device type for router*/
char *cmd_set_ch = "AT+CH=11"; /*set channel as 11*/
static int E18UartOpen(struct Adapter *adapter)
{
if (NULL == adapter) {
return -1;
}
/* Open device in read-write mode */
adapter->fd = PrivOpen(ADAPTER_E18_DRIVER,O_RDWR);
if (adapter->fd < 0) {
printf("E18UartSetUp get serial %s fd error\n", ADAPTER_E18_DRIVER);
return -1;
}
/* set serial config, serial_baud_rate = 115200 */
struct SerialDataCfg cfg;
memset(&cfg, 0 ,sizeof(struct SerialDataCfg));
cfg.serial_baud_rate = BAUD_RATE_115200;
cfg.serial_data_bits = DATA_BITS_8;
cfg.serial_stop_bits = STOP_BITS_1;
cfg.serial_parity_mode = PARITY_NONE;
cfg.serial_bit_order = BIT_ORDER_LSB;
cfg.serial_invert_mode = NRZ_NORMAL;
cfg.serial_buffer_size = SERIAL_RB_BUFSZ;
/*aiit board use ch438, so it needs more serial configuration*/
#ifdef ADAPTER_E18_DRIVER_EXTUART
cfg.ext_uart_no = ADAPTER_E18_DRIVER_EXT_PORT;
cfg.port_configure = PORT_CFG_INIT;
#endif
struct PrivIoctlCfg ioctl_cfg;
ioctl_cfg.ioctl_driver_type = SERIAL_TYPE;
ioctl_cfg.args = &cfg;
PrivIoctl(adapter->fd, OPE_INT, &ioctl_cfg);
PrivTaskDelay(1000);
printf("Zigbee uart config ready\n");
return 0;
}
static int E18NetworkModeConfig(struct Adapter *adapter)
{
int ret = 0;
if (NULL == adapter) {
return -1;
}
ret = AtCmdConfigAndCheck(adapter->agent, cmd_hex2at, "+OK");
if(ret < 0) {
printf("%s %d cmd[%s] config failed!\n",__func__,__LINE__,cmd_hex2at);
ret = -1;
goto out;
}
switch (adapter->info->work_mode)
{
case TT_MODE1:
ret = AtCmdConfigAndCheck(adapter->agent, cmd_mode_as_tt, "+OK");
ret |= AtCmdConfigAndCheck(adapter->agent, cmd_ask_mode, "MODE=1");
if(ret < 0) {
printf("%s %d config net mode as transparent transmission failed!\n",__func__,__LINE__);
ret = -1;
goto out;
}
break;
case STT_MODE2:
ret = AtCmdConfigAndCheck(adapter->agent, cmd_mode_as_stt, "+OK");
ret |= AtCmdConfigAndCheck(adapter->agent, cmd_ask_mode, "MODE=2");
if(ret < 0) {
printf("%s %d config net mode as semi transparent transmission failed!\n",__func__,__LINE__);
ret = -1;
goto out;
}
break;
case PROTOCOL_MODE3:
ret = AtCmdConfigAndCheck(adapter->agent, cmd_mode_as_protocol, "+OK");
ret |= AtCmdConfigAndCheck(adapter->agent, cmd_ask_mode, "MODE=3");
if(ret < 0) {
printf("%s %d config net mode as protocol failed!\n",__func__,__LINE__);
ret = -1;
goto out;
}
break;
default :
ret = -1;
break;
}
out:
AtCmdConfigAndCheck(adapter->agent, cmd_exit, "+OK");
return ret;
}
static int E18NetRoleConfig(struct Adapter *adapter)
{
int ret = 0;
if (NULL == adapter) {
printf("%s %d adapter is null!\n",__func__,__LINE__);
ret = -1;
goto out;
}
ret = AtCmdConfigAndCheck(adapter->agent, cmd_hex2at, "+OK");
if(ret < 0) {
printf("%s %d cmd[%s] config failed!\n",__func__,__LINE__,cmd_hex2at);
ret = -1;
goto out;
}
switch (adapter->net_role)
{
case COORDINATOR:
ret = AtCmdConfigAndCheck(adapter->agent, cmd_role_as_c, "+OK");
ret |= AtCmdConfigAndCheck(adapter->agent, cmd_ask_role, "DEV=C");
if(ret < 0) {
printf("%s %d config net role as coordinator failed!\n",__func__,__LINE__);
ret = -1;
goto out;
}
break;
case ROUTER:
ret = AtCmdConfigAndCheck(adapter->agent, cmd_role_as_r, "+OK");
ret |= AtCmdConfigAndCheck(adapter->agent, cmd_role_as_r, "DEV=R");
if(ret < 0) {
printf("%s %d config net role as router failed!\n",__func__,__LINE__);
ret = -1;
goto out;
}
break;
case END_DEVICE:
ret = AtCmdConfigAndCheck(adapter->agent, cmd_role_as_e, "+OK");
ret |= AtCmdConfigAndCheck(adapter->agent, cmd_ask_role, "DEV=E");
if(ret < 0) {
printf("%s %d config net role as device failed!\n",__func__,__LINE__);
ret = -1;
goto out;
}
break;
default :
ret = -1;
break;
}
out:
AtCmdConfigAndCheck(adapter->agent, cmd_exit, "+OK");
return ret;
}
static int E18Open(struct Adapter *adapter)
{
int ret = 0;
int try_times = 5;
if (NULL == adapter) {
return -1;
}
/*step1: open e18 serial port*/
ret = E18UartOpen(adapter);
if (ret < 0) {
printf("e18 setup failed.\n");
return -1;
}
/*step2: init AT agent*/
if (!adapter->agent) {
char *agent_name = "zigbee_device";
if (EOK != InitATAgent(agent_name, adapter->fd, 512)) {
printf("at agent init failed !\n");
return -1;
}
ATAgentType at_agent = GetATAgent(agent_name);
adapter->agent = at_agent;
}
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){
printf("E18NetRoleConfig failed\n");
return -1;
}
printf("Zigbee E18 open successful\n");
return 0;
}
static int E18Close(struct Adapter *adapter)
{
PrivClose(adapter->fd);
return 0;
}
static int E18Ioctl(struct Adapter *adapter, int cmd, void *args)
{
int ret = 0;
switch (cmd)
{
case CONFIG_ZIGBEE_NET_ROLE: /* config E18 net role */
ret = E18NetRoleConfig(adapter);
break;
case CONFIG_ZIGBEE_NET_MODE: /* config E18 network mode */
ret = E18NetworkModeConfig(adapter);
break;
default:
ret = -1;
break;
}
return ret;
}
static int E18Join(struct Adapter *adapter, const char *priv_net_group)
{
int ret = 0;
ret = AtCmdConfigAndCheck(adapter->agent, cmd_hex2at, "+OK");
if(ret < 0) {
printf("%s %d cmd[%s] config failed!\n",__func__,__LINE__,cmd_hex2at);
ret = -1;
goto out;
}
switch (adapter->net_role)
{
case COORDINATOR:
case ROUTER:
case END_DEVICE:
/* config panid */
ret = AtCmdConfigAndCheck(adapter->agent, cmd_set_panid, "+OK");
ret |= AtCmdConfigAndCheck(adapter->agent, cmd_ask_panid, "PANID=A1B2");
if(ret < 0) {
printf("%s %d cmd[%s] config failed!\n",__func__,__LINE__,cmd_set_panid);
ret = -1;
goto out;
}
/* config channel*/
ret = AtCmdConfigAndCheck(adapter->agent, cmd_set_ch, "+OK");
if(ret < 0) {
printf("%s %d cmd[%s] config failed!\n",__func__,__LINE__,cmd_set_ch);
ret = -1;
goto out;
}
break;
default :
ret = -1;
break;
}
// switch (adapter->info->work_mode)
// {
// case TT_MODE1:
// break;
// case STT_MODE2:
// /* need to do */
// ret = 0;
// break;
// case PROTOCOL_MODE3:
// /* need to do */
// ret = 0;
// break;
// default:
// ret = -1;
// 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:
return ret;
}
static int E18Send(struct Adapter *adapter, const void *buf, size_t len)
{
int ret = 0;
switch (adapter->info->work_mode)
{
case TT_MODE1:
EntmSend(adapter->agent, buf, len);
break;
case STT_MODE2:
/* need to do */
ret = 0;
break;
case PROTOCOL_MODE3:
/* need to do */
ret = 0;
break;
default:
ret = -1;
break;
}
return 0;
}
static int E18Recv(struct Adapter *adapter, void *buf, size_t len)
{
int ret = 0;
switch (adapter->info->work_mode)
{
case TT_MODE1:
if(!adapter->agent){
PrivRead(adapter->fd, buf, len);
} else {
EntmRecv(adapter->agent, buf, len, 3);/* wait timeout 3000ms*/
}
break;
case STT_MODE2:
/* need to do */
ret = 0;
break;
case PROTOCOL_MODE3:
/* need to do */
ret = 0;
break;
default:
ret = -1;
break;
}
return 0;
}
static int E18Quit(struct Adapter *adapter)
{
return 0;
}
static const struct PrivProtocolDone E18_done =
{
.open = E18Open,
.close = E18Close,
.ioctl = E18Ioctl,
.setup = NULL,
.setdown = NULL,
.setaddr = NULL,
.setdns = NULL,
.setdhcp = NULL,
.ping = NULL,
.netstat = NULL,
.join = E18Join,
.send = E18Send,
.recv = E18Recv,
.quit = E18Quit,
};
AdapterProductInfoType E18Attach(struct Adapter *adapter)
{
struct AdapterProductInfo *product_info = malloc(sizeof(struct AdapterProductInfo));
if (!product_info) {
printf("E18Attach malloc product_info error\n");
return NULL;
}
memset(product_info, 0, sizeof(struct AdapterProductInfo));
strncpy(product_info->model_name, ADAPTER_ZIGBEE_E18,sizeof(product_info->model_name));
product_info->model_done = (void *)&E18_done;
return product_info;
}

4
APP_Framework/Framework/connection/zigbee/e18/e18.c
View File

@ -211,7 +211,9 @@ static int E18Open(struct Adapter *adapter)
ATAgentType at_agent = GetATAgent(agent_name);
adapter->agent = at_agent;
}
AtSetReplyLrEnd(adapter->agent, 1);
try_again:
while(try_times--){
ret = E18NetRoleConfig(adapter);