From 00c4d601f48824b5854bf82ebc51350b864a74d0 Mon Sep 17 00:00:00 2001 From: wlyu Date: Mon, 26 Sep 2022 14:24:19 +0800 Subject: [PATCH] added socket test command on nuttx --- .../socket_demo/lwip_tcp_socket_demo.c | 1 + .../app_match_nuttx/apps/nshlib/nsh.h | 7 +++ .../apps/nshlib/nsh_Applicationscmd.c | 47 +++++++++++++++++++ .../app_match_nuttx/apps/nshlib/nsh_command.c | 7 +++ 4 files changed, 62 insertions(+) diff --git a/APP_Framework/Applications/connection_app/socket_demo/lwip_tcp_socket_demo.c b/APP_Framework/Applications/connection_app/socket_demo/lwip_tcp_socket_demo.c index d9eb4788a..37f54ed34 100755 --- a/APP_Framework/Applications/connection_app/socket_demo/lwip_tcp_socket_demo.c +++ b/APP_Framework/Applications/connection_app/socket_demo/lwip_tcp_socket_demo.c @@ -29,6 +29,7 @@ #ifdef ADD_NUTTX_FETURES #include #include +#include #include "stdio.h" #endif diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/apps/nshlib/nsh.h b/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/apps/nshlib/nsh.h index c899bfd6b..08e7c5521 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/apps/nshlib/nsh.h +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/apps/nshlib/nsh.h @@ -1462,6 +1462,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 diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/apps/nshlib/nsh_Applicationscmd.c b/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/apps/nshlib/nsh_Applicationscmd.c index de46c9f9e..f5aab84a6 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/apps/nshlib/nsh_Applicationscmd.c +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/apps/nshlib/nsh_Applicationscmd.c @@ -77,6 +77,53 @@ int cmd_Extsram(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) } #endif +/**************************************************************************** + * Name: socket test + ****************************************************************************/ +#if defined(CONFIG_SOCKET_DEMO) && !defined(CONFIG_NSH_DISABLE_SOCKET_DEMO) +extern void udp_set_ip(char *ip_str); +extern int udp_recv_demo(void); +int cmd_Udprecv(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) +{ + nsh_output(vtbl, "Hello, UDP receive!\n"); + if(argc == 2) + udp_set_ip(argv[1]); + udp_recv_demo(); + return OK; +} + +extern int udp_send_demo(void); +int cmd_Udpsend(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) +{ + nsh_output(vtbl, "Hello, UDP send!\n"); + if(argc == 2) + udp_set_ip(argv[1]); + udp_send_demo(); + return OK; +} + +extern void tcp_set_ip(char *ip_str); +extern int tcp_recv_demo(void); +int cmd_Tcprecv(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) +{ + nsh_output(vtbl, "Hello, TCP receive!\n"); + if(argc == 2) + tcp_set_ip(argv[1]); + tcp_recv_demo(); + return OK; +} + +extern int tcp_send_demo(void); +int cmd_Tcpsend(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) +{ + nsh_output(vtbl, "Hello, TCP send!\n"); + if(argc == 2) + tcp_set_ip(argv[1]); + tcp_send_demo(); + return OK; +} +#endif + /**************************************************************************** * Name: cmd_Hcho1os ****************************************************************************/ diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/apps/nshlib/nsh_command.c b/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/apps/nshlib/nsh_command.c index f513ecf23..e80aceda0 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/apps/nshlib/nsh_command.c +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/apps/nshlib/nsh_command.c @@ -608,6 +608,13 @@ static const struct cmdmap_s g_cmdmap[] = { "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