Skip to content

Commit 4605a8a

Browse files
Isl2017Isl2017
committed
Merge branch 'optimize/ble_mesh_miscellaneous' into 'master'
Optimize/ble mesh miscellaneous See merge request espressif/esp-idf!11500
2 parents c0e0be6 + fb53181 commit 4605a8a

File tree

109 files changed

+4218
-4287
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+4218
-4287
lines changed

‎components/bt/esp_ble_mesh/api/models/include/esp_ble_mesh_generic_model_api.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -367,10 +367,10 @@ typedef struct {
367367

368368
/** Parameters of Generic Battery Status. */
369369
typedef struct {
370-
u32_t battery_level : 8; /*!< Value of Generic Battery Level state */
371-
u32_t time_to_discharge : 24; /*!< Value of Generic Battery Time to Discharge state */
372-
u32_t time_to_charge : 24; /*!< Value of Generic Battery Time to Charge state */
373-
u32_t flags : 8; /*!< Value of Generic Battery Flags state */
370+
uint32_t battery_level : 8; /*!< Value of Generic Battery Level state */
371+
uint32_t time_to_discharge : 24; /*!< Value of Generic Battery Time to Discharge state */
372+
uint32_t time_to_charge : 24; /*!< Value of Generic Battery Time to Charge state */
373+
uint32_t flags : 8; /*!< Value of Generic Battery Flags state */
374374
} esp_ble_mesh_gen_battery_status_cb_t;
375375

376376
/** Parameters of Generic Location Global Status. */

‎components/bt/esp_ble_mesh/btc/btc_ble_mesh_config_model.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ static void btc_ble_mesh_config_client_copy_req_data(btc_msg_t *msg, void *p_des
128128
{
129129
esp_ble_mesh_cfg_client_cb_param_t *p_dest_data = (esp_ble_mesh_cfg_client_cb_param_t *)p_dest;
130130
esp_ble_mesh_cfg_client_cb_param_t *p_src_data = (esp_ble_mesh_cfg_client_cb_param_t *)p_src;
131-
u16_t length = 0U;
131+
uint16_t length = 0U;
132132

133133
if (!msg || !p_src_data || !p_dest_data) {
134134
BT_ERR("%s, Invalid parameter", __func__);
@@ -310,10 +310,10 @@ static void btc_ble_mesh_config_client_callback(esp_ble_mesh_cfg_client_cb_param
310310
btc_ble_mesh_config_client_copy_req_data);
311311
}
312312

313-
void bt_mesh_config_client_cb_evt_to_btc(u32_t opcode, u8_t evt_type,
313+
void bt_mesh_config_client_cb_evt_to_btc(uint32_t opcode, uint8_t evt_type,
314314
struct bt_mesh_model *model,
315315
struct bt_mesh_msg_ctx *ctx,
316-
const u8_t *val, size_t len)
316+
const uint8_t *val, size_t len)
317317
{
318318
esp_ble_mesh_cfg_client_cb_param_t cb_params = {0};
319319
esp_ble_mesh_client_common_param_t params = {0};
@@ -364,7 +364,7 @@ void bt_mesh_config_client_cb_evt_to_btc(u32_t opcode, u8_t evt_type,
364364
return;
365365
}
366366

367-
void btc_ble_mesh_config_client_publish_callback(u32_t opcode, struct bt_mesh_model *model,
367+
void btc_ble_mesh_config_client_publish_callback(uint32_t opcode, struct bt_mesh_model *model,
368368
struct bt_mesh_msg_ctx *ctx,
369369
struct net_buf_simple *buf)
370370
{
@@ -713,9 +713,9 @@ static void btc_ble_mesh_config_server_callback(esp_ble_mesh_cfg_server_cb_param
713713
btc_transfer_context(&msg, cb_params, sizeof(esp_ble_mesh_cfg_server_cb_param_t), NULL);
714714
}
715715

716-
void bt_mesh_config_server_cb_evt_to_btc(u8_t evt_type, struct bt_mesh_model *model,
716+
void bt_mesh_config_server_cb_evt_to_btc(uint8_t evt_type, struct bt_mesh_model *model,
717717
struct bt_mesh_msg_ctx *ctx,
718-
const u8_t *val, size_t len)
718+
const uint8_t *val, size_t len)
719719
{
720720
esp_ble_mesh_cfg_server_cb_param_t cb_params = {0};
721721
uint8_t act = 0U;

‎components/bt/esp_ble_mesh/btc/btc_ble_mesh_generic_model.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ void btc_ble_mesh_generic_client_arg_deep_copy(btc_msg_t *msg, void *p_dest, voi
3737
{
3838
btc_ble_mesh_generic_client_args_t *dst = (btc_ble_mesh_generic_client_args_t *)p_dest;
3939
btc_ble_mesh_generic_client_args_t *src = (btc_ble_mesh_generic_client_args_t *)p_src;
40-
u16_t length = 0U;
40+
uint16_t length = 0U;
4141

4242
if (!msg || !dst || !src) {
4343
BT_ERR("%s, Invalid parameter", __func__);
@@ -164,7 +164,7 @@ static void btc_ble_mesh_generic_client_copy_req_data(btc_msg_t *msg, void *p_de
164164
{
165165
esp_ble_mesh_generic_client_cb_param_t *p_dest_data = (esp_ble_mesh_generic_client_cb_param_t *)p_dest;
166166
esp_ble_mesh_generic_client_cb_param_t *p_src_data = (esp_ble_mesh_generic_client_cb_param_t *)p_src;
167-
u16_t length = 0U;
167+
uint16_t length = 0U;
168168

169169
if (!msg || !p_src_data || !p_dest_data) {
170170
BT_ERR("%s, Invalid parameter", __func__);
@@ -380,10 +380,10 @@ static void btc_ble_mesh_generic_client_callback(esp_ble_mesh_generic_client_cb_
380380
btc_ble_mesh_generic_client_copy_req_data);
381381
}
382382

383-
void bt_mesh_generic_client_cb_evt_to_btc(u32_t opcode, u8_t evt_type,
383+
void bt_mesh_generic_client_cb_evt_to_btc(uint32_t opcode, uint8_t evt_type,
384384
struct bt_mesh_model *model,
385385
struct bt_mesh_msg_ctx *ctx,
386-
const u8_t *val, size_t len)
386+
const uint8_t *val, size_t len)
387387
{
388388
esp_ble_mesh_generic_client_cb_param_t cb_params = {0};
389389
esp_ble_mesh_client_common_param_t params = {0};
@@ -434,7 +434,7 @@ void bt_mesh_generic_client_cb_evt_to_btc(u32_t opcode, u8_t evt_type,
434434
return;
435435
}
436436

437-
void btc_ble_mesh_generic_client_publish_callback(u32_t opcode, struct bt_mesh_model *model,
437+
void btc_ble_mesh_generic_client_publish_callback(uint32_t opcode, struct bt_mesh_model *model,
438438
struct bt_mesh_msg_ctx *ctx,
439439
struct net_buf_simple *buf)
440440
{
@@ -552,7 +552,7 @@ static void btc_ble_mesh_generic_server_copy_req_data(btc_msg_t *msg, void *p_de
552552
{
553553
esp_ble_mesh_generic_server_cb_param_t *p_dest_data = (esp_ble_mesh_generic_server_cb_param_t *)p_dest;
554554
esp_ble_mesh_generic_server_cb_param_t *p_src_data = (esp_ble_mesh_generic_server_cb_param_t *)p_src;
555-
u16_t length = 0U;
555+
uint16_t length = 0U;
556556

557557
if (!msg || !p_src_data || !p_dest_data) {
558558
BT_ERR("%s, Invalid parameter", __func__);
@@ -697,9 +697,9 @@ static void btc_ble_mesh_generic_server_callback(esp_ble_mesh_generic_server_cb_
697697
btc_ble_mesh_generic_server_copy_req_data);
698698
}
699699

700-
void bt_mesh_generic_server_cb_evt_to_btc(u8_t evt_type, struct bt_mesh_model *model,
700+
void bt_mesh_generic_server_cb_evt_to_btc(uint8_t evt_type, struct bt_mesh_model *model,
701701
struct bt_mesh_msg_ctx *ctx,
702-
const u8_t *val, size_t len)
702+
const uint8_t *val, size_t len)
703703
{
704704
esp_ble_mesh_generic_server_cb_param_t cb_params = {0};
705705
uint8_t act = 0U;

‎components/bt/esp_ble_mesh/btc/btc_ble_mesh_health_model.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ static void btc_ble_mesh_health_client_copy_req_data(btc_msg_t *msg, void *p_des
121121
{
122122
esp_ble_mesh_health_client_cb_param_t *p_dest_data = (esp_ble_mesh_health_client_cb_param_t *)p_dest;
123123
esp_ble_mesh_health_client_cb_param_t *p_src_data = (esp_ble_mesh_health_client_cb_param_t *)p_src;
124-
u16_t length = 0U;
124+
uint16_t length = 0U;
125125

126126
if (!msg || !p_src_data || !p_dest_data) {
127127
BT_ERR("%s, Invalid parameter", __func__);
@@ -243,10 +243,10 @@ static void btc_ble_mesh_health_client_callback(esp_ble_mesh_health_client_cb_pa
243243
btc_ble_mesh_health_client_copy_req_data);
244244
}
245245

246-
void bt_mesh_health_client_cb_evt_to_btc(u32_t opcode, u8_t evt_type,
246+
void bt_mesh_health_client_cb_evt_to_btc(uint32_t opcode, uint8_t evt_type,
247247
struct bt_mesh_model *model,
248248
struct bt_mesh_msg_ctx *ctx,
249-
const u8_t *val, u16_t len)
249+
const uint8_t *val, uint16_t len)
250250
{
251251
esp_ble_mesh_health_client_cb_param_t cb_params = {0};
252252
esp_ble_mesh_client_common_param_t params = {0};
@@ -297,7 +297,7 @@ void bt_mesh_health_client_cb_evt_to_btc(u32_t opcode, u8_t evt_type,
297297
return;
298298
}
299299

300-
void btc_ble_mesh_health_publish_callback(u32_t opcode, struct bt_mesh_model *model,
300+
void btc_ble_mesh_health_publish_callback(uint32_t opcode, struct bt_mesh_model *model,
301301
struct bt_mesh_msg_ctx *ctx,
302302
struct net_buf_simple *buf)
303303
{
@@ -602,7 +602,7 @@ void btc_ble_mesh_health_server_cb_handler(btc_msg_t *msg)
602602
return;
603603
}
604604

605-
void btc_ble_mesh_health_server_fault_clear(struct bt_mesh_model *model, u16_t company_id)
605+
void btc_ble_mesh_health_server_fault_clear(struct bt_mesh_model *model, uint16_t company_id)
606606
{
607607
esp_ble_mesh_health_server_cb_param_t param = {0};
608608

@@ -613,7 +613,7 @@ void btc_ble_mesh_health_server_fault_clear(struct bt_mesh_model *model, u16_t c
613613
}
614614

615615
void btc_ble_mesh_health_server_fault_test(struct bt_mesh_model *model,
616-
u8_t test_id, u16_t company_id)
616+
uint8_t test_id, uint16_t company_id)
617617
{
618618
esp_ble_mesh_health_server_cb_param_t param = {0};
619619

@@ -624,7 +624,7 @@ void btc_ble_mesh_health_server_fault_test(struct bt_mesh_model *model,
624624
btc_ble_mesh_health_server_callback(&param, ESP_BLE_MESH_HEALTH_SERVER_FAULT_TEST_EVT);
625625
}
626626

627-
void btc_ble_mesh_health_server_attention_on(struct bt_mesh_model *model, u8_t time)
627+
void btc_ble_mesh_health_server_attention_on(struct bt_mesh_model *model, uint8_t time)
628628
{
629629
esp_ble_mesh_health_server_cb_param_t param = {0};
630630

‎components/bt/esp_ble_mesh/btc/btc_ble_mesh_lighting_model.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ static void btc_ble_mesh_lighting_client_copy_req_data(btc_msg_t *msg, void *p_d
120120
{
121121
esp_ble_mesh_light_client_cb_param_t *p_dest_data = (esp_ble_mesh_light_client_cb_param_t *)p_dest;
122122
esp_ble_mesh_light_client_cb_param_t *p_src_data = (esp_ble_mesh_light_client_cb_param_t *)p_src;
123-
u16_t length = 0U;
123+
uint16_t length = 0U;
124124

125125
if (!msg || !p_src_data || !p_dest_data) {
126126
BT_ERR("%s, Invalid parameter", __func__);
@@ -224,10 +224,10 @@ static void btc_ble_mesh_lighting_client_callback(esp_ble_mesh_light_client_cb_p
224224
btc_ble_mesh_lighting_client_copy_req_data);
225225
}
226226

227-
void bt_mesh_lighting_client_cb_evt_to_btc(u32_t opcode, u8_t evt_type,
227+
void bt_mesh_lighting_client_cb_evt_to_btc(uint32_t opcode, uint8_t evt_type,
228228
struct bt_mesh_model *model,
229229
struct bt_mesh_msg_ctx *ctx,
230-
const u8_t *val, size_t len)
230+
const uint8_t *val, size_t len)
231231
{
232232
esp_ble_mesh_light_client_cb_param_t cb_params = {0};
233233
esp_ble_mesh_client_common_param_t params = {0};
@@ -278,7 +278,7 @@ void bt_mesh_lighting_client_cb_evt_to_btc(u32_t opcode, u8_t evt_type,
278278
return;
279279
}
280280

281-
void btc_ble_mesh_lighting_client_publish_callback(u32_t opcode, struct bt_mesh_model *model,
281+
void btc_ble_mesh_lighting_client_publish_callback(uint32_t opcode, struct bt_mesh_model *model,
282282
struct bt_mesh_msg_ctx *ctx,
283283
struct net_buf_simple *buf)
284284
{
@@ -396,7 +396,7 @@ static void btc_ble_mesh_lighting_server_copy_req_data(btc_msg_t *msg, void *p_d
396396
{
397397
esp_ble_mesh_lighting_server_cb_param_t *p_dest_data = (esp_ble_mesh_lighting_server_cb_param_t *)p_dest;
398398
esp_ble_mesh_lighting_server_cb_param_t *p_src_data = (esp_ble_mesh_lighting_server_cb_param_t *)p_src;
399-
u16_t length = 0U;
399+
uint16_t length = 0U;
400400

401401
if (!msg || !p_src_data || !p_dest_data) {
402402
BT_ERR("%s, Invalid parameter", __func__);
@@ -509,9 +509,9 @@ static void btc_ble_mesh_lighting_server_callback(esp_ble_mesh_lighting_server_c
509509
btc_ble_mesh_lighting_server_copy_req_data);
510510
}
511511

512-
void bt_mesh_lighting_server_cb_evt_to_btc(u8_t evt_type, struct bt_mesh_model *model,
512+
void bt_mesh_lighting_server_cb_evt_to_btc(uint8_t evt_type, struct bt_mesh_model *model,
513513
struct bt_mesh_msg_ctx *ctx,
514-
const u8_t *val, size_t len)
514+
const uint8_t *val, size_t len)
515515
{
516516
esp_ble_mesh_lighting_server_cb_param_t cb_params = {0};
517517
uint8_t act = 0U;

0 commit comments

Comments
 (0)