diff --git a/APP_Framework/Framework/connection/zigbee/e18/Kconfig b/APP_Framework/Framework/connection/zigbee/e18/Kconfig
index 643d07acb..06bdec8c7 100644
--- a/APP_Framework/Framework/connection/zigbee/e18/Kconfig
+++ b/APP_Framework/Framework/connection/zigbee/e18/Kconfig
@@ -1,8 +1,8 @@
 config ADAPTER_ZIGBEE_E18
         string "E18 adapter name"
         default "e18"
-        
-choice 
+
+choice
         prompt "E18 adapter select net role type "
         default AS_END_DEVICE_ROLE
 
@@ -11,7 +11,7 @@ choice
 
         config AS_ROUTER_ROLE
                 bool "config as a router"
-        
+
         config AS_END_DEVICE_ROLE
                 bool "config as an end device"
 endchoice
@@ -22,8 +22,8 @@ if ADD_XIZI_FETURES
                 int "E18 MODE pin number"
                 default "61"
 
-        config ADAPTER_BC28_PIN_DRIVER
-                string "BC28 device pin driver path"
+        config ADAPTER_E18_PIN_DRIVER
+                string "E18 device pin driver path"
                 default "/dev/pin_dev"
 
         config ADAPTER_E18_DRIVER_EXTUART
@@ -35,7 +35,7 @@ if ADD_XIZI_FETURES
                 default "/dev/uart2_dev2"
                 depends on !ADAPTER_E18_DRIVER_EXTUART
 
-        if ADAPTER_E18_DRIVER_EXTUART                    
+        if ADAPTER_E18_DRIVER_EXTUART
                 config ADAPTER_E18_DRIVER
                         string "E18 device extra uart driver path"
                         default "/dev/extuart_dev0"
@@ -47,11 +47,31 @@ if ADD_XIZI_FETURES
 endif
 
 if ADD_NUTTX_FETURES
+    config ADAPTER_E18_MODEPIN
+            int "E18 MODE pin number"
+            default "61"
+
+    config ADAPTER_E18_PIN_DRIVER
+            string "E18 device pin driver path"
+            default "/dev/pin_dev"
+
     config ADAPTER_E18_DRIVER
             string "E18 device uart driver path"
             default "/dev/ttyS1"
+            depends on !ADAPTER_E18_DRIVER_EXTUART
            ---help---
                If USART1 is selected, then fill in /dev/ttyS1 here.
+
+    if ADAPTER_E18_DRIVER_EXTUART
+            config ADAPTER_E18_DRIVER
+                    string "E18 device extra uart driver path"
+                    default "/dev/extuart_dev1"
+
+            config ADAPTER_E18_DRIVER_EXT_PORT
+                    int "if E18 device using extuart, choose port"
+                    default "1"
+    endif
+
 endif
 
 if ADD_RTTHREAD_FETURES
diff --git a/APP_Framework/Framework/connection/zigbee/e18/e18.c b/APP_Framework/Framework/connection/zigbee/e18/e18.c
index bd8d5ef92..6638a988b 100644
--- a/APP_Framework/Framework/connection/zigbee/e18/e18.c
+++ b/APP_Framework/Framework/connection/zigbee/e18/e18.c
@@ -45,7 +45,7 @@ static int E18HardwareModeGet()
     int ret = 0;
     int pin_fd;
 
-    pin_fd = PrivOpen(ADAPTER_BC28_PIN_DRIVER, O_RDWR);
+    pin_fd = PrivOpen(ADAPTER_E18_PIN_DRIVER, O_RDWR);
 
     struct PinStat pin_stat;
     pin_stat.pin = ADAPTER_E18_MODEPIN;
@@ -175,7 +175,7 @@ static int E18NetworkModeConfig(struct Adapter *adapter)
     }
 
 out:
-    if(E18_AS_HEX_MODE == mode){
+    if(E18_AS_AT_MODE == mode){
         AtCmdConfigAndCheck(adapter->agent, cmd_exit, "+OK");
     }
     
@@ -203,7 +203,9 @@ static int E18NetRoleConfig(struct Adapter *adapter)
             goto out;
         }
     }
-    
+
+    //wait 2second
+    PrivTaskDelay(2000);
 
     switch (adapter->net_role)
     {
@@ -240,7 +242,7 @@ static int E18NetRoleConfig(struct Adapter *adapter)
     }
 
 out:
