Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into develp

Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/apps/nshlib/nsh.h

@@ -1462,7 +1462,7 @@ int nsh_foreach_var(FAR struct nsh_vtbl_s *vtbl, nsh_foreach_var_t cb,
   int cmd_Ch438(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv);
 #endif
 
-#if defined(CONFIG_K210_LCD) && !defined(CONFIG_NSH_DISABLE_LCD)
+#if defined(CONFIG_USER_TEST_LCD) && !defined(CONFIG_NSH_DISABLE_USER_TEST_LCD)
   int cmd_Lcd(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv);
 #endif
 
@@ -1470,6 +1470,13 @@ int nsh_foreach_var(FAR struct nsh_vtbl_s *vtbl, nsh_foreach_var_t cb,
   int cmd_Extsram(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv);
 #endif
 
+#if defined(CONFIG_SOCKET_DEMO) && !defined(CONFIG_NSH_DISABLE_SOCKET_DEMO)
+  int cmd_Udpsend(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv);
+  int cmd_Udprecv(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv);
+  int cmd_Tcpsend(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv);
+  int cmd_Tcprecv(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv);
+#endif
+
 #if defined(CONFIG_APPLICATION_SENSOR_HCHO_TB600B_WQ_HCHO1OS) && !defined(CONFIG_NSH_DISABLE_HCHO_TB600B_WQ_HCHO1OS)
   int cmd_Hcho1os(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv);
 #endif

Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/apps/nshlib/nsh_Applicationscmd.c

@@ -80,7 +80,7 @@ int cmd_Ch438(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
 /****************************************************************************
  * Name: cmd_lcd
  ****************************************************************************/
-#if defined(CONFIG_K210_LCD) && !defined(CONFIG_NSH_DISABLE_LCD)
+#if defined(CONFIG_USER_TEST_LCD) && !defined(CONFIG_NSH_DISABLE_USER_TEST_LCD)
 extern void LcdDemo(void);
 int cmd_Lcd(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
 {
@@ -94,11 +94,48 @@ int cmd_Lcd(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
  * Name: cmd_Extsram
  ****************************************************************************/
 #if defined(CONFIG_USER_TEST_SEMC) && !defined(CONFIG_NSH_DISABLE_USER_TEST_SEMC)
-extern int extsram_test(void);
+extern int ExtsramTest(void);
 int cmd_Extsram(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
 {
     nsh_output(vtbl, "Hello, extra sdram!\n");
-    extsram_test();
+    ExtsramTest();
+    return OK;
+}
+#endif
+
+/****************************************************************************
+ * Name: socket test
+ ****************************************************************************/
+#if defined(CONFIG_SOCKET_DEMO) && !defined(CONFIG_NSH_DISABLE_SOCKET_DEMO)
+void UdpSocketRecvTest(int argc, char *argv[]);
+int cmd_Udprecv(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
+{
+    nsh_output(vtbl, "Hello, UDP receive!\n");
+    UdpSocketRecvTest(argc, argv);
+    return OK;
+}
+
+void UdpSocketSendTest(int argc, char *argv[]);
+int cmd_Udpsend(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
+{
+    nsh_output(vtbl, "Hello, UDP send!\n");
+    UdpSocketSendTest(argc, argv);
+    return OK;
+}
+
+void TcpSocketRecvTest(int argc, char *argv[]);
+int cmd_Tcprecv(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
+{
+    nsh_output(vtbl, "Hello, TCP receive!\n");
+    TcpSocketRecvTest(argc, argv);
+    return OK;
+}
+
+void TcpSocketSendTest(int argc, char *argv[]);
+int cmd_Tcpsend(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
+{
+    nsh_output(vtbl, "Hello, TCP send!\n");
+    TcpSocketSendTest(argc, argv);
     return OK;
 }
 #endif
@@ -319,46 +356,46 @@ int cmd_WindSpeedQsFs(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
  ****************************************************************************/
 
 #if defined(CONFIG_CONNECTION_ADAPTER_ZIGBEE) && !defined(CONFIG_NSH_DISABLE_OPENZIGBEE)
-extern int openzigbee(void);
+extern int OpenZigbee(void);
 int cmd_openzigbee(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
 {
     nsh_output(vtbl, "Hello, world!\n");
     FrameworkInit();
-    openzigbee();
+    OpenZigbee();
     return OK;
 }
 #endif
 
 
 #if defined(CONFIG_CONNECTION_ADAPTER_ZIGBEE) && !defined(CONFIG_NSH_DISABLE_SENDZIGBEE)
-extern int sendzigbee(int argc, char *argv[]);
+extern int SendZigbee(int argc, char *argv[]);
 int cmd_sendzigbee(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
 {
     nsh_output(vtbl, "Hello, world!\n");
     FrameworkInit();
-    sendzigbee(argc,argv);
+    SendZigbee(argc,argv);
     return OK;
 }
 #endif
 
 #if defined(CONFIG_CONNECTION_ADAPTER_ZIGBEE) && !defined(CONFIG_NSH_DISABLE_RECVZIGBEE)
-extern int recvzigbee(void);
+extern int RecvZigbee(void);
 int cmd_recvzigbee(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
 {
     nsh_output(vtbl, "Hello, world!\n");
     FrameworkInit();
-    recvzigbee();
+    RecvZigbee();
     return OK;
 }
 #endif
 
 #if defined(CONFIG_ADAPTER_ESP07S_WIFI) && !defined(CONFIG_NSH_DISABLE_ADAPTER_WIFI_TEST)
-extern int AdapterWifiTest(int argc, char *argv[]);
+extern int AdapterWifiTestWithParam(int argc, char *argv[]);
 int cmd_AdapterWifiTest(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
 {
     nsh_output(vtbl, "Hello, world!\n");
     FrameworkInit();
-    AdapterWifiTest(argc, argv);
+    AdapterWifiTestWithParam(argc, argv);
     return OK;
 }
 #endif

Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/apps/nshlib/nsh_command.c

@@ -608,14 +608,21 @@ static const struct cmdmap_s g_cmdmap[] =
   { "ch438",    cmd_Ch438,     1, 1, "[ch438 demo cmd.]" },
 #endif
 
-#if defined(CONFIG_K210_LCD) && !defined(CONFIG_NSH_DISABLE_LCD)
-  { "lcd",      cmd_Lcd,     1, 1, "[LCD demo cmd.]" },
+#if defined(CONFIG_USER_TEST_LCD) && !defined(CONFIG_NSH_DISABLE_USER_TEST_LCD)
+  { "lcd",      cmd_Lcd,      1, 1, "[LCD demo cmd.]" },
 #endif
 
 #if defined(CONFIG_USER_TEST_SEMC) && !defined(CONFIG_NSH_DISABLE_USER_TEST_SEMC)
   { "sram",      cmd_Extsram,     1, 1, "[Extra sdram demo cmd.]" },
 #endif
 
+#if defined(CONFIG_SOCKET_DEMO) && !defined(CONFIG_NSH_DISABLE_SOCKET_DEMO)
+  { "udpsend",      cmd_Udpsend,     1, 2, "[Udp send demo cmd.]" },
+  { "udprecv",      cmd_Udprecv,     1, 2, "[Udp recv demo cmd.]" },
+  { "tcpsend",      cmd_Tcpsend,     1, 2, "[Tcp send demo cmd.]" },
+  { "tcprecv",      cmd_Tcprecv,     1, 2, "[Tcp recv demo cmd.]" },
+#endif
+
 #if defined(CONFIG_APPLICATION_SENSOR_HCHO_TB600B_WQ_HCHO1OS) && !defined(CONFIG_NSH_DISABLE_HCHO_TB600B_WQ_HCHO1OS)
   { "hcho1os",       cmd_Hcho1os,       1, 1, "[get the concentration of formaldehyde with sensor tb600b_wq_hcho1os.]" },
 #endif