tcp_udp: remove some unnecessary functions.

diff --git a/examples/performance/tcp_perf/main/Kconfig.projbuild b/examples/performance/tcp_perf/main/Kconfig.projbuild
index e40c52f83dcf87ba8f4e41fb5d80f63f45586a34..c832f56672efae2553fb46cecacbe2b9c86eb701 100644 (file)
--- a/examples/performance/tcp_perf/main/Kconfig.projbuild
+++ b/examples/performance/tcp_perf/main/Kconfig.projbuild
@@ -5,12 +5,12 @@ menu "Example Configuration"
 #      default MODE_TCP_SHIELDBOX
 #      help
 #          This option set performance mode.
+#          
+#          - Testing in shieldbox for "Performance in shieldbox" setting.
 #              
-#            - for "Performance in shieldbox" setting,it will receive data by tcp.
-#              
-#          - for "Performance in air" setting, it will send data by tcp.
-#              
-#          - for "Performance in long distance" setting, it will send data by tcp.
+#          - Testing in air for "Performance in air" setting.
+#                      
+#          - Testing in long distance for "Performance in long distance" setting.
 #              
 #                                      
 #config MODE_TCP_SHIELDBOX
@@ -51,7 +51,7 @@ config TCP_PERF_DELAY_DEBUG
 
 config TCP_PERF_WIFI_SSID
     string "WiFi SSID"
-       default "tp_wifi_test1"
+       default "esp_wifi_test1"
        help
            SSID (network name) for the example to connect to.
 

diff --git a/examples/performance/tcp_perf/main/main.c b/examples/performance/tcp_perf/main/main.c
index eafb1b3714e62a9012c15b695e941b243df4a2ac..65811ff39098ef9d7df6fb9b71b7b107dcb4615f 100644 (file)
--- a/examples/performance/tcp_perf/main/main.c
+++ b/examples/performance/tcp_perf/main/main.c
@@ -19,6 +19,12 @@ step3:
     you can see the info in com port output.
 */
 
+#include <errno.h>
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "esp_log.h"
+#include "esp_err.h"
+
 #include "tcp_perf.h"
 
 int connectedflag = 0;
@@ -57,7 +63,7 @@ static void tcp_conn(void *pvParameters)
     ESP_LOGI(TAG, "creat_tcp_client.");
     socret = creat_tcp_client();
 #endif
-    if(-1 == socret) {
+    if(ESP_FAIL == socret) {
        ESP_LOGI(TAG, "creat tcp socket error,stop.");
        vTaskDelete(NULL);
     }
@@ -103,7 +109,6 @@ static void tcp_conn(void *pvParameters)
 
 void app_main(void)
 {
-    nvs_flash_init();
 #if ESP_WIFI_MODE_AP
     ESP_LOGI(TAG, "ESP_WIFI_MODE_AP\n");
     wifi_init_softap();

diff --git a/examples/performance/tcp_perf/main/tcp_perf.c b/examples/performance/tcp_perf/main/tcp_perf.c
index 1384dd47d6d2b17fc4949a2435096398b6ca11e4..6d1e8cb761c76202c45367668365cee8edef80ab 100644 (file)
--- a/examples/performance/tcp_perf/main/tcp_perf.c
+++ b/examples/performance/tcp_perf/main/tcp_perf.c
@@ -1,8 +1,16 @@
 \r
+\r
+#include <string.h>\r
+#include <sys/socket.h>\r
+#include "freertos/FreeRTOS.h"\r
+#include "freertos/task.h"\r
+#include "esp_wifi.h"\r
+#include "esp_event_loop.h"\r
+#include "esp_log.h"\r
+\r
+\r
 #include "tcp_perf.h"\r
 \r
-/* FreeRTOS event group to signal when we are connected & ready to make a request */\r
-static EventGroupHandle_t wifi_event_group;\r
 /*socket*/\r
 static int sever_socket = 0;\r
 static struct sockaddr_in sever_addr;\r
@@ -126,7 +134,7 @@ void recv_data(void *pvParameters)
 }\r
 \r
 \r
-//use this esp32 as a tcp sever. return 0:success -1:error\r
+//use this esp32 as a tcp sever. return ESP_OK:success ESP_FAIL:error\r
 int creat_tcp_sever()\r
 {\r
     ESP_LOGI(TAG, "sever socket....port=%d\n", DEFAULT_PORT);\r
@@ -134,7 +142,7 @@ int creat_tcp_sever()
     if (sever_socket < 0) {\r
        show_socket_error_code(sever_socket);\r
        //perror("socket() error:");\r
-       return -1;\r
+       return ESP_FAIL;\r
     }\r
     sever_addr.sin_family = AF_INET;\r
     sever_addr.sin_port = htons(DEFAULT_PORT);\r
@@ -143,26 +151,26 @@ int creat_tcp_sever()
        show_socket_error_code(sever_socket);\r
        //perror("bind() error");\r
        close(sever_socket);\r
-       return -1;\r
+       return ESP_FAIL;\r
     }\r
     if (listen(sever_socket, 5) < 0) {\r
        show_socket_error_code(sever_socket);\r
        //perror("listen() error");\r
        close(sever_socket);\r
-       return -1;\r
+       return ESP_FAIL;\r
     }\r
     connect_soc = accept(sever_socket, (struct sockaddr*)&client_addr, &socklen);\r
     if (connect_soc<0) {\r
        show_socket_error_code(connect_soc);\r
        //perror("accept() error");\r
        close(sever_socket);\r
-       return -1;\r
+       return ESP_FAIL;\r
     }\r
     /*connection established，now can send/recv*/\r
     ESP_LOGI(TAG, "tcp connection established!");\r
-    return 0;\r
+    return ESP_OK;\r
 }\r