-    if(E18_AS_HEX_MODE == mode) {
+    if(E18_AS_AT_MODE == mode) {
         AtCmdConfigAndCheck(adapter->agent, cmd_exit, "+OK");
     }
 
@@ -382,7 +384,7 @@ static int E18Join(struct Adapter *adapter, unsigned char *priv_net_group)
 
     // }
     if(!ret){
-        if(E18_AS_HEX_MODE == mode) {
+        if(E18_AS_AT_MODE == mode) {
             ret = AtCmdConfigAndCheck(adapter->agent, cmd_exit, "+OK");
             if(ret < 0) {
                 printf("%s %d cmd[%s] config failed!\n",__func__,__LINE__,cmd_exit);
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/zbnsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/zbnsh/defconfig
new file mode 100755
index 000000000..deb156dfa
--- /dev/null
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/zbnsh/defconfig
@@ -0,0 +1,64 @@
+#
+# This file is autogenerated: PLEASE DO NOT EDIT IT.
+#
+# You can use "make menuconfig" to make any modifications to the installed .config file.
+# You can then do "make savedefconfig" to generate a new defconfig file that includes your
+# modifications.
+#
+CONFIG_ADD_NUTTX_FETURES=y
+CONFIG_ARCH="arm"
+CONFIG_ARCH_BOARD="xidatong"
+CONFIG_ARCH_BOARD_XIDATONG=y
+CONFIG_ARCH_CHIP="imxrt"
+CONFIG_ARCH_CHIP_IMXRT=y
+CONFIG_ARCH_CHIP_MIMXRT1052CVL5B=y
+CONFIG_ARCH_INTERRUPTSTACK=10240
+CONFIG_ARCH_STACKDUMP=y
+CONFIG_ARMV7M_DCACHE=y
+CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y
+CONFIG_ARMV7M_ICACHE=y
+CONFIG_ARMV7M_USEBASEPRI=y
+CONFIG_BOARD_LOOPSPERMSEC=104926
+CONFIG_BUILTIN=y
+CONFIG_CLOCK_MONOTONIC=y
+CONFIG_EXAMPLES_HELLO=y
+CONFIG_IMXRT_GPIO_IRQ=y
+CONFIG_IMXRT_GPIO3_0_15_IRQ=y
+CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_IMXRT_LPUART1=y
+CONFIG_INTELHEX_BINARY=y
+CONFIG_LPUART1_SERIAL_CONSOLE=y
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_BUILTIN_APPS=y
+CONFIG_NSH_DISABLE_IFUPDOWN=y
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_READLINE=y
+CONFIG_RAM_SIZE=524288
+CONFIG_RAM_START=0x20200000
+CONFIG_RAW_BINARY=y
+CONFIG_SCHED_HPWORK=y
+CONFIG_SCHED_WAITPID=y
+CONFIG_START_DAY=14
+CONFIG_START_MONTH=3
+CONFIG_SYSTEM_NSH=y
+CONFIG_DEV_GPIO=y
+CONFIG_READLINE_CMD_HISTORY=y
+CONFIG_READLINE_CMD_HISTORY_LEN=100
+CONFIG_READLINE_CMD_HISTORY_LINELEN=120
+CONFIG_READLINE_TABCOMPLETION=y
+CONFIG_FS_ROMFS=y
+CONFIG_NSH_ROMFSETC=y
+CONFIG_NSH_ARCHROMFS=y
+CONFIG_BOARDCTL_RESET=y
+CONFIG_BSP_USING_CH438=y
+CONFIG_CH438_EXTUART1=y
+CONFIG_SUPPORT_CONNECTION_FRAMEWORK=y
+CONFIG_CONNECTION_FRAMEWORK_DEBUG=y
+CONFIG_SUPPORT_CONNECTION_FRAMEWORK=y
+CONFIG_CONNECTION_ADAPTER_ZIGBEE=y
+CONFIG_ADAPTER_E18=y
+CONFIG_ADAPTER_ZIGBEE_E18="e18"
+CONFIG_AS_END_DEVICE_ROLE=y
+CONFIG_ADAPTER_E18_DRIVER="/dev/extuart_dev1"
+CONFIG_USER_ENTRYPOINT="nsh_main"