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

ble_mesh: stack: Minor updates for BQB test log

Browse Source
This commit is contained in:
lly 2023-03-16 14:23:22 +08:00 committed by wangjialiang
parent 161e78150f
commit 71bc754b0a
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/bt/esp_ble_mesh/mesh_common/include/mesh_trace.h
View File

@ -150,20 +150,20 @@ enum BLE_MESH_BQB_TEST_LOG_LEVEL {
BLE_MESH_BQB_TEST_LOG_LEVEL_SUB_ID_HM = BIT(19), BLE_MESH_BQB_TEST_LOG_LEVEL_SUB_ID_HM = BIT(19),
}; };
#define BLE_MESH_BQB_TEST_LOG_LEVEL_OUTPUT_NONE 0x000FFFFF #define BLE_MESH_BQB_TEST_LOG_LEVEL_OUTPUT_NONE 0x000FFFFF
#endif /* CONFIG_BLE_MESH_BQB_TEST_LOG */ #endif /* CONFIG_BLE_MESH_BQB_TEST_LOG */
#if (CONFIG_BLE_MESH_BQB_TEST_LOG && !CONFIG_BLE_MESH_NO_LOG) #if (CONFIG_BLE_MESH_BQB_TEST_LOG && !CONFIG_BLE_MESH_NO_LOG)
extern bool bt_mesh_bqb_test_flag_check(uint32_t module_mask); extern bool bt_mesh_bqb_test_flag_check(uint32_t flag_mask);
extern int bt_mesh_bqb_test_flag_set(uint32_t value); extern int bt_mesh_bqb_test_flag_set(uint32_t value);
#define BT_BQB(module_mask, fmt, args...) \ #define BT_BQB(flag_mask, fmt, args...) \
do { \ do { \
if (bt_mesh_bqb_test_flag_check(module_mask)) \ if (bt_mesh_bqb_test_flag_check(flag_mask)) \
BLE_MESH_PRINT_I("BLE_MESH_BQB", fmt, ## args); \ BLE_MESH_PRINT_I("BLE_MESH_BQB", fmt, ## args); \
} while (0) } while (0)
#else #else
#define BT_BQB(module_mask, fmt, args...) #define BT_BQB(flag_mask, fmt, args...)
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus

14
components/bt/esp_ble_mesh/mesh_common/mesh_util.c
View File

@ -75,22 +75,24 @@ uint32_t bt_mesh_bqb_test_flag_get(void)
return bt_mesh_bqb_test_flag(BLE_MESH_BQB_TEST_FLAG_OP_GET, 0); return bt_mesh_bqb_test_flag(BLE_MESH_BQB_TEST_FLAG_OP_GET, 0);
} }
int bt_mesh_bqb_test_flag_set(uint32_t module_mask) int bt_mesh_bqb_test_flag_set(uint32_t flag_mask)
{ {
if (module_mask > BLE_MESH_BQB_TEST_LOG_LEVEL_OUTPUT_NONE) { if (module_mask > BLE_MESH_BQB_TEST_LOG_LEVEL_OUTPUT_NONE) {
BT_ERR("BT_BQB module mask error : overflow"); BT_ERR("Invalid BQB test flag mask 0x%08x", flag_mask);
return -EINVAL; return -EINVAL;
} }
return (bt_mesh_bqb_test_flag(BLE_MESH_BQB_TEST_FLAG_OP_SET, module_mask) == module_mask) ? 0 : -EINVAL;
return (bt_mesh_bqb_test_flag(BLE_MESH_BQB_TEST_FLAG_OP_SET, flag_mask) == flag_mask) ? 0 : -EINVAL;
} }
bool bt_mesh_bqb_test_flag_check(uint32_t module_mask) bool bt_mesh_bqb_test_flag_check(uint32_t flag_mask)
{ {
if (module_mask > BLE_MESH_BQB_TEST_LOG_LEVEL_OUTPUT_NONE) { if (module_mask > BLE_MESH_BQB_TEST_LOG_LEVEL_OUTPUT_NONE) {
BT_ERR("BT_BQB module mask error : overflow"); BT_ERR("Invalid BQB test flag mask 0x%08x", flag_mask);
return false; return false;
} }
return ((bt_mesh_bqb_test_flag_get() & module_mask) == module_mask); return ((bt_mesh_bqb_test_flag_get() & flag_mask) == flag_mask);
} }
#endif /* CONFIG_BLE_MESH_BQB_TEST_LOG */ #endif /* CONFIG_BLE_MESH_BQB_TEST_LOG */