-//use this esp32 as a tcp client. return 0:success -1:error\r
+//use this esp32 as a tcp client. return ESP_OK:success ESP_FAIL:error\r
 int creat_tcp_client()\r
 {\r
     ESP_LOGI(TAG, "client socket....severip:port=%s:%d\n", \r
@@ -171,7 +179,7 @@ int creat_tcp_client()
     if (connect_soc < 0) {\r
        show_socket_error_code(connect_soc);\r
        //perror("socket failed!");\r
-       return -1;\r
+       return ESP_FAIL;\r
     }\r
     sever_addr.sin_family = AF_INET;\r
     sever_addr.sin_port = htons(DEFAULT_PORT);\r
@@ -180,17 +188,16 @@ int creat_tcp_client()
     if (connect(connect_soc, (struct sockaddr *)&sever_addr, sizeof(sever_addr)) < 0) {\r
        show_socket_error_code(connect_soc);\r
        //perror("connect to sever error!");\r
-       return -1;\r
+       return ESP_FAIL;\r
     }\r
     ESP_LOGI(TAG, "connect to sever success!");\r
-    return 0;\r
+    return ESP_OK;\r
 }\r
 \r
 //wifi_init_sta\r
 void wifi_init_sta()\r
 {\r
     tcpip_adapter_init();\r
-    wifi_event_group = xEventGroupCreate();\r
     ESP_ERROR_CHECK(esp_event_loop_init(event_handler, NULL) );\r
 \r
     wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();\r
@@ -214,7 +221,6 @@ void wifi_init_sta()
 void wifi_init_softap()\r
 {\r
     tcpip_adapter_init();\r
-    wifi_event_group = xEventGroupCreate();\r
     ESP_ERROR_CHECK(esp_event_loop_init(event_handler, NULL));\r
 \r
     wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();\r

diff --git a/examples/performance/tcp_perf/main/tcp_perf.h b/examples/performance/tcp_perf/main/tcp_perf.h
index a6b70cf90fe50f2e826ca487513f50c9859a7cae..3b7ba0b60d1f70c2aeb7b415ce7312196bd69d89 100644 (file)
--- a/examples/performance/tcp_perf/main/tcp_perf.h
+++ b/examples/performance/tcp_perf/main/tcp_perf.h
@@ -1,22 +1,6 @@
 #ifndef __TCP_PERF_H__
 #define __TCP_PERF_H__
 
-#include <stdio.h>
-#include <string.h>
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
-#include "freertos/event_groups.h"
-#include "esp_wifi.h"
-#include "esp_event_loop.h"
-#include "esp_system.h"
-#include "nvs_flash.h"
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include "driver/uart.h"
-#include "soc/uart_struct.h"
-#include "esp_log.h"
-
-
 
 
 #ifdef __cplusplus

diff --git a/examples/performance/udp_perf/main/Kconfig.projbuild b/examples/performance/udp_perf/main/Kconfig.projbuild
index 19917ee73610dbdaffb2a8f393ea81ce85884b81..5567ed2cdabf8557e152d8880ad63279419df779 100644 (file)
--- a/examples/performance/udp_perf/main/Kconfig.projbuild
+++ b/examples/performance/udp_perf/main/Kconfig.projbuild
@@ -1,15 +1,16 @@
 menu "Example Configuration"
 
 #choice 
-#    prompt "UCP_PERF_MODE "
-#      default MODE_UDP_SHIELDBOX
+#   prompt "TCP_PERF_MODE "
+#      default MODE_TCP_SHIELDBOX
 #      help
 #          This option set performance mode.
-#              
-#          - for "Performance in shieldbox" setting,it will receive data by udp.
-#          - for "Performance in air" setting, it will send data by udp.
 #          
-#          - for "Performance in long distance" setting, it will send data by udp.
+#          - Testing in shieldbox for "Performance in shieldbox" setting.
+#              
+#          - Testing in air for "Performance in air" setting.
+#                      
+#          - Testing in long distance for "Performance in long distance" setting.
 #              
 #                                      
 #config MODE_UDP_SHIELDBOX
@@ -28,7 +29,7 @@ config UDP_PERF_WIFI_MODE_AP
 
 config UDP_PERF_SEVER
     bool "TCP performance sever enable"
-       default n
+       default y
        help
            yes:ESP32 is UDP sever. no:ESP32 is UDP client.
                
@@ -36,13 +37,13 @@ config UDP_PERF_SEVER
 
 config UDP_PERF_TX
     bool "UDP performance TX test enable"
-       default y
+       default n
        help
            yes:UDP TX test. no:UDP RX test.
 
 config UDP_PERF_WIFI_SSID
     string "WiFi SSID"
-       default "tp_wifi_test1"
+       default "esp_wifi_test1"
        help
            SSID (network name) for the example to connect to.
 

diff --git a/examples/performance/udp_perf/main/main.c b/examples/performance/udp_perf/main/main.c
index 10213063db0d54cd1393e8dcfdb1e3acaa4286b4..0318ee6a3bab3b93eb4ca9b24e1be6a3f142a1e8 100644 (file)
--- a/examples/performance/udp_perf/main/main.c
+++ b/examples/performance/udp_perf/main/main.c
@@ -19,6 +19,11 @@ step3:
     you can see the info in com port output.
 */
 
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "esp_log.h"
+#include "esp_err.h"
+
 #include "udp_perf.h"
 
 int connectedflag = 0;
@@ -50,7 +55,7 @@ static void udp_conn(void *pvParameters)
     ESP_LOGI(TAG, "creat_udp_client.");
     socret = creat_udp_client();
 #endif
-    if(-1 == socret) {
+    if(ESP_FAIL == socret) {
        ESP_LOGI(TAG, "creat udp socket error,stop.");
        vTaskDelete(NULL);
     }
@@ -80,7 +85,6 @@ static void udp_conn(void *pvParameters)
 
 void app_main(void)
 {
-    nvs_flash_init();
 #if ESP_WIFI_MODE_AP
     ESP_LOGI(TAG, "ESP_WIFI_MODE_AP\n");
     wifi_init_softap();

diff --git a/examples/performance/udp_perf/main/udp_perf.c b/examples/performance/udp_perf/main/udp_perf.c
index 9b37fd162602dd408c399c51e59d51af6c76282c..c3cb339c34df5d0fbecaeff2f13dae401aa9d51e 100644 (file)
--- a/examples/performance/udp_perf/main/udp_perf.c
+++ b/examples/performance/udp_perf/main/udp_perf.c
@@ -1,9 +1,17 @@
 \r
+#include <string.h>\r
+#include <sys/socket.h>\r
+#include "freertos/FreeRTOS.h"\r
+#include "freertos/task.h"\r
+#include "esp_wifi.h"\r
+#include "esp_event_loop.h"\r
+#include "esp_log.h"\r
+\r
+\r
 #include "udp_perf.h"\r
 \r
 \r
-/* FreeRTOS event group to signal when we are connected & ready to make a request */\r
-static EventGroupHandle_t wifi_event_group;\r
+\r
 static int mysocket;\r
 \r
 static struct sockaddr_in remote_addr;\r
@@ -49,7 +57,6 @@ static esp_err_t event_handler(void *ctx, system_event_t *event)
 void wifi_init_sta()\r
 {\r
     tcpip_adapter_init();\r
-    wifi_event_group = xEventGroupCreate();\r
     ESP_ERROR_CHECK(esp_event_loop_init(event_handler, NULL) );\r
 \r
     wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();\r
@@ -73,7 +80,6 @@ void wifi_init_sta()
 void wifi_init_softap()\r
 {\r
     tcpip_adapter_init();\r
-    wifi_event_group = xEventGroupCreate();\r
     ESP_ERROR_CHECK(esp_event_loop_init(event_handler, NULL));\r
 \r
     wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();\r
@@ -99,14 +105,14 @@ void wifi_init_softap()
            DEFAULT_SSID, DEFAULT_PWD);\r
 }\r
 \r
-//creat a udp sever socket. return 0:success -1:error\r
+//creat a udp sever socket. return ESP_OK:success ESP_FAIL:error\r
 int creat_udp_sever()\r
 {\r
     ESP_LOGI(TAG, "creat_udp_sever()");\r
     mysocket = socket(AF_INET, SOCK_DGRAM, 0);\r
     if (mysocket < 0) {\r
        perror("socket failed:");\r
-       return -1;\r
+       return ESP_FAIL;\r
     }\r
     struct sockaddr_in sever_addr;\r
     sever_addr.sin_family = AF_INET;\r
@@ -115,26 +121,26 @@ int creat_udp_sever()
     if (bind(mysocket, (struct sockaddr *)&sever_addr, sizeof(sever_addr)) < 0) {\r
        perror("bind local port error:");\r
        close(mysocket);\r
-       return -1;\r
+       return ESP_FAIL;\r
     }\r
-    return 0;\r
+    return ESP_OK;\r
 }\r
 \r
-//creat a udp client socket. return 0:success -1:error\r
+//creat a udp client socket. return ESP_OK:success ESP_FAIL:error\r
 int creat_udp_client()\r
 {\r
     ESP_LOGI(TAG, "creat_udp_client()");\r
     mysocket = socket(AF_INET, SOCK_DGRAM, 0);\r
     if (mysocket < 0) {\r
        perror("socket failed:");\r
-       return -1;\r
+       return ESP_FAIL;\r
     }\r
     /*for client remote_addr is also sever_addr*/\r
     remote_addr.sin_family = AF_INET;\r
     remote_addr.sin_port = htons(DEFAULT_PORT);\r
     remote_addr.sin_addr.s_addr = inet_addr(DEFAULT_SEVER_IP);\r
 \r
-    return 0;\r
+    return ESP_OK;\r
 }\r
 \r
 \r

diff --git a/examples/performance/udp_perf/main/udp_perf.h b/examples/performance/udp_perf/main/udp_perf.h
index 64ad225db2ce28bea1794954a9cbd7eecd1f2275..ecafcf9be030d514c9eb81b2a565845f9063488f 100644 (file)
--- a/examples/performance/udp_perf/main/udp_perf.h
+++ b/examples/performance/udp_perf/main/udp_perf.h
@@ -1,22 +1,6 @@
 #ifndef __UDP_PERF_H__
 #define __UDP_PERF_H__
 
-#include <stdio.h>
-#include <string.h>
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
-#include "freertos/event_groups.h"
-#include "esp_wifi.h"
-#include "esp_event_loop.h"
-#include "esp_system.h"
-#include "nvs_flash.h"
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include "driver/uart.h"
-#include "soc/uart_struct.h"
-#include "esp_log.h"
-
-
 
 
 #ifdef __cplusplus