alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source 
Bugfix/ble mesh example compile warn (v4.2)

See merge request espressif/esp-idf!10222
This commit is contained in:
Island 2020-09-01 19:16:43 +08:00
commit 73fd3608e0
4 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/main/board.c
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"

1
examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_client/main/board.c
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"

1
examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/main/board.c
View File

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

2
examples/bluetooth/esp_ble_mesh/common_components/button/include/iot_button.h
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;