From 840b7f2de7f28db1d68e381fff4ff1c0b1def935 Mon Sep 17 00:00:00 2001 From: Carlos Sobrinho Date: Mon, 17 Aug 2020 14:32:08 -0700 Subject: [PATCH 1/2] Fix compilation warnings about portmacro being already define. --- .../esp_ble_mesh/common_components/button/include/iot_button.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/bluetooth/esp_ble_mesh/common_components/button/include/iot_button.h b/examples/bluetooth/esp_ble_mesh/common_components/button/include/iot_button.h index 0a8564d683..76333c1001 100644 --- a/examples/bluetooth/esp_ble_mesh/common_components/button/include/iot_button.h +++ b/examples/bluetooth/esp_ble_mesh/common_components/button/include/iot_button.h @@ -19,7 +19,7 @@ extern "C" { #endif #include "driver/gpio.h" -#include "freertos/portmacro.h" +#include "freertos/FreeRTOS.h" typedef void (* button_cb)(void*); typedef void* button_handle_t; From 528747ac4cb0eeffe8fbbb6897180f3dd3f59c26 Mon Sep 17 00:00:00 2001 From: lly Date: Tue, 18 Aug 2020 16:46:10 +0800 Subject: [PATCH 2/2] ble_mesh: example: Remove some useless included header files --- .../esp_ble_mesh/ble_mesh_node/onoff_client/main/board.c | 2 +- .../ble_mesh_sensor_model/sensor_client/main/board.c | 1 - .../ble_mesh_vendor_model/vendor_client/main/board.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/main/board.c b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/main/board.c index ce8f599af8..ff0c2a65d9 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/main/board.c +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/main/board.c @@ -9,7 +9,7 @@ #include -#include "driver/uart.h" +#include "driver/gpio.h" #include "esp_log.h" #include "iot_button.h" diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_client/main/board.c b/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_client/main/board.c index 8bc2e44e50..0921ca2c51 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_client/main/board.c +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_client/main/board.c @@ -9,7 +9,6 @@ #include #include "esp_log.h" -#include "driver/uart.h" #include "iot_button.h" #include "esp_ble_mesh_sensor_model_api.h" diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/main/board.c b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/main/board.c index 0937ae7d78..5e57bcf019 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/main/board.c +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/main/board.c @@ -9,7 +9,6 @@ #include #include "esp_log.h" -#include "driver/uart.h" #include "iot_button.h" #define TAG "BOARD"