From 48668b32958e602b760234475dc1fe8d05d930b4 Mon Sep 17 00:00:00 2001
From: Manuel Bl <10954524+manuelbl@users.noreply.github.com>
Date: Sun, 13 Oct 2019 23:43:17 +0200
Subject: [PATCH] Compatibility with ESP-IDF v4.x

---
 CMakeLists.txt                      | 3 +++
 examples/hello_world/main/main.cpp  | 1 +
 examples/mac_address/main/main.cpp  | 1 +
 examples/provisioning/main/main.cpp | 1 +
 examples/send_recv/main/main.cpp    | 1 +
 src/hal/hal_esp32.h                 | 2 ++
 6 files changed, 9 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2fe5569..ab58eb3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,3 +12,6 @@ set(COMPONENT_REQUIRES
 )
 
 register_component()
+
+target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-expansion-to-defined)
+
diff --git a/examples/hello_world/main/main.cpp b/examples/hello_world/main/main.cpp
index 08cd651..a96fe5a 100644
--- a/examples/hello_world/main/main.cpp
+++ b/examples/hello_world/main/main.cpp
@@ -11,6 +11,7 @@
  *******************************************************************************/
 
 #include "freertos/FreeRTOS.h"
+#include "driver/gpio.h"
 #include "esp_event.h"
 #include "nvs_flash.h"
 
diff --git a/examples/mac_address/main/main.cpp b/examples/mac_address/main/main.cpp
index 2a57dbf..8737b77 100644
--- a/examples/mac_address/main/main.cpp
+++ b/examples/mac_address/main/main.cpp
@@ -11,6 +11,7 @@
  *******************************************************************************/
 
 #include "freertos/FreeRTOS.h"
+#include "driver/gpio.h"
 #include "esp_event.h"
 #include "nvs_flash.h"
 
diff --git a/examples/provisioning/main/main.cpp b/examples/provisioning/main/main.cpp
index 711449b..b0426b3 100644
--- a/examples/provisioning/main/main.cpp
+++ b/examples/provisioning/main/main.cpp
@@ -11,6 +11,7 @@
  *******************************************************************************/
 
 #include "freertos/FreeRTOS.h"
+#include "driver/gpio.h"
 #include "esp_event.h"
 #include "nvs_flash.h"
 
diff --git a/examples/send_recv/main/main.cpp b/examples/send_recv/main/main.cpp
index 400962c..43048c1 100644
--- a/examples/send_recv/main/main.cpp
+++ b/examples/send_recv/main/main.cpp
@@ -12,6 +12,7 @@
 
 #include "freertos/FreeRTOS.h"
 #include "esp_event.h"
+#include "driver/gpio.h"
 #include "nvs_flash.h"
 
 #include "TheThingsNetwork.h"
diff --git a/src/hal/hal_esp32.h b/src/hal/hal_esp32.h
index 87dac68..955e1a2 100644
--- a/src/hal/hal_esp32.h
+++ b/src/hal/hal_esp32.h
@@ -17,6 +17,8 @@
 #include <freertos/FreeRTOS.h>
 #include <freertos/queue.h>
 #include <freertos/task.h>
+#include <freertos/semphr.h>
+#include <driver/gpio.h>
 #include <driver/spi_master.h>
 #include <esp_timer.h>