pioduino/esp-idf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ble_mesh): Check if role needed to be set based on idf version

Browse Source
This commit is contained in:
Liu Linyan
2023-09-21 13:23:59 +08:00
committed by BOT
parent 3093384045
commit ec9e9ff376
9 changed files with 69 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/bluetooth/esp_ble_mesh/common_components/fast_prov/ble_mesh_fast_prov_client_model.c
+21
View File
@@ -129,6 +129,9 @@ void example_send_self_prov_node_addr(struct k_work *work)
.app_idx = fast_prov_srv->app_idx,
.dst = fast_prov_srv->prim_prov_addr,
.timeout = 0,
#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 2, 0)
.role = ROLE_FAST_PROV,
#endif
};
err = example_send_fast_prov_self_prov_node_addr(model, &info, node_addr_send.addr);
if (err != ESP_OK) {
@@ -178,6 +181,9 @@ static void example_get_all_node_addr(struct k_work *work)
.app_idx = node->app_idx,
.dst = node->unicast_addr,
.timeout = 10000,
#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 2, 0)
.role = ROLE_PROVISIONER,
#endif
};
err = example_send_fast_prov_all_node_addr_get(model, &info);
if (err != ESP_OK) {
@@ -232,10 +238,16 @@ esp_err_t example_fast_prov_client_recv_timeout(uint32_t opcode, esp_ble_mesh_mo
set.ctx_flags = BIT(6);
set.group_addr = fast_prov_srv->group_addr;
}
#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 2, 0)
info.role = ROLE_FAST_PROV;
#endif
#else
set.ctx_flags = 0x037F;
memcpy(&set.node_addr_cnt, &node->node_addr_cnt,
sizeof(example_node_info_t) - offsetof(example_node_info_t, node_addr_cnt));
#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 2, 0)
info.role = ROLE_PROVISIONER;
#endif
#endif
err = example_send_fast_prov_info_set(model, &info, &set);
if (err != ESP_OK) {
@@ -254,6 +266,9 @@ esp_err_t example_fast_prov_client_recv_timeout(uint32_t opcode, esp_ble_mesh_mo
.app_idx = fast_prov_srv->app_idx,
.dst = fast_prov_srv->prim_prov_addr,
.timeout = 0,
#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 2, 0)
.role = ROLE_FAST_PROV,
#endif
};
err = example_send_fast_prov_self_prov_node_addr(model, &info, node_addr_send.addr);
if (err != ESP_OK) {
@@ -281,6 +296,9 @@ esp_err_t example_fast_prov_client_recv_timeout(uint32_t opcode, esp_ble_mesh_mo
.app_idx = node->app_idx,
.dst = node->unicast_addr,
.timeout = 10000,
#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 2, 0)
.role = ROLE_PROVISIONER,
#endif
};
err = example_send_fast_prov_all_node_addr_get(model, &info);
if (err != ESP_OK) {
@@ -378,6 +396,9 @@ esp_err_t example_fast_prov_client_recv_status(esp_ble_mesh_model_t *model,
.app_idx = node->app_idx,
.dst = node->group_addr,
.timeout = 0,
#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 2, 0)
.role = ROLE_PROVISIONER,
#endif
};
err = example_send_generic_onoff_set(cli_model, &info, LED_ON, 0x00, false);
if (err != ESP_OK) {
examples/bluetooth/esp_ble_mesh/common_components/fast_prov/ble_mesh_fast_prov_operation.c
+9
View File
@@ -351,6 +351,9 @@ esp_err_t example_send_config_appkey_add(esp_ble_mesh_model_t *model,
common.ctx.addr = info->dst;
common.ctx.send_ttl = 0;
common.msg_timeout = info->timeout;
#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 2, 0)
common.msg_role = info->role;
#endif
return esp_ble_mesh_config_client_set_state(&common, &set);
}
@@ -372,6 +375,9 @@ esp_err_t example_send_generic_onoff_get(esp_ble_mesh_model_t *model,
common.ctx.addr = info->dst;
common.ctx.send_ttl = 0;
common.msg_timeout = info->timeout;
#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 2, 0)
common.msg_role = info->role;
#endif
return esp_ble_mesh_generic_client_get_state(&common, &get);
}
@@ -403,6 +409,9 @@ esp_err_t example_send_generic_onoff_set(esp_ble_mesh_model_t *model,
common.ctx.addr = info->dst;
common.ctx.send_ttl = 0;
common.msg_timeout = info->timeout;
#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 2, 0)
common.msg_role = info->role;
#endif
return esp_ble_mesh_generic_client_set_state(&common, &set);
}