From 9bccca529bdbcb0be1906f98c5c1d03bcbad1718 Mon Sep 17 00:00:00 2001
From: huardti <titouan.huard@gmail.com>
Date: Mon, 20 Feb 2023 16:53:40 +0100
Subject: [PATCH 1/2] fix build to work with idf 5.X

remove errors due to idf v5.x

add idf generated files to gitignore

this commit also create a new section in the
gitignore for the esp idf files
---
 .gitignore                                   | 11 ++++++++---
 CMakeLists.txt                               |  4 ++--
 examples/default_demo/main/idf_component.yml |  6 ++++++
 examples/default_demo/main/user_main.c       |  3 ++-
 examples/http_hook/main/idf_component.yml    |  6 ++++++
 5 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 examples/default_demo/main/idf_component.yml
 create mode 100644 examples/http_hook/main/idf_component.yml

diff --git a/.gitignore b/.gitignore
index c027e556..626c8004 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,6 +51,13 @@ Module.symvers
 Mkfile.old
 dkms.conf
 
+#esp idf
+sdkconfig
+sdkconfig.old
+managed_components/
+dependencies.lock
+**/build/
+
 # Eclipse
 .metadata/
 RemoteSystemsTempFiles/.project
@@ -60,9 +67,7 @@ RemoteSystemsTempFiles/.project
 *.d
 wifi_manager/.cproject
 wifi_manager/.project
-sdkconfig
-sdkconfig.old
-**/build/
+
 #doxygen
 Doxyfile
 wifi_manager/doc/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 74ea43d5..8d06d57f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,12 +1,12 @@
 if(IDF_VERSION_MAJOR GREATER_EQUAL 4)
     idf_component_register(SRC_DIRS src
-        REQUIRES log nvs_flash mdns wpa_supplicant lwip esp_http_server
+        REQUIRES log nvs_flash mdns wpa_supplicant lwip esp_http_server esp_wifi
         INCLUDE_DIRS src
         EMBED_FILES src/style.css src/code.js src/index.html)
 else()
     set(COMPONENT_SRCDIRS src)
     set(COMPONENT_ADD_INCLUDEDIRS src)
-    set(COMPONENT_REQUIRES log nvs_flash mdns wpa_supplicant lwip esp_http_server)
+    set(COMPONENT_REQUIRES log nvs_flash mdns wpa_supplicant lwip esp_http_server esp_wifi)
     set(COMPONENT_EMBED_FILES src/style.css src/code.js src/index.html)
     register_component()
 endif()
diff --git a/examples/default_demo/main/idf_component.yml b/examples/default_demo/main/idf_component.yml
new file mode 100644
index 00000000..dd31aa43
--- /dev/null
+++ b/examples/default_demo/main/idf_component.yml
@@ -0,0 +1,6 @@
+## IDF Component Manager Manifest File
+dependencies:
+  espressif/mdns:
+    version: "^1.0.3"
+    rules:
+      - if: "idf_version >=5.0"
diff --git a/examples/default_demo/main/user_main.c b/examples/default_demo/main/user_main.c
index 4c11767f..d81a1c26 100644
--- a/examples/default_demo/main/user_main.c
+++ b/examples/default_demo/main/user_main.c
@@ -34,6 +34,7 @@ SOFTWARE.
 #include "freertos/task.h"
 #include "esp_system.h"
 #include "esp_log.h"
+#include <lwip/ip4_addr.h>
 
 #include "wifi_manager.h"
 
@@ -47,7 +48,7 @@ static const char TAG[] = "main";
 void monitoring_task(void *pvParameter)
 {
 	for(;;){
-		ESP_LOGI(TAG, "free heap: %d",esp_get_free_heap_size());
+		ESP_LOGI(TAG, "free heap: %"PRIu32, esp_get_free_heap_size());
 		vTaskDelay( pdMS_TO_TICKS(10000) );
 	}
 }
diff --git a/examples/http_hook/main/idf_component.yml b/examples/http_hook/main/idf_component.yml
new file mode 100644
index 00000000..9d822689
--- /dev/null
+++ b/examples/http_hook/main/idf_component.yml
@@ -0,0 +1,6 @@
+## IDF Component Manager Manifest File
+dependencies:
+  espressif/mdns:
+    version: "^1.0.3"
+    rules:
+      - if: "idf_version >=5.0"
\ No newline at end of file

From 278319504537e8d0b6485284eeb35c4df2b9ad68 Mon Sep 17 00:00:00 2001
From: huardti <titouan.huard@gmail.com>
Date: Mon, 20 Feb 2023 17:02:02 +0100
Subject: [PATCH 2/2] rework include in examples to follow c standard

---
 examples/default_demo/main/user_main.c |  8 ++++----
 src/wifi_manager.c                     | 26 +++++++++++++-------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/examples/default_demo/main/user_main.c b/examples/default_demo/main/user_main.c
index d81a1c26..c866ed1e 100644
--- a/examples/default_demo/main/user_main.c
+++ b/examples/default_demo/main/user_main.c
@@ -30,10 +30,10 @@ SOFTWARE.
 #include <string.h>
 #include <esp_wifi.h>
 #include <esp_netif.h>
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
-#include "esp_system.h"
-#include "esp_log.h"
+#include <freertos/FreeRTOS.h>
+#include <freertos/task.h>
+#include <esp_system.h>
+#include <esp_log.h>
 #include <lwip/ip4_addr.h>
 
 #include "wifi_manager.h"
diff --git a/src/wifi_manager.c b/src/wifi_manager.c
index 3d11a940..f03c1d2a 100644
--- a/src/wifi_manager.c
+++ b/src/wifi_manager.c
@@ -34,25 +34,25 @@ Contains the freeRTOS task and all necessary support
 #include <string.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include "esp_system.h"
+#include <esp_system.h>
 #include <freertos/FreeRTOS.h>
 #include <freertos/queue.h>
 #include <freertos/task.h>
 #include <freertos/event_groups.h>
 #include <freertos/timers.h>
 #include <http_app.h>
-#include "esp_wifi.h"
-#include "esp_event.h"
-#include "esp_netif.h"
-#include "esp_wifi_types.h"
-#include "esp_log.h"
-#include "nvs.h"
-#include "nvs_flash.h"
-#include "mdns.h"
-#include "lwip/api.h"
-#include "lwip/err.h"
-#include "lwip/netdb.h"
-#include "lwip/ip4_addr.h"
+#include <esp_wifi.h>
+#include <esp_event.h>
+#include <esp_netif.h>
+#include <esp_wifi_types.h>
+#include <esp_log.h>
+#include <nvs.h>
+#include <nvs_flash.h>
+#include <mdns.h>
+#include <lwip/api.h>
+#include <lwip/err.h>
+#include <lwip/netdb.h>
+#include <lwip/ip4_addr.h>
 
 
 #include "json.h"