Merge branch 'bugfix/ble_mesh_example_compile_warn_v4.0' into 'release/v4.0'

Bugfix/ble mesh example compile warn (v4.0)

See merge request espressif/esp-idf!10224
This commit is contained in:
Island 2020-11-09 14:34:37 +08:00
commit 9b087d3ba4
4 changed files with 2 additions and 4 deletions

View File

@ -9,7 +9,7 @@
#include <stdio.h>
#include "driver/uart.h"
#include "driver/gpio.h"
#include "esp_log.h"
#include "iot_button.h"

View File

@ -9,7 +9,6 @@
#include <stdio.h>
#include "esp_log.h"
#include "driver/uart.h"
#include "iot_button.h"
#include "esp_ble_mesh_sensor_model_api.h"

View File

@ -9,7 +9,6 @@
#include <stdio.h>
#include "esp_log.h"
#include "driver/uart.h"
#include "iot_button.h"
#define TAG "BOARD"

View File

@ -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;