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

fix ADD_XIZI_FETURES/ADD_NUTTX_FETURES/ADD_RTTHREAD_FETURES error

Browse Source
This commit is contained in:
Liu_Weichao
2023-06-20 13:20:41 +08:00
parent 5c08cae005
commit cf85c4b99c
71 changed files with 190 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,7 @@ choice
endchoice
if ADD_XIZI_FETURES
if ADD_XIZI_FEATURES
config ADAPTER_E18_MODEPIN
int "E18 MODE pin number"
default "61"
@@ -46,7 +46,7 @@ if ADD_XIZI_FETURES
endif
endif
if ADD_NUTTX_FETURES
if ADD_NUTTX_FEATURES
if ARCH_BOARD_XIDATONG_ARM32
config ADAPTER_E18_MODEPIN
int "E18 MODE pin number"
@@ -84,6 +84,6 @@ endif
endif
if ADD_RTTHREAD_FETURES
if ADD_RTTHREAD_FEATURES
endif

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

@@ -43,7 +43,7 @@ char *cmd_set_ch = "AT+CH=11"; /*set channel as 11*/
static int E18HardwareModeGet()
{
#ifdef ADD_NUTTX_FETURES
#ifdef ADD_NUTTX_FEATURES
#ifdef CONFIG_ARCH_BOARD_XIDATONG_ARM32
int ret = 0;
int pin_fd;
@@ -96,7 +96,7 @@ static int E18HardwareModeGet()
static int E18HardwareModeSet(void)
{
#ifdef ADD_NUTTX_FETURES
#ifdef ADD_NUTTX_FEATURES
#ifdef CONFIG_ARCH_BOARD_XIDATONG_ARM32
int ret = 0;
int pin_fd;
@@ -227,7 +227,7 @@ static int E18NetworkModeConfig(struct Adapter *adapter)
}
out:
#ifdef ADD_NUTTX_FETURES
#ifdef ADD_NUTTX_FEATURES
if(E18_AS_HEX_MODE == mode)
#else
if(E18_AS_AT_MODE == mode)
@@ -302,7 +302,7 @@ static int E18NetRoleConfig(struct Adapter *adapter)
}
out:
#ifdef ADD_NUTTX_FETURES
#ifdef ADD_NUTTX_FEATURES
if(E18_AS_HEX_MODE == mode)
#else
if(E18_AS_AT_MODE == mode)
@@ -449,7 +449,7 @@ static int E18Join(struct Adapter *adapter, unsigned char *priv_net_group)
// }
if(!ret){
#ifdef ADD_NUTTX_FETURES
#ifdef ADD_NUTTX_FEATURES
if(E18_AS_HEX_MODE == mode)
#else
if(E18_AS_AT_MODE == mode)