HTTP layer for ESP32, make static specifier in matrix.c optional by defining it as...

[matrix_esp_thesis] / esp32 / esp_project / main / wifi.c

diff --git a/esp32/esp_project/main/wifi.c b/esp32/esp_project/main/wifi.c
index 07d1e41b2431d4fe1765fa3df60841f2f380ed86..788d61cab216f7cf42c8e41da50ed95dbed01f3f 100644 (file)
--- a/esp32/esp_project/main/wifi.c
+++ b/esp32/esp_project/main/wifi.c
@@ -1,4 +1,9 @@
-// Code taken from the ESP32 IDF WiFi station Example\r
+/*\r
+ * SPDX-FileCopyrightText: 2010-2022 Espressif Systems (Shanghai) CO LTD\r
+ *\r
+ * SPDX-License-Identifier: CC0-1.0\r
+ */\r
+\r

 \r
 #include <string.h>\r
 #include "esp_event.h"\r
 \r
 #include <string.h>\r
 #include "esp_event.h"\r


@@ -13,8 +18,6 @@
 #include "lwip/err.h"\r
 #include "lwip/sys.h"\r
 \r
 #include "lwip/err.h"\r
 #include "lwip/sys.h"\r
 \r

-#include "mongoose.h"\r
-\r

 static EventGroupHandle_t s_wifi_event_group;\r
 \r
 /* The event group allows multiple bits for each event, but we only care about\r
 static EventGroupHandle_t s_wifi_event_group;\r
 \r
 /* The event group allows multiple bits for each event, but we only care about\r


@@ -35,14 +38,14 @@ static void event_handler(void *arg, esp_event_base_t event_base,
     if (s_retry_num < 3) {\r
       esp_wifi_connect();\r
       s_retry_num++;\r
     if (s_retry_num < 3) {\r
       esp_wifi_connect();\r
       s_retry_num++;\r

-      MG_INFO(("retry to connect to the AP"));\r
+      printf("retry to connect to the AP\n");\r

     } else {\r
       xEventGroupSetBits(s_wifi_event_group, WIFI_FAIL_BIT);\r
     }\r
     } else {\r
       xEventGroupSetBits(s_wifi_event_group, WIFI_FAIL_BIT);\r
     }\r

-    MG_ERROR(("connect to the AP fail"));\r
+    printf("connect to the AP fail\n");\r

   } else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) {\r
     ip_event_got_ip_t *event = (ip_event_got_ip_t *) event_data;\r
   } else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) {\r
     ip_event_got_ip_t *event = (ip_event_got_ip_t *) event_data;\r

-    MG_INFO(("IP ADDRESS:" IPSTR, IP2STR(&event->ip_info.ip)));\r
+    printf("IP ADDRESS:" IPSTR "\n", IP2STR(&event->ip_info.ip));\r

     s_retry_num = 0;\r
     xEventGroupSetBits(s_wifi_event_group, WIFI_CONNECTED_BIT);\r
   }\r
     s_retry_num = 0;\r
     xEventGroupSetBits(s_wifi_event_group, WIFI_CONNECTED_BIT);\r
   }\r


@@ -81,18 +84,18 @@ void wifi_init(const char *ssid, const char *pass) {
   ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA));\r
   ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_STA, &c));\r
   ESP_ERROR_CHECK(esp_wifi_start());\r
   ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA));\r
   ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_STA, &c));\r
   ESP_ERROR_CHECK(esp_wifi_start());\r

-  MG_DEBUG(("wifi_init_sta finished."));\r
+  printf("wifi_init_sta finished.\n");\r

 \r
   EventBits_t bits = xEventGroupWaitBits(s_wifi_event_group,\r
                                          WIFI_CONNECTED_BIT | WIFI_FAIL_BIT,\r
                                          pdFALSE, pdFALSE, portMAX_DELAY);\r
 \r
   if (bits & WIFI_CONNECTED_BIT) {\r
 \r
   EventBits_t bits = xEventGroupWaitBits(s_wifi_event_group,\r
                                          WIFI_CONNECTED_BIT | WIFI_FAIL_BIT,\r
                                          pdFALSE, pdFALSE, portMAX_DELAY);\r
 \r
   if (bits & WIFI_CONNECTED_BIT) {\r

-    MG_INFO(("connected to ap SSID:%s password:%s", ssid, pass));\r
+    printf("connected to ap SSID:%s password:%s\n", ssid, pass);\r

   } else if (bits & WIFI_FAIL_BIT) {\r
   } else if (bits & WIFI_FAIL_BIT) {\r

-    MG_ERROR(("Failed to connect to SSID:%s, password:%s", ssid, pass));\r
+    printf("Failed to connect to SSID:%s, password:%s\n", ssid, pass);\r

   } else {\r
   } else {\r

-    MG_ERROR(("UNEXPECTED EVENT"));\r
+    printf("UNEXPECTED EVENT\n");\r

   }\r
 \r
   /* The event will not be processed after unregister */\r
   }\r
 \r
   /* The event will not be processed after unregister */\r