connection/nbiot/ nb verify

1.modify macro control for rt-thread
2.gcc is ok.

APP_Framework/Framework/connection/nbiot/adapter_nbiot.c

@@ -25,6 +25,8 @@
 extern AdapterProductInfoType BC28Attach(struct Adapter *adapter);
 #endif
 
+#define ADAPTER_NBIOT_NAME "nbiot"
+
 static int AdapterNbiotRegister(struct Adapter *adapter)
 {
     int ret = 0;
@@ -95,7 +97,13 @@ int opennb(void)
 
      return 0;    
  }
-//  SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0)|SHELL_CMD_DISABLE_RETURN, opennb, opennb, show adapter nb information);
+#ifdef ADD_RTTHREAD_FETURES
+MSH_CMD_EXPORT(opennb,open nb sample);
+#endif
+#ifdef ADD_XIZI_FETURES 
+SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0)|SHELL_CMD_DISABLE_RETURN, opennb, opennb, show adapter nb information);
+#endif
+
 int closenb(void)
 {
     int ret = 0;
@@ -113,8 +121,13 @@ int closenb(void)
 
      return 0;    
  }
-//  SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0)|SHELL_CMD_DISABLE_RETURN, closenb, closenb, show adapter nb information);
- 
+#ifdef ADD_RTTHREAD_FETURES
+MSH_CMD_EXPORT(closenb,close nb sample);
+#endif
+#ifdef ADD_XIZI_FETURES
+SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0)|SHELL_CMD_DISABLE_RETURN, closenb, closenb, show adapter nb information);
+#endif
+
  int connectnb(int argc, char *argv[])
  {
      const char *send_msg = argv[1];
@@ -133,7 +146,12 @@ int closenb(void)
 
      return 0;    
  }
-//  SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN)|SHELL_CMD_PARAM_NUM(2)|SHELL_CMD_DISABLE_RETURN, connectnb, connectnb, show adapter nb information);
+#ifdef ADD_RTTHREAD_FETURES
+MSH_CMD_EXPORT(connectnb,connect nb test);
+#endif
+#ifdef ADD_XIZI_FETURES
+SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN)|SHELL_CMD_PARAM_NUM(2)|SHELL_CMD_DISABLE_RETURN, connectnb, connectnb, show adapter nb information);
+#endif
 
  int sendnb(int argc, char *argv[])
  {
@@ -154,7 +172,12 @@ int closenb(void)
 
      return 0;    
  }
-//  SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN)|SHELL_CMD_PARAM_NUM(2)|SHELL_CMD_DISABLE_RETURN, sendnb, sendnb, show adapter nb information);
+#ifdef ADD_RTTHREAD_FETURES
+MSH_CMD_EXPORT(sendnb,send nb test);
+#endif
+#ifdef ADD_XIZI_FETURES
+SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN)|SHELL_CMD_PARAM_NUM(2)|SHELL_CMD_DISABLE_RETURN, sendnb, sendnb, show adapter nb information);
+#endif
 
  int recvnb(void)
  {
@@ -167,5 +190,9 @@ int closenb(void)
 
      return 0;    
  }
-//  SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0)|SHELL_CMD_DISABLE_RETURN, recvnb, recvnb, show adapter nb information);
-
+#ifdef ADD_RTTHREAD_FETURES
+MSH_CMD_EXPORT(recvnb,receive nb test);
+#endif
+#ifdef ADD_XIZI_FETURES
+SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0)|SHELL_CMD_DISABLE_RETURN, recvnb, recvnb, show adapter nb information);
+#endif

APP_Framework/Framework/connection/nbiot/bc28/bc28.c

@@ -490,7 +490,7 @@ static int BC28Open(struct Adapter *adapter)
      /*step2: init AT agent*/
     if (!adapter->agent) {
         char *agent_name = "niot_device";
-        if (EOK != InitATAgent(agent_name, adapter->fd, 512)) {
+        if (0 != InitATAgent(agent_name, adapter->fd, 512)) {
             PrivClose(adapter->fd);
             PrivMutexDelete(&nbiot_lock);
             printf("at agent init failed !\n");

Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/aiit-arm32-board/.config

@@ -284,9 +284,9 @@ CONFIG_SOC_STM32F407ZG=y
 CONFIG_BSP_USING_GPIO=y
 CONFIG_BSP_USING_UART=y
 CONFIG_BSP_USING_UART1=y
-# CONFIG_BSP_USING_UART2 is not set
-CONFIG_BSP_USING_UART3=y
-CONFIG_BSP_USING_UART4=y
+CONFIG_BSP_USING_UART2=y
+# CONFIG_BSP_USING_UART3 is not set
+# CONFIG_BSP_USING_UART4 is not set
 # CONFIG_BSP_USING_I2C1 is not set
 # CONFIG_BSP_USING_SPI is not set
 # CONFIG_BSP_USING_CH438 is not set
@@ -328,14 +328,15 @@ CONFIG_CONNECTION_FRAMEWORK_DEBUG=y
 # CONFIG_CONNECTION_INDUSTRIAL_WLAN is not set
 # CONFIG_CONNECTION_ADAPTER_LORA is not set
 # CONFIG_CONNECTION_ADAPTER_4G is not set
-# CONFIG_CONNECTION_ADAPTER_NB is not set
+CONFIG_CONNECTION_ADAPTER_NB=y
+CONFIG_ADAPTER_BC28=y
+CONFIG_ADAPTER_NBIOT_BC28="bc28"
+CONFIG_ADAPTER_BC28_RESETPIN=100
+CONFIG_ADAPTER_BC28_PIN_DRIVER="/dev/pin"
+CONFIG_ADAPTER_BC28_DRIVER="/dev/uart2"
 # CONFIG_CONNECTION_ADAPTER_WIFI is not set
 # CONFIG_CONNECTION_ADAPTER_ETHERNET is not set
-CONFIG_CONNECTION_ADAPTER_BLUETOOTH=y
-CONFIG_ADAPTER_HC08=y
-CONFIG_ADAPTER_BLUETOOTH_HC08="hc08"
-CONFIG_ADAPTER_HC08_WORK_ROLE="M"
-CONFIG_ADAPTER_HC08_DRIVER="/dev/uart4"
+# CONFIG_CONNECTION_ADAPTER_BLUETOOTH is not set
 # CONFIG_CONNECTION_ADAPTER_ZIGBEE is not set
 # CONFIG_CONNECTION_ADAPTER_5G is not set
 # CONFIG_SUPPORT_KNOWING_FRAMEWORK is not set

Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/aiit-arm32-board/rtconfig.h

@@ -174,8 +174,7 @@
 #define BSP_USING_GPIO
 #define BSP_USING_UART
 #define BSP_USING_UART1
-#define BSP_USING_UART3
-#define BSP_USING_UART4
+#define BSP_USING_UART2
 #define BSP_USING_USB
 #define BSP_USING_STM32_USBH
 #define USB_BUS_NAME "usb"
@@ -196,11 +195,12 @@
 #define ADD_RTTHREAD_FETURES
 #define SUPPORT_CONNECTION_FRAMEWORK
 #define CONNECTION_FRAMEWORK_DEBUG
-#define CONNECTION_ADAPTER_BLUETOOTH
-#define ADAPTER_HC08
-#define ADAPTER_BLUETOOTH_HC08 "hc08"
-#define ADAPTER_HC08_WORK_ROLE "M"
-#define ADAPTER_HC08_DRIVER "/dev/uart4"
+#define CONNECTION_ADAPTER_NB
+#define ADAPTER_BC28
+#define ADAPTER_NBIOT_BC28 "bc28"
+#define ADAPTER_BC28_RESETPIN 100
+#define ADAPTER_BC28_PIN_DRIVER "/dev/pin"
+#define ADAPTER_BC28_DRIVER "/dev/uart2"
 
 /* Security */