yystopf/xiuos
1
0
Fork 1
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

repair the problem of irq and add mode judge for zigbee

Browse Source
This commit is contained in:
Wang_Weigen
2022-04-07 10:28:09 +08:00
parent 5ade2a983d
commit 90f30cf6d2
5 changed files with 77 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
APP_Framework/Framework/connection/zigbee/e18/Kconfig
View File

@@ -18,6 +18,13 @@ endchoice
if ADD_XIZI_FETURES
config ADAPTER_E18_MODEPIN
int "E18 MODE pin number"
default "61"
config ADAPTER_BC28_PIN_DRIVER
string "BC28 device pin driver path"
default "/dev/pin_dev"
config ADAPTER_E18_DRIVER_EXTUART
bool "Using extra uart to support zigbee"

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

@@ -37,6 +37,33 @@ 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*/
#define E18_AS_HEX_MODE 0
#define E18_AS_AT_MODE 1
static int E18HardwareModeGet()
{
int ret = 0;
int pin_fd;
pin_fd = PrivOpen(ADAPTER_BC28_PIN_DRIVER, O_RDWR);
struct PinStat pin_stat;
pin_stat.pin = ADAPTER_E18_MODEPIN;
ret = PrivRead(pin_fd, &pin_stat, 1);
PrivTaskDelay(200);
PrivClose(pin_fd);
if(pin_stat.pin == GPIO_HIGH) {
printf(" E18 as AT mode\n");
return E18_AS_AT_MODE;
} else {
printf(" E18 as HEX mode\n");
return E18_AS_HEX_MODE;
}
}
#ifdef ADD_NUTTX_FETURES
static int E18UartOpen(struct Adapter *adapter)
@@ -148,19 +175,25 @@ out:
static int E18NetRoleConfig(struct Adapter *adapter)
{
int ret = 0;
int mode = -1;
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;
mode = E18HardwareModeGet();
if(E18_AS_HEX_MODE == mode)
{
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)
{
@@ -197,7 +230,10 @@ static int E18NetRoleConfig(struct Adapter *adapter)
}
out:
AtCmdConfigAndCheck(adapter->agent, cmd_exit, "+OK");
if(E18_AS_HEX_MODE == mode) {
AtCmdConfigAndCheck(adapter->agent, cmd_exit, "+OK");
}
return ret;
}
@@ -274,12 +310,17 @@ static int E18Ioctl(struct Adapter *adapter, int cmd, void *args)
static int E18Join(struct Adapter *adapter, unsigned char *priv_net_group)
{
int ret = 0;
int mode = -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;
mode = E18HardwareModeGet();
if(E18_AS_HEX_MODE == mode)
{
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)
@@ -327,9 +368,13 @@ static int E18Join(struct Adapter *adapter, unsigned char *priv_net_group)
// }
if(!ret){
ret = AtCmdConfigAndCheck(adapter->agent, cmd_exit, "+OK");
if(ret < 0) {
printf("%s %d cmd[%s] config failed!\n",__func__,__LINE__,cmd_exit);
if(E18_AS_HEX_MODE == mode) {
ret = AtCmdConfigAndCheck(adapter->agent, cmd_exit, "+OK");
if(ret < 0) {
printf("%s %d cmd[%s] config failed!\n",__func__,__LINE__,cmd_exit);
ret = -1;
}
} else {
ret = -1;
}
}