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_tag_define_v4.1' into 'release/v4.1'

Browse Source 
ble_mesh: Move TAG definition to each example (v4.1)

See merge request espressif/esp-idf!10171
This commit is contained in:
Island 2020-08-27 18:02:49 +08:00
commit 6c15b3c44e
12 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/main/main.c
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

2
examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_server/main/main.c
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;

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

2
examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/main/main.c
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];

2
examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/main/main.c
View File

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

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

2
examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_server/main/main.c
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 */

2
examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/main/main.c
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

2
examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/main/main.c
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

2
examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/main/main.c
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;

3
examples/bluetooth/esp_ble_mesh/common_components/example_init/ble_mesh_example_init.c
View File

@ -26,7 +26,8 @@
#endif
#include "esp_ble_mesh_defs.h"
#include "ble_mesh_example_init.h"
#define TAG "EXAMPLE_INIT"
#ifdef CONFIG_BT_BLUEDROID_ENABLED
void ble_mesh_get_dev_uuid(uint8_t *dev_uuid)

2
examples/bluetooth/esp_ble_mesh/common_components/example_init/ble_mesh_example_init.h
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);