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 'feat/ble_mesh_lib_flash_size_optimized_v5.3' into 'release/v5.3'

Browse Source 
feat(ble_mesh): ble mesh lib flash size optimized (v5.3)

See merge request espressif/esp-idf!33477
This commit is contained in:
Island 2024-09-20 10:36:16 +08:00
commit cdef1308a4
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
components/bt/esp_ble_mesh/lib/ext.c
View File

@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@ -8,6 +8,8 @@
#include <string.h>
#include <assert.h>
#include "esp_log.h"
#if CONFIG_BT_BLUEDROID_ENABLED
#include "bta/bta_api.h"
#endif
@ -190,6 +192,11 @@ void bt_mesh_ext_mem_swap(void *buf, size_t length)
sys_mem_swap(buf, length);
}
uint32_t bt_mesh_ext_log_timestamp(void)
{
return esp_log_timestamp();
}
/* Net buf */
void bt_mesh_ext_buf_simple_init(struct net_buf_simple *buf, size_t reserve_head)
{
@ -498,6 +505,11 @@ float bt_mesh_ext_log2(float num)
return bt_mesh_log2(num);
}
const char *bt_mesh_ext_hex(const void *buf, size_t len)
{
return bt_hex(buf, len);
}
/* Crypto */
bool bt_mesh_ext_s1(const char *m, uint8_t salt[16])
{
@ -3954,6 +3966,8 @@ void bt_mesh_ext_mbt_server_cb_evt_to_btc(uint8_t event, void *model, void *ctx)
}
typedef struct {
uint64_t config_ble_mesh_stack_trace_level : 3;
uint64_t config_ble_mesh_use_duplicate_scan : 1;
uint64_t config_ble_mesh_pb_adv : 1;
uint64_t config_ble_mesh_pb_gatt : 1;
@ -4116,6 +4130,8 @@ typedef struct {
} bt_mesh_ext_config_t;
static const bt_mesh_ext_config_t bt_mesh_ext_cfg = {
.config_ble_mesh_stack_trace_level = BLE_MESH_LOG_LEVEL,
.config_ble_mesh_use_duplicate_scan = IS_ENABLED(CONFIG_BLE_MESH_USE_DUPLICATE_SCAN),
.config_ble_mesh_pb_adv = IS_ENABLED(CONFIG_BLE_MESH_PB_ADV),
.config_ble_mesh_pb_gatt = IS_ENABLED(CONFIG_BLE_MESH_PB_GATT),

2
components/bt/esp_ble_mesh/lib/lib

@ -1 +1 @@
Subproject commit 4934ca903807dd74f7f808dadcd9a478e18fc6c3
Subproject commit 590bd6e3d2b20327138a96e44cf3da6d43a8abdc