Merge branch 'bugfix/ble_mesh_example_compile_warn_v3.3' into 'release/v3.3'
Bugfix/ble mesh example compile warn (v3.3) See merge request espressif/esp-idf!10225
This commit is contained in:
commit
468c30843c
4 changed files with 2 additions and 4 deletions
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
#include "driver/uart.h"
|
#include "driver/gpio.h"
|
||||||
#include "esp_log.h"
|
#include "esp_log.h"
|
||||||
|
|
||||||
#include "iot_button.h"
|
#include "iot_button.h"
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include "esp_log.h"
|
#include "esp_log.h"
|
||||||
#include "driver/uart.h"
|
|
||||||
#include "iot_button.h"
|
#include "iot_button.h"
|
||||||
#include "esp_ble_mesh_sensor_model_api.h"
|
#include "esp_ble_mesh_sensor_model_api.h"
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include "esp_log.h"
|
#include "esp_log.h"
|
||||||
#include "driver/uart.h"
|
|
||||||
#include "iot_button.h"
|
#include "iot_button.h"
|
||||||
|
|
||||||
#define TAG "BOARD"
|
#define TAG "BOARD"
|
||||||
|
|
|
@ -19,7 +19,7 @@ extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "driver/gpio.h"
|
#include "driver/gpio.h"
|
||||||
#include "freertos/portmacro.h"
|
#include "freertos/FreeRTOS.h"
|
||||||
|
|
||||||
typedef void (* button_cb)(void*);
|
typedef void (* button_cb)(void*);
|
||||||
typedef void* button_handle_t;
|
typedef void* button_handle_t;
|
||||||
|
|
Loading…
Reference in a new issue