Merge branch 'bugfix/ble_mesh_example_tag_define_v3.3' into 'release/v3.3'

ble_mesh: Move TAG definition to each example (v3.3)

See merge request espressif/esp-idf!9308
This commit is contained in:
Island 2020-06-28 20:24:44 +08:00
commit 70b7a4b868
12 changed files with 22 additions and 3 deletions

View file

@ -31,6 +31,8 @@
#include "ble_mesh_fast_prov_client_model.h"
#include "ble_mesh_example_init.h"
#define TAG "EXAMPLE"
#define PROV_OWN_ADDR 0x0001
#define APP_KEY_OCTET 0x12
#define GROUP_ADDRESS 0xC000

View file

@ -32,6 +32,8 @@
#include "ble_mesh_fast_prov_server_model.h"
#include "ble_mesh_example_init.h"
#define TAG "EXAMPLE"
extern struct _led_state led_state[3];
extern struct k_delayed_work send_self_prov_node_addr_timer;
extern bt_mesh_atomic_t fast_prov_cli_flags;

View file

@ -23,6 +23,8 @@
#include "ble_mesh_example_init.h"
#include "ble_mesh_example_nvs.h"
#define TAG "EXAMPLE"
#define CID_ESP 0x02E5
static uint8_t dev_uuid[16] = { 0xdd, 0xdd };

View file

@ -24,6 +24,8 @@
#include "board.h"
#include "ble_mesh_example_init.h"
#define TAG "EXAMPLE"
#define CID_ESP 0x02E5
extern struct _led_state led_state[3];

View file

@ -21,6 +21,8 @@
#include "ble_mesh_example_init.h"
#define TAG "EXAMPLE"
#define LED_OFF 0x0
#define LED_ON 0x1

View file

@ -22,6 +22,8 @@
#include "ble_mesh_example_init.h"
#include "board.h"
#define TAG "EXAMPLE"
#define CID_ESP 0x02E5
#define PROV_OWN_ADDR 0x0001

View file

@ -23,6 +23,8 @@
#include "ble_mesh_example_init.h"
#include "board.h"
#define TAG "EXAMPLE"
#define CID_ESP 0x02E5
/* Sensor Property ID */

View file

@ -23,6 +23,8 @@
#include "ble_mesh_example_nvs.h"
#include "board.h"
#define TAG "EXAMPLE"
#define CID_ESP 0x02E5
#define PROV_OWN_ADDR 0x0001

View file

@ -24,6 +24,8 @@
#include "board.h"
#include "ble_mesh_example_init.h"
#define TAG "EXAMPLE"
#define CID_ESP 0x02E5
#define ESP_BLE_MESH_VND_MODEL_ID_CLIENT 0x0000

View file

@ -44,6 +44,8 @@
#include "ble_mesh_fast_prov_server_model.h"
#include "ble_mesh_example_init.h"
#define TAG "EXAMPLE"
extern struct _led_state led_state[3];
extern struct k_delayed_work send_self_prov_node_addr_timer;
extern bt_mesh_atomic_t fast_prov_cli_flags;

View file

@ -27,7 +27,8 @@
#endif
#include "esp_ble_mesh_defs.h"
#include "ble_mesh_example_init.h"
#define TAG "EXAMPLE_INIT"
#ifdef CONFIG_BLUEDROID_ENABLED

View file

@ -11,8 +11,6 @@
#include "esp_err.h"
#define TAG "EXAMPLE"
void ble_mesh_get_dev_uuid(uint8_t *dev_uuid);
esp_err_t bluetooth_init(void);