eaw/esp-idf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ble_mesh: Miscellaneous modifications

Browse Source 
1. Deinit unprov_dev table and fast prov info
2. Fix an issue which may cause failing to send msg
3. Add deinit test into the coex_a2dp_mini example
4. Add an API esp_ble_mesh_provisioner_set_primary_elem_addr
5. Use bt_mesh.flags to indicate device role
6. Fix Provisioner entering IV Update procedure
7. Remove some useless macros
8. Callback rssi of received mesh provisioning packets
9. Modify the Provisioner disable function
10. Provisioner can provision devices with fixed addresses
11. Change some log level from debug to info
12. Add an API for Provisioner to get provisioned node info
This commit is contained in:
lly
2019-12-30 19:52:35 +08:00
committed by baohongde
parent d33caa02c8
commit 3222dfef0e
43 changed files with 1355 additions and 923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_server/main/ble_mesh_demo_main.c
View File

@@ -146,8 +146,6 @@ static esp_ble_mesh_prov_t prov = {
.uuid = dev_uuid,
.output_size = 0,
.output_actions = 0,
.prov_unicast_addr = 0x0001,
.prov_start_address = 0x0005,
.prov_attention = 0x00,
.prov_algorithm = 0x00,
.prov_pub_key_oob = 0x00,
@@ -352,10 +350,6 @@ static void example_ble_mesh_provisioning_cb(esp_ble_mesh_prov_cb_event_t event,
}
prov_start = true;
break;
case ESP_BLE_MESH_PROVISIONER_PROV_ENABLE_COMP_EVT:
ESP_LOGI(TAG, "ESP_BLE_MESH_PROVISIONER_PROV_ENABLE_COMP_EVT, err_code: %d",
param->provisioner_prov_enable_comp.err_code);
break;
case ESP_BLE_MESH_PROVISIONER_RECV_UNPROV_ADV_PKT_EVT:
example_recv_unprov_adv_pkt(param->provisioner_recv_unprov_adv_pkt.dev_uuid, param->provisioner_recv_unprov_adv_pkt.addr,
param->provisioner_recv_unprov_adv_pkt.addr_type, param->provisioner_recv_unprov_adv_pkt.oob_info,
@@ -701,37 +695,6 @@ static esp_err_t ble_mesh_init(void)
esp_ble_mesh_register_config_server_callback(example_ble_mesh_config_server_cb);
esp_ble_mesh_register_generic_server_callback(example_ble_mesh_generic_server_cb);
ESP_LOGW(TAG, "prev, free heap size %d", esp_get_free_heap_size());
vTaskDelay(10 / portTICK_PERIOD_MS);
ESP_LOGW(TAG, "start, free heap size %d", esp_get_free_heap_size());
/* First time (make erase_flash, then make flash monitor), 72 bytes will be cost
* during first (start - end) circle.
* Second time (make monitor), 0 byte will be cost during first (start - end) cycle.
*/
for (int i = 0; i < 1000; i++) {
err = esp_ble_mesh_init(&prov, &comp);
if (err != ESP_OK) {
ESP_LOGE(TAG, "%s: Failed to initialize BLE Mesh", __func__);
return err;
}
err = esp_ble_mesh_client_model_init(&vnd_models[1]);
if (err != ESP_OK) {
ESP_LOGE(TAG, "%s: Failed to initialize fast prov client model", __func__);
return err;
}
err = esp_ble_mesh_client_model_deinit(&vnd_models[1]);
if (err != ESP_OK) {
ESP_LOGE(TAG, "%s: Failed to deinitialize fast prov client model", __func__);
return err;
}
err = esp_ble_mesh_deinit();
if (err != ESP_OK) {
ESP_LOGE(TAG, "%s: Failed to de-initialize BLE Mesh", __func__);
return err;
}
ESP_LOGW(TAG, "end, free heap size %d", esp_get_free_heap_size());
}
err = esp_ble_mesh_init(&prov, &comp);
if (err != ESP_OK) {
ESP_LOGE(TAG, "%s: Failed to initialize BLE Mesh", __func__);

109
examples/bluetooth/esp_ble_mesh/ble_mesh_tx_rx_test/coex_a2dp_mini/components/mesh_tx/ble_mesh_demo_main.c
View File

@@ -24,6 +24,7 @@
#include "esp_ble_mesh_networking_api.h"
#include "esp_ble_mesh_config_model_api.h"
#include "esp_ble_mesh_generic_model_api.h"
#include "esp_ble_mesh_local_data_operation_api.h"
#include "board.h"
#include "ble_mesh_demo_init.h"
@@ -67,7 +68,10 @@ static void example_start_interval_timer(void);
static SemaphoreHandle_t test_mutex;
static uint8_t match[2] = {0xec, 0xa6};
static uint8_t dev_uuid[16];
bool example_deinit_test;
static uint16_t primary_addr;
typedef struct {
uint8_t uuid[16];
@@ -351,6 +355,9 @@ static void example_ble_mesh_provisioning_cb(esp_ble_mesh_prov_cb_event_t event,
esp_ble_mesh_prov_cb_param_t *param)
{
switch (event) {
case ESP_BLE_MESH_PROV_REGISTER_COMP_EVT:
ESP_LOGI(TAG, "ESP_BLE_MESH_PROV_REGISTER_COMP_EVT, err_code %d", param->prov_register_comp.err_code);
break;
case ESP_BLE_MESH_PROVISIONER_PROV_ENABLE_COMP_EVT:
ESP_LOGI(TAG, "ESP_BLE_MESH_PROVISIONER_PROV_ENABLE_COMP_EVT, err_code %d", param->provisioner_prov_enable_comp.err_code);
if (iperf_test == true) {
@@ -387,6 +394,12 @@ static void example_ble_mesh_provisioning_cb(esp_ble_mesh_prov_cb_event_t event,
case ESP_BLE_MESH_PROVISIONER_SET_DEV_UUID_MATCH_COMP_EVT:
ESP_LOGI(TAG, "ESP_BLE_MESH_PROVISIONER_SET_DEV_UUID_MATCH_COMP_EVT, err_code %d", param->provisioner_set_dev_uuid_match_comp.err_code);
break;
case ESP_BLE_MESH_PROVISIONER_SET_PRIMARY_ELEM_ADDR_COMP_EVT:
ESP_LOGI(TAG, "ESP_BLE_MESH_PROVISIONER_SET_PRIMARY_ELEM_ADDR_COMP_EVT, err_code %d", param->provisioner_set_primary_elem_addr_comp.err_code);
if (!param->provisioner_set_primary_elem_addr_comp.err_code) {
primary_addr = esp_ble_mesh_get_primary_element_address();
}
break;
case ESP_BLE_MESH_PROVISIONER_SET_NODE_NAME_COMP_EVT:
ESP_LOGI(TAG, "ESP_BLE_MESH_PROVISIONER_SET_NODE_NAME_COMP_EVT, err_code %d", param->provisioner_set_node_name_comp.err_code);
if (param->provisioner_set_node_name_comp.err_code == ESP_OK) {
@@ -404,7 +417,7 @@ static void example_ble_mesh_provisioning_cb(esp_ble_mesh_prov_cb_event_t event,
if (param->provisioner_add_app_key_comp.err_code == ESP_OK) {
esp_err_t err = 0;
prov_key.app_idx = param->provisioner_add_app_key_comp.app_idx;
err = esp_ble_mesh_provisioner_bind_app_key_to_local_model(PROV_OWN_ADDR, prov_key.app_idx,
err = esp_ble_mesh_provisioner_bind_app_key_to_local_model(primary_addr, prov_key.app_idx,
ESP_BLE_MESH_VND_MODEL_ID_TEST_CLI, CID_ESP);
if (err != ESP_OK) {
ESP_LOGE(TAG, "Provisioner bind local model appkey failed");
@@ -467,6 +480,7 @@ static void example_ble_mesh_config_client_cb(esp_ble_mesh_cfg_client_cb_event_t
ESP_LOGE(TAG, "%s: Config Model App Bind failed", __func__);
}
} else if (param->params->opcode == ESP_BLE_MESH_MODEL_OP_MODEL_APP_BIND) {
ESP_LOGW(TAG, "%s, Primary element address 0x%04x", __func__, esp_ble_mesh_get_primary_element_address());
ESP_LOGW(TAG, "%s, Provisioning and config successfully", __func__);
}
break;
@@ -542,8 +556,8 @@ static void example_ble_mesh_custom_model_cb(esp_ble_mesh_model_cb_event_t event
break;
case ESP_BLE_MESH_CLIENT_MODEL_RECV_PUBLISH_MSG_EVT:
example_test_lock();
if (param->model_operation.opcode == ESP_BLE_MESH_VND_MODEL_OP_TEST_STATUS) {
uint16_t value = *(uint16_t *)param->model_operation.msg;
if (param->client_recv_publish_msg.opcode == ESP_BLE_MESH_VND_MODEL_OP_TEST_STATUS) {
uint16_t value = *(uint16_t *)param->client_recv_publish_msg.msg;
ESP_LOGI(TAG, "%d %d %d", msg_index, value, trans_num);
if (value == trans_num && retrans_timer_start == true) {
msg_record[msg_index].acked = true;
@@ -647,11 +661,49 @@ const esp_timer_create_args_t interval_timer_args = {
.name = "interval",
};
static esp_err_t ble_mesh_init(void)
esp_err_t example_ble_mesh_start(void)
{
uint8_t match[2] = {0xec, 0xa6};
esp_err_t err;
err = esp_ble_mesh_init(&provision, &composition);
if (err) {
return err;
}
err = esp_ble_mesh_client_model_init(&vnd_models[0]);
if (err) {
return err;
}
err = esp_ble_mesh_provisioner_set_dev_uuid_match(match, sizeof(match), 0x0, false);
if (err) {
return err;
}
err = esp_ble_mesh_provisioner_prov_enable(ESP_BLE_MESH_PROV_ADV | ESP_BLE_MESH_PROV_GATT);
if (err) {
return err;
}
err = esp_ble_mesh_provisioner_set_primary_elem_addr(0x0006);
if (err) {
return err;
}
err = esp_ble_mesh_provisioner_add_local_app_key(prov_key.app_key, prov_key.net_idx, prov_key.app_idx);
if (err) {
return err;
}
ESP_LOGW(TAG, "BLE Mesh start");
return 0;
}
static esp_err_t ble_mesh_init(void)
{
esp_err_t err;
primary_addr = PROV_OWN_ADDR;
prov_key.net_idx = ESP_BLE_MESH_KEY_PRIMARY;
prov_key.app_idx = APP_KEY_IDX;
memset(prov_key.app_key, APP_KEY_OCTET, sizeof(prov_key.app_key));
@@ -660,19 +712,44 @@ static esp_err_t ble_mesh_init(void)
esp_ble_mesh_register_config_client_callback(example_ble_mesh_config_client_cb);
esp_ble_mesh_register_custom_model_callback(example_ble_mesh_custom_model_cb);
err = esp_ble_mesh_init(&provision, &composition);
if (err) {
ESP_LOGE(TAG, "Initializing mesh failed (err %d)", err);
return err;
if (example_deinit_test == true) {
ESP_LOGW(TAG, "prev, free heap size %d", esp_get_free_heap_size());
vTaskDelay(10 / portTICK_PERIOD_MS);
ESP_LOGW(TAG, "start, free heap size %d", esp_get_free_heap_size());
/* First time (make erase_flash, then make flash monitor), 72 bytes will be cost
* during first (start - end) circle.
* Second time (make monitor), 0 byte will be cost during first (start - end) cycle.
*/
for (int i = 0; i < 100; i++) {
err = esp_ble_mesh_init(&provision, &composition);
if (err != ESP_OK) {
ESP_LOGE(TAG, "%s: Failed to initialize BLE Mesh", __func__);
return err;
}
err = esp_ble_mesh_client_model_init(&vnd_models[0]);
if (err != ESP_OK) {
ESP_LOGE(TAG, "%s: Failed to initialize vnd client model", __func__);
return err;
}
err = esp_ble_mesh_client_model_deinit(&vnd_models[0]);
if (err != ESP_OK) {
ESP_LOGE(TAG, "%s: Failed to deinitialize vnd client model", __func__);
return err;
}
err = esp_ble_mesh_deinit();
if (err != ESP_OK) {
ESP_LOGE(TAG, "%s: Failed to de-initialize BLE Mesh", __func__);
return err;
}
ESP_LOGW(TAG, "end, free heap size %d", esp_get_free_heap_size());
}
}
esp_ble_mesh_client_model_init(&vnd_models[0]);
esp_ble_mesh_provisioner_set_dev_uuid_match(match, sizeof(match), 0x0, false);
esp_ble_mesh_provisioner_prov_enable(ESP_BLE_MESH_PROV_ADV | ESP_BLE_MESH_PROV_GATT);
esp_ble_mesh_provisioner_add_local_app_key(prov_key.app_key, prov_key.net_idx, prov_key.app_idx);
err = example_ble_mesh_start();
if (err != ESP_OK) {
ESP_LOGE(TAG, "%s, BLE Mesh start failed", __func__);
return err;
}
ESP_LOGI(TAG, "BLE Mesh Provisioner initialized");

26
examples/bluetooth/esp_ble_mesh/ble_mesh_tx_rx_test/coex_a2dp_mini/components/mesh_tx/board.c
View File

@@ -15,6 +15,7 @@
#include "iot_button.h"
#include "board.h"
#include "esp_coexist_internal.h"
#include "esp_ble_mesh_common_api.h"
#define TAG "BOARD"
@@ -27,6 +28,8 @@
extern void example_ble_mesh_send_test_msg(bool resend);
extern void example_ble_mesh_test_init(void);
extern esp_err_t example_ble_mesh_start(void);
extern bool example_deinit_test;
struct _led_state led_state[3] = {
{ LED_OFF, LED_OFF, LED_R, "red" },
@@ -66,12 +69,27 @@ static void button_tap_cb(void* arg)
{
ESP_LOGI(TAG, "tap cb (%s)", (char *)arg);
coex_schm_status_set(COEX_SCHM_ST_TYPE_BLE, COEX_SCHM_BLE_ST_MESH_TRAFFIC);
if (example_deinit_test == true) {
static uint8_t count;
if (count++ % 2 == 0) {
if (esp_ble_mesh_deinit() != ESP_OK) {
ESP_LOGE(TAG, "%s, BLE Mesh deinit failed", __func__);
} else {
ESP_LOGW(TAG, "BLE Mesh deinit");
}
} else {
if (example_ble_mesh_start() != ESP_OK) {
ESP_LOGE(TAG, "%s, BLE Mesh start failed", __func__);
}
}
} else {
coex_schm_status_set(COEX_SCHM_ST_TYPE_BLE, COEX_SCHM_BLE_ST_MESH_TRAFFIC);
ESP_LOGW(TAG, "BLE Mesh enters Traffic mode");
ESP_LOGW(TAG, "BLE Mesh enters Traffic mode");
example_ble_mesh_test_init();
example_ble_mesh_send_test_msg(false);
example_ble_mesh_test_init();
example_ble_mesh_send_test_msg(false);
}
}
static void board_button_init(void)

2
examples/bluetooth/esp_ble_mesh/ble_mesh_tx_rx_test/coex_a2dp_mini/main/main.c
View File

@@ -211,7 +211,7 @@ void app_main()
iperf_console_start();
} else {
initialise_wifi();
wifi_sta_join("ASUS", "1234567890");
wifi_sta_join("ble_mesh_xiaomi_3g", "1234567890");
}
}