Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 03:00:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(ble_mesh): fixed issues with incorrect logs format and position

Browse Source
This commit is contained in:
Rainer
2025-12-01 15:01:43 +08:00
committed by Luo Xu
parent 3240e464ba
commit ae93cc0673
5 changed files with 45 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/bt/esp_ble_mesh/core/cfg_cli.c
+18 -18
View File
@@ -237,7 +237,7 @@ static void comp_data_status(struct bt_mesh_model *model,
BT_DBG("CompDataStatus");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
status.page = net_buf_simple_pull_u8(buf);
status.comp_data = bt_mesh_alloc_buf(buf->len);
@@ -260,7 +260,7 @@ static void state_status_u8(struct bt_mesh_model *model,
BT_DBG("StateStatusU8");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
status = net_buf_simple_pull_u8(buf);
@@ -312,7 +312,7 @@ static void relay_status(struct bt_mesh_model *model,
BT_DBG("RelayStatus");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
status.relay = net_buf_simple_pull_u8(buf);
status.retransmit = net_buf_simple_pull_u8(buf);
@@ -329,7 +329,7 @@ static void net_key_status(struct bt_mesh_model *model,
BT_DBG("NetKeyStatus");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
status.status = net_buf_simple_pull_u8(buf);
status.net_idx = net_buf_simple_pull_le16(buf) & 0xfff;
@@ -346,7 +346,7 @@ static void app_key_status(struct bt_mesh_model *model,
BT_DBG("AppKeyStatus");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
status.status = net_buf_simple_pull_u8(buf);
key_idx_unpack(buf, &status.net_idx, &status.app_idx);
@@ -363,7 +363,7 @@ static void mod_app_status(struct bt_mesh_model *model,
BT_DBG("ModAppStatus");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
status.status = net_buf_simple_pull_u8(buf);
status.elem_addr = net_buf_simple_pull_le16(buf);
@@ -387,7 +387,7 @@ static void mod_pub_status(struct bt_mesh_model *model,
BT_DBG("ModPubStatus");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
status.status = net_buf_simple_pull_u8(buf);
status.elem_addr = net_buf_simple_pull_le16(buf);
@@ -417,7 +417,7 @@ static void mod_sub_status(struct bt_mesh_model *model,
BT_DBG("ModSubStatus");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
status.status = net_buf_simple_pull_u8(buf);
status.elem_addr = net_buf_simple_pull_le16(buf);
@@ -441,7 +441,7 @@ static void hb_sub_status(struct bt_mesh_model *model,
BT_DBG("HbSubStatus");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
status.status = net_buf_simple_pull_u8(buf);
status.src = net_buf_simple_pull_le16(buf);
@@ -463,7 +463,7 @@ static void hb_pub_status(struct bt_mesh_model *model,
BT_DBG("HbPubStatus");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
status.status = net_buf_simple_pull_u8(buf);
status.dst = net_buf_simple_pull_le16(buf);
@@ -483,7 +483,7 @@ static void node_reset_status(struct bt_mesh_model *model,
BT_DBG("NodeResetStatus");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
cfg_client_recv_status(model, ctx, NULL, 0);
}
@@ -497,7 +497,7 @@ static void mod_sub_list(struct bt_mesh_model *model,
BT_DBG("ModSubList");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
list.status = net_buf_simple_pull_u8(buf);
list.elem_addr = net_buf_simple_pull_le16(buf);
@@ -527,7 +527,7 @@ static void net_key_list(struct bt_mesh_model *model,
BT_DBG("NetKeyList");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
list.net_idx = bt_mesh_alloc_buf(buf->len);
if (!list.net_idx) {
@@ -548,7 +548,7 @@ static void app_key_list(struct bt_mesh_model *model,
BT_DBG("AppKeyList");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
list.status = net_buf_simple_pull_u8(buf);
list.net_idx = net_buf_simple_pull_le16(buf);
@@ -571,7 +571,7 @@ static void node_id_status(struct bt_mesh_model *model,
BT_DBG("NodeIDStatus");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
status.status = net_buf_simple_pull_u8(buf);
status.net_idx = net_buf_simple_pull_le16(buf);
@@ -589,7 +589,7 @@ static void mod_app_list(struct bt_mesh_model *model,
BT_DBG("ModAppList");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
list.status = net_buf_simple_pull_u8(buf);
list.elem_addr = net_buf_simple_pull_le16(buf);
@@ -619,7 +619,7 @@ static void kr_phase_status(struct bt_mesh_model *model,
BT_DBG("KrPhaseStatus");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
status.status = net_buf_simple_pull_u8(buf);
status.net_idx = net_buf_simple_pull_le16(buf);
@@ -637,7 +637,7 @@ static void lpn_pollto_status(struct bt_mesh_model *model,
BT_DBG("LPNPollToStatus");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
status.lpn_addr = net_buf_simple_pull_le16(buf);
status.timeout = net_buf_simple_pull_u8(buf);
components/bt/esp_ble_mesh/core/cfg_srv.c
+17 -17
View File
@@ -144,7 +144,7 @@ static void get_comp_data(struct net_buf_simple *buf,
}
}
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
}
static int fetch_comp_data(struct net_buf_simple *buf,
@@ -213,7 +213,7 @@ static void comp_data_get(struct bt_mesh_model *model,
BT_DBG("CompDataGet");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
/* TODO:
*
@@ -817,7 +817,7 @@ static void beacon_get(struct bt_mesh_model *model,
BT_DBG("BeaconGet");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
bt_mesh_model_msg_init(&msg, OP_BEACON_STATUS);
net_buf_simple_add_u8(&msg, bt_mesh_secure_beacon_get());
@@ -837,7 +837,7 @@ static void beacon_set(struct bt_mesh_model *model,
BT_DBG("BeaconSet");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
if (!cfg) {
BT_WARN("No Configuration Server context available");
@@ -877,7 +877,7 @@ static void default_ttl_get(struct bt_mesh_model *model,
BT_DBG("DefaultTTLGet");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
bt_mesh_model_msg_init(&msg, OP_DEFAULT_TTL_STATUS);
net_buf_simple_add_u8(&msg, bt_mesh_default_ttl_get());
@@ -897,7 +897,7 @@ static void default_ttl_set(struct bt_mesh_model *model,
BT_DBG("DefaultTTLSet");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
if (!cfg) {
BT_WARN("No Configuration Server context available");
@@ -944,7 +944,7 @@ static void gatt_proxy_get(struct bt_mesh_model *model,
BT_DBG("GattProxyGet");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
send_gatt_proxy_status(model, ctx);
}
@@ -958,7 +958,7 @@ static void gatt_proxy_set(struct bt_mesh_model *model,
BT_DBG("GattProxySet");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
if (buf->data[0] != 0x00 && buf->data[0] != 0x01) {
BT_WARN("Invalid GATT Proxy value 0x%02x", buf->data[0]);
@@ -1021,7 +1021,7 @@ static void net_transmit_get(struct bt_mesh_model *model,
BT_DBG("NetTransmitGet");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
bt_mesh_model_msg_init(&msg, OP_NET_TRANSMIT_STATUS);
net_buf_simple_add_u8(&msg, bt_mesh_net_transmit_get());
@@ -1041,7 +1041,7 @@ static void net_transmit_set(struct bt_mesh_model *model,
BT_DBG("NetTransmitSet");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
BT_DBG("Transmit 0x%02x Count %u Interval %u",
buf->data[0],
@@ -1075,7 +1075,7 @@ static void relay_get(struct bt_mesh_model *model,
BT_DBG("RelayGet");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
bt_mesh_model_msg_init(&msg, OP_RELAY_STATUS);
net_buf_simple_add_u8(&msg, bt_mesh_relay_get());
@@ -1096,7 +1096,7 @@ static void relay_set(struct bt_mesh_model *model,
BT_DBG("RelaySet");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
if (!cfg) {
BT_WARN("No Configuration Server context available");
@@ -2777,7 +2777,7 @@ static void node_identity_get(struct bt_mesh_model *model,
BT_DBG("NodeIdentityGet");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
idx = net_buf_simple_pull_le16(buf);
if (idx > 0xfff) {
@@ -2817,7 +2817,7 @@ static void node_identity_set(struct bt_mesh_model *model,
BT_DBG("NodeIdentitySet");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
idx = net_buf_simple_pull_le16(buf);
if (idx > 0xfff) {
@@ -3098,7 +3098,7 @@ static void node_reset(struct bt_mesh_model *model,
BT_DBG("NodeReset");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
bt_mesh_model_msg_init(&msg, OP_NODE_RESET_STATUS);
@@ -3137,7 +3137,7 @@ static void friend_get(struct bt_mesh_model *model,
BT_DBG("FrndGet");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
send_friend_status(model, ctx);
}
@@ -3151,7 +3151,7 @@ static void friend_set(struct bt_mesh_model *model,
BT_DBG("FrndSet");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
if (buf->data[0] != 0x00 && buf->data[0] != 0x01) {
BT_WARN("Invalid Friend value 0x%02x", buf->data[0]);
components/bt/esp_ble_mesh/core/friend.c
+3 -3
View File
@@ -354,7 +354,7 @@ static bool friend_sub_exist(struct bt_mesh_friend *frnd, uint16_t addr)
{
int i;
BT_DBG("IsFrndSubExist, Addr 0x%04x");
BT_DBG("IsFrndSubExist, Addr 0x%04x", addr);
for (i = 0; i < ARRAY_SIZE(frnd->sub_list); i++) {
if (frnd->sub_list[i] == addr) {
@@ -369,7 +369,7 @@ static void friend_sub_add(struct bt_mesh_friend *frnd, uint16_t addr)
{
int i;
BT_DBG("FrndSubAdd, Addr 0x%04x");
BT_DBG("FrndSubAdd, Addr 0x%04x", addr);
for (i = 0; i < ARRAY_SIZE(frnd->sub_list); i++) {
if (frnd->sub_list[i] == BLE_MESH_ADDR_UNASSIGNED) {
@@ -385,7 +385,7 @@ static void friend_sub_rem(struct bt_mesh_friend *frnd, uint16_t addr)
{
int i;
BT_DBG("FrndSubRem, Addr 0x%04x");
BT_DBG("FrndSubRem, Addr 0x%04x", addr);
for (i = 0; i < ARRAY_SIZE(frnd->sub_list); i++) {
if (frnd->sub_list[i] == addr) {
components/bt/esp_ble_mesh/core/health_cli.c
+4 -4
View File
@@ -138,7 +138,7 @@ static void health_fault_status(struct bt_mesh_model *model,
BT_DBG("HealthFaultStatus");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
status.test_id = net_buf_simple_pull_u8(buf);
status.cid = net_buf_simple_pull_le16(buf);
@@ -162,7 +162,7 @@ static void health_current_status(struct bt_mesh_model *model,
BT_DBG("HealthCurrentStatus");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
status.test_id = net_buf_simple_pull_u8(buf);
status.cid = net_buf_simple_pull_le16(buf);
@@ -186,7 +186,7 @@ static void health_period_status(struct bt_mesh_model *model,
BT_DBG("HealthPeriodStatus");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
status = net_buf_simple_pull_u8(buf);
@@ -202,7 +202,7 @@ static void health_attention_status(struct bt_mesh_model *model,
BT_DBG("HealthAttentionStatus");
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
ctx->net_idx, ctx->app_idx, ctx->addr);
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
status = net_buf_simple_pull_u8(buf);
components/bt/esp_ble_mesh/core/net.c
+3
View File
@@ -2012,6 +2012,9 @@ void bt_mesh_net_recv(struct net_buf_simple *data, int8_t rssi,
/* Save the state so the buffer can later be relayed */
net_buf_simple_save(&buf, &state);
BT_DBG("NetRecv, Src 0x%04x Dst 0x%04x Rssi %d NetIf %u",
rx->ctx.addr, rx->ctx.recv_dst, rx->ctx.recv_rssi, net_if);
BT_BQB(BLE_MESH_BQB_TEST_LOG_LEVEL_PRIMARY_ID_NODE | \
BLE_MESH_BQB_TEST_LOG_LEVEL_SUB_ID_NET,
"\nNetRecv: ctl: %d, src: %d, dst: %d, ttl: %d, data: 0x%s",