From 7359e3df60790f1537ddcafd1c77a1392dc739de Mon Sep 17 00:00:00 2001 From: Rubin Gerritsen Date: Tue, 30 Jul 2024 15:23:58 +0200 Subject: [PATCH] Samples: Bluetooth: HCI error prints to use bt_hci_err_to_str() When developing Bluetooth applications, you typically run into some errors. If you are an experienced Bluetooth developer, you would typically know how to translate the error codes into string representations. Others might not. This commit starts using `bt_hci_err_to_str()` for all samples under `samples/bluetooth`. Similar changes can be done in other applications and samples. To enable string printing, enable CONFIG_BT_HCI_ERR_TO_STR. The format used is equal to the one added in https://github.com/zephyrproject-rtos/zephyr/pull/75442. Signed-off-by: Rubin Gerritsen --- samples/bluetooth/central_and_peripheral_hr/src/main.c | 6 ++++-- samples/bluetooth/central_bas/src/main.c | 5 +++-- samples/bluetooth/central_hids/src/main.c | 5 +++-- samples/bluetooth/central_hr_coded/src/main.c | 6 ++++-- samples/bluetooth/central_nfc_pairing/src/main.c | 5 +++-- samples/bluetooth/central_smp_client/src/main.c | 5 +++-- samples/bluetooth/central_uart/src/main.c | 5 +++-- samples/bluetooth/conn_time_sync/src/central.c | 5 +++-- samples/bluetooth/conn_time_sync/src/peripheral.c | 5 +++-- samples/bluetooth/direction_finding_central/src/main.c | 5 +++-- samples/bluetooth/direction_finding_peripheral/src/main.c | 4 ++-- samples/bluetooth/event_trigger/src/main.c | 5 +++-- samples/bluetooth/fast_pair/input_device/src/main.c | 5 +++-- .../iso_combined_bis_and_cis/src/combined_bis_cis.c | 5 +++-- samples/bluetooth/iso_time_sync/src/cis_central.c | 5 +++-- samples/bluetooth/iso_time_sync/src/cis_peripheral.c | 5 +++-- samples/bluetooth/llpm/src/main.c | 4 ++-- samples/bluetooth/multiple_adv_sets/src/main.c | 5 +++-- samples/bluetooth/peripheral_ams_client/src/main.c | 5 +++-- samples/bluetooth/peripheral_ancs_client/src/main.c | 5 +++-- samples/bluetooth/peripheral_bms/src/main.c | 4 ++-- samples/bluetooth/peripheral_cgms/src/main.c | 8 ++++---- samples/bluetooth/peripheral_cts_client/src/main.c | 5 +++-- samples/bluetooth/peripheral_gatt_dm/src/main.c | 7 +++---- samples/bluetooth/peripheral_hids_keyboard/src/main.c | 4 ++-- samples/bluetooth/peripheral_hids_mouse/src/main.c | 5 +++-- samples/bluetooth/peripheral_hr_coded/src/main.c | 5 +++-- samples/bluetooth/peripheral_lbs/src/main.c | 4 ++-- samples/bluetooth/peripheral_mds/src/main.c | 5 +++-- samples/bluetooth/peripheral_nfc_pairing/src/main.c | 8 ++++---- samples/bluetooth/peripheral_power_profiling/src/main.c | 5 +++-- samples/bluetooth/peripheral_rscs/src/main.c | 5 +++-- samples/bluetooth/peripheral_status/src/main.c | 4 ++-- samples/bluetooth/peripheral_uart/src/main.c | 4 ++-- samples/bluetooth/radio_notification_cb/src/main.c | 6 ++++-- samples/bluetooth/shell_bt_nus/src/main.c | 4 ++-- samples/bluetooth/throughput/src/main.c | 4 ++-- 37 files changed, 107 insertions(+), 80 deletions(-) diff --git a/samples/bluetooth/central_and_peripheral_hr/src/main.c b/samples/bluetooth/central_and_peripheral_hr/src/main.c index e650c9cb31c..15621a10600 100644 --- a/samples/bluetooth/central_and_peripheral_hr/src/main.c +++ b/samples/bluetooth/central_and_peripheral_hr/src/main.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include @@ -228,7 +229,8 @@ static void connected(struct bt_conn *conn, uint8_t conn_err) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); if (conn_err) { - printk("Failed to connect to %s (%u)\n", addr, conn_err); + printk("Failed to connect to %s, 0x%02x %s\n", addr, conn_err, + bt_hci_err_to_str(conn_err)); if (conn == central_conn) { bt_conn_unref(central_conn); @@ -268,7 +270,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); - printk("Disconnected: %s (reason %u)\n", addr, reason); + printk("Disconnected: %s, reason 0x%02x %s\n", addr, reason, bt_hci_err_to_str(reason)); if (conn == central_conn) { dk_set_led_off(CENTRAL_CON_STATUS_LED); diff --git a/samples/bluetooth/central_bas/src/main.c b/samples/bluetooth/central_bas/src/main.c index 86cf026640a..a481b1e1f04 100644 --- a/samples/bluetooth/central_bas/src/main.c +++ b/samples/bluetooth/central_bas/src/main.c @@ -170,7 +170,8 @@ static void connected(struct bt_conn *conn, uint8_t conn_err) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); if (conn_err) { - printk("Failed to connect to %s (%u)\n", addr, conn_err); + printk("Failed to connect to %s, 0x%02x %s\n", addr, conn_err, + bt_hci_err_to_str(conn_err)); if (conn == default_conn) { bt_conn_unref(default_conn); default_conn = NULL; @@ -203,7 +204,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); - printk("Disconnected: %s (reason %u)\n", addr, reason); + printk("Disconnected: %s, reason 0x%02x %s\n", addr, reason, bt_hci_err_to_str(reason)); if (default_conn != conn) { return; diff --git a/samples/bluetooth/central_hids/src/main.c b/samples/bluetooth/central_hids/src/main.c index 123c61dabfe..221e8ddbaaa 100644 --- a/samples/bluetooth/central_hids/src/main.c +++ b/samples/bluetooth/central_hids/src/main.c @@ -182,7 +182,8 @@ static void connected(struct bt_conn *conn, uint8_t conn_err) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); if (conn_err) { - printk("Failed to connect to %s (%u)\n", addr, conn_err); + printk("Failed to connect to %s, 0x%02x %s\n", addr, conn_err, + bt_hci_err_to_str(conn_err)); if (conn == default_conn) { bt_conn_unref(default_conn); default_conn = NULL; @@ -220,7 +221,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason) auth_conn = NULL; } - printk("Disconnected: %s (reason %u)\n", addr, reason); + printk("Disconnected: %s, reason 0x%02x %s\n", addr, reason, bt_hci_err_to_str(reason)); if (bt_hogp_assign_check(&hogp)) { printk("HIDS client active - releasing"); diff --git a/samples/bluetooth/central_hr_coded/src/main.c b/samples/bluetooth/central_hr_coded/src/main.c index 55614e2f331..e5d856ed6bd 100644 --- a/samples/bluetooth/central_hr_coded/src/main.c +++ b/samples/bluetooth/central_hr_coded/src/main.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -189,7 +190,8 @@ static void connected(struct bt_conn *conn, uint8_t conn_err) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); if (conn_err) { - printk("Failed to connect to %s (%u)\n", addr, conn_err); + printk("Failed to connect to %s, 0x%02x %s\n", addr, conn_err, + bt_hci_err_to_str(conn_err)); bt_conn_unref(default_conn); default_conn = NULL; @@ -228,7 +230,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); - printk("Disconnected: %s (reason 0x%02x)\n", addr, reason); + printk("Disconnected: %s, reason 0x%02x %s\n", addr, reason, bt_hci_err_to_str(reason)); if (default_conn != conn) { return; diff --git a/samples/bluetooth/central_nfc_pairing/src/main.c b/samples/bluetooth/central_nfc_pairing/src/main.c index 33c9ac16e22..6da49bf415c 100644 --- a/samples/bluetooth/central_nfc_pairing/src/main.c +++ b/samples/bluetooth/central_nfc_pairing/src/main.c @@ -151,7 +151,8 @@ static void connected(struct bt_conn *conn, uint8_t conn_err) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); if (conn_err) { - printk("Failed to connect to %s (%u)\n", addr, conn_err); + printk("Failed to connect to %s, 0x%02x %s\n", addr, conn_err, + bt_hci_err_to_str(conn_err)); if (conn == default_conn) { bt_conn_unref(default_conn); default_conn = NULL; @@ -181,7 +182,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); - printk("Disconnected: %s (reason %u)\n", addr, reason); + printk("Disconnected: %s, reason 0x%02x %s\n", addr, reason, bt_hci_err_to_str(reason)); if (default_conn != conn) { return; diff --git a/samples/bluetooth/central_smp_client/src/main.c b/samples/bluetooth/central_smp_client/src/main.c index e97207af569..5f8ef801931 100644 --- a/samples/bluetooth/central_smp_client/src/main.c +++ b/samples/bluetooth/central_smp_client/src/main.c @@ -139,7 +139,8 @@ static void connected(struct bt_conn *conn, uint8_t conn_err) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); if (conn_err) { - printk("Failed to connect to %s (%u)\n", addr, conn_err); + printk("Failed to connect to %s, 0x%02x %s\n", addr, conn_err, + bt_hci_err_to_str(conn_err)); if (conn == default_conn) { bt_conn_unref(default_conn); default_conn = NULL; @@ -186,7 +187,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); - printk("Disconnected: %s (reason %u)\n", addr, reason); + printk("Disconnected: %s, reason 0x%02x %s\n", addr, reason, bt_hci_err_to_str(reason)); if (default_conn != conn) { return; diff --git a/samples/bluetooth/central_uart/src/main.c b/samples/bluetooth/central_uart/src/main.c index 14d4137a9f7..46a839cc055 100644 --- a/samples/bluetooth/central_uart/src/main.c +++ b/samples/bluetooth/central_uart/src/main.c @@ -354,7 +354,8 @@ static void connected(struct bt_conn *conn, uint8_t conn_err) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); if (conn_err) { - LOG_INF("Failed to connect to %s (%d)", addr, conn_err); + LOG_INF("Failed to connect to %s, 0x%02x %s", addr, conn_err, + bt_hci_err_to_str(conn_err)); if (default_conn == conn) { bt_conn_unref(default_conn); @@ -400,7 +401,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); - LOG_INF("Disconnected: %s (reason %u)", addr, reason); + LOG_INF("Disconnected: %s, reason 0x%02x %s", addr, reason, bt_hci_err_to_str(reason)); if (default_conn != conn) { return; diff --git a/samples/bluetooth/conn_time_sync/src/central.c b/samples/bluetooth/conn_time_sync/src/central.c index 05b0e4a9e31..f8adfb698fe 100644 --- a/samples/bluetooth/conn_time_sync/src/central.c +++ b/samples/bluetooth/conn_time_sync/src/central.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include <../subsys/bluetooth/host/conn_internal.h> #include "conn_time_sync.h" @@ -192,7 +193,7 @@ static void connected(struct bt_conn *conn, uint8_t err) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); if (err) { - printk("Failed to connect to %s (%u)\n", addr, err); + printk("Failed to connect to %s 0x%02x %s\n", addr, err, bt_hci_err_to_str(err)); scan_start(); return; @@ -227,7 +228,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); - printk("Disconnected: %s (reason 0x%02x)\n", addr, reason); + printk("Disconnected: %s, reason 0x%02x %s\n", addr, reason, bt_hci_err_to_str(reason)); conn_count--; diff --git a/samples/bluetooth/conn_time_sync/src/peripheral.c b/samples/bluetooth/conn_time_sync/src/peripheral.c index b363e1f18b1..c667d4de458 100644 --- a/samples/bluetooth/conn_time_sync/src/peripheral.c +++ b/samples/bluetooth/conn_time_sync/src/peripheral.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include <../subsys/bluetooth/host/conn_internal.h> @@ -84,7 +85,7 @@ static void connected(struct bt_conn *conn, uint8_t err) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); if (err) { - printk("Failed to connect to %s (%u)\n", addr, err); + printk("Failed to connect to %s 0x%02x %s\n", addr, err, bt_hci_err_to_str(err)); adv_start(); return; @@ -99,7 +100,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); - printk("Disconnected: %s (reason 0x%02x)\n", addr, reason); + printk("Disconnected: %s, reason 0x%02x %s\n", addr, reason, bt_hci_err_to_str(reason)); adv_start(); } diff --git a/samples/bluetooth/direction_finding_central/src/main.c b/samples/bluetooth/direction_finding_central/src/main.c index e17e88d1be7..60139791568 100644 --- a/samples/bluetooth/direction_finding_central/src/main.c +++ b/samples/bluetooth/direction_finding_central/src/main.c @@ -197,7 +197,8 @@ static void connected(struct bt_conn *conn, uint8_t conn_err) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); if (conn_err) { - printk("Failed to connect to %s (%u)\n", addr, conn_err); + printk("Failed to connect to %s, 0x%02x %s\n", addr, conn_err, + bt_hci_err_to_str(conn_err)); bt_conn_unref(default_conn); default_conn = NULL; @@ -219,7 +220,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); - printk("Disconnected: %s (reason 0x%02x)\n", addr, reason); + printk("Disconnected: %s, reason 0x%02x %s\n", addr, reason, bt_hci_err_to_str(reason)); if (default_conn != conn) { return; diff --git a/samples/bluetooth/direction_finding_peripheral/src/main.c b/samples/bluetooth/direction_finding_peripheral/src/main.c index 3eafde62ca9..6673f91d8ab 100644 --- a/samples/bluetooth/direction_finding_peripheral/src/main.c +++ b/samples/bluetooth/direction_finding_peripheral/src/main.c @@ -74,7 +74,7 @@ static void enable_cte_response(struct bt_conn *conn) static void connected(struct bt_conn *conn, uint8_t err) { if (err) { - printk("Connection failed (err 0x%02x)\n", err); + printk("Connection failed, err 0x%02x %s\n", err, bt_hci_err_to_str(err)); } else { printk("Connected\n"); @@ -84,7 +84,7 @@ static void connected(struct bt_conn *conn, uint8_t err) static void disconnected(struct bt_conn *conn, uint8_t reason) { - printk("Disconnected (reason 0x%02x)\n", reason); + printk("Disconnected, reason 0x%02x %s\n", reason, bt_hci_err_to_str(reason)); } BT_CONN_CB_DEFINE(conn_callbacks) = { diff --git a/samples/bluetooth/event_trigger/src/main.c b/samples/bluetooth/event_trigger/src/main.c index b5c4d161d9f..c13770b75bc 100644 --- a/samples/bluetooth/event_trigger/src/main.c +++ b/samples/bluetooth/event_trigger/src/main.c @@ -126,7 +126,8 @@ static void connected(struct bt_conn *conn, uint8_t conn_err) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); if (conn_err) { - printk("Failed to connect to %s (%u)\n", addr, conn_err); + printk("Failed to connect to %s, 0x%02x %s\n", addr, conn_err, + bt_hci_err_to_str(conn_err)); if (conn == active_conn) { bt_conn_unref(active_conn); @@ -148,7 +149,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); - printk("Disconnected: %s (reason %u)\n", addr, reason); + printk("Disconnected: %s, reason 0x%02x %s\n", addr, reason, bt_hci_err_to_str(reason)); if (conn == active_conn) { bt_conn_unref(active_conn); diff --git a/samples/bluetooth/fast_pair/input_device/src/main.c b/samples/bluetooth/fast_pair/input_device/src/main.c index 2d20bdf86e7..1739baf689d 100644 --- a/samples/bluetooth/fast_pair/input_device/src/main.c +++ b/samples/bluetooth/fast_pair/input_device/src/main.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -200,7 +201,7 @@ static void connected(struct bt_conn *conn, uint8_t err) __ASSERT_NO_MSG(!peer); if (err) { - LOG_WRN("Connection failed (err %u)", err); + LOG_WRN("Connection failed, err 0x%02x %s", err, bt_hci_err_to_str(err)); ret = k_work_submit(&bt_adv_restart); __ASSERT_NO_MSG(ret == 1); return; @@ -214,7 +215,7 @@ static void connected(struct bt_conn *conn, uint8_t err) static void disconnected(struct bt_conn *conn, uint8_t reason) { - LOG_INF("Disconnected (reason %u)", reason); + LOG_INF("Disconnected, reason 0x%02x %s", reason, bt_hci_err_to_str(reason)); dk_set_led_off(CON_STATUS_LED); peer = NULL; diff --git a/samples/bluetooth/iso_combined_bis_and_cis/src/combined_bis_cis.c b/samples/bluetooth/iso_combined_bis_and_cis/src/combined_bis_cis.c index b9f58821d8d..f7e318977c4 100644 --- a/samples/bluetooth/iso_combined_bis_and_cis/src/combined_bis_cis.c +++ b/samples/bluetooth/iso_combined_bis_and_cis/src/combined_bis_cis.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include "iso_combined_bis_and_cis.h" @@ -226,7 +227,7 @@ static void connected(struct bt_conn *conn, uint8_t err) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); if (err) { - LOG_INF("Failed to connect to %s (%u)", addr, err); + LOG_INF("Failed to connect to %s, 0x%02x %s", addr, err, bt_hci_err_to_str(err)); scan_start(); return; @@ -263,7 +264,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); - LOG_INF("Disconnected: %s (reason 0x%02x)", addr, reason); + LOG_INF("Disconnected: %s, reason 0x%02x %s", addr, reason, bt_hci_err_to_str(reason)); scan_start(); } diff --git a/samples/bluetooth/iso_time_sync/src/cis_central.c b/samples/bluetooth/iso_time_sync/src/cis_central.c index 2cee42e5786..80647d46f32 100644 --- a/samples/bluetooth/iso_time_sync/src/cis_central.c +++ b/samples/bluetooth/iso_time_sync/src/cis_central.c @@ -16,6 +16,7 @@ #include #include #include +#include #include "iso_time_sync.h" @@ -127,7 +128,7 @@ static void connected(struct bt_conn *conn, uint8_t err) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); if (err) { - printk("Failed to connect to %s (%u)\n", addr, err); + printk("Failed to connect to %s 0x%02x %s\n", addr, err, bt_hci_err_to_str(err)); scan_start(); return; @@ -162,7 +163,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); - printk("Disconnected: %s (reason 0x%02x)\n", addr, reason); + printk("Disconnected: %s, reason 0x%02x %s\n", addr, reason, bt_hci_err_to_str(reason)); scan_start(); } diff --git a/samples/bluetooth/iso_time_sync/src/cis_peripheral.c b/samples/bluetooth/iso_time_sync/src/cis_peripheral.c index e42822d4ff1..833814d748e 100644 --- a/samples/bluetooth/iso_time_sync/src/cis_peripheral.c +++ b/samples/bluetooth/iso_time_sync/src/cis_peripheral.c @@ -14,6 +14,7 @@ #include #include #include +#include #include "iso_time_sync.h" @@ -30,7 +31,7 @@ static void connected(struct bt_conn *conn, uint8_t err) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); if (err) { - printk("Failed to connect to %s (%u)\n", addr, err); + printk("Failed to connect to %s 0x%02x %s\n", addr, err, bt_hci_err_to_str(err)); return; } @@ -43,7 +44,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); - printk("Disconnected from %s (reason 0x%02x)\n", addr, reason); + printk("Disconnected from %s, reason 0x%02x %s\n", addr, reason, bt_hci_err_to_str(reason)); } static struct bt_conn_cb conn_callbacks = { diff --git a/samples/bluetooth/llpm/src/main.c b/samples/bluetooth/llpm/src/main.c index e3f6019eda8..cb15cd093a0 100644 --- a/samples/bluetooth/llpm/src/main.c +++ b/samples/bluetooth/llpm/src/main.c @@ -179,7 +179,7 @@ static void scan_start(void) static void connected(struct bt_conn *conn, uint8_t err) { if (err) { - printk("Connection failed (err %u)\n", err); + printk("Connection failed, err 0x%02x %s\n", err, bt_hci_err_to_str(err)); return; } @@ -209,7 +209,7 @@ static void connected(struct bt_conn *conn, uint8_t err) static void disconnected(struct bt_conn *conn, uint8_t reason) { - printk("Disconnected (reason %u)\n", reason); + printk("Disconnected, reason 0x%02x %s\n", reason, bt_hci_err_to_str(reason)); test_ready = false; diff --git a/samples/bluetooth/multiple_adv_sets/src/main.c b/samples/bluetooth/multiple_adv_sets/src/main.c index 928059f1700..d172a5b4b4f 100644 --- a/samples/bluetooth/multiple_adv_sets/src/main.c +++ b/samples/bluetooth/multiple_adv_sets/src/main.c @@ -10,6 +10,7 @@ #include #include #include +#include #include @@ -88,7 +89,7 @@ static void connected(struct bt_conn *conn, uint8_t err) char addr[BT_ADDR_LE_STR_LEN]; if (err) { - printk("Connection failed (err %u)\n", err); + printk("Connection failed, err 0x%02x %s\n", err, bt_hci_err_to_str(err)); return; } @@ -107,7 +108,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason) dk_set_led_off(CON_STATUS_LED); - printk("Disconnected: %s (reason %u)\n", addr, reason); + printk("Disconnected: %s, reason 0x%02x %s\n", addr, reason, bt_hci_err_to_str(reason)); /* Process the disconnect logic in the workqueue so that * the BLE stack is finished with the connection bookkeeping diff --git a/samples/bluetooth/peripheral_ams_client/src/main.c b/samples/bluetooth/peripheral_ams_client/src/main.c index 4f1d17dcf87..3ee5b6b0816 100644 --- a/samples/bluetooth/peripheral_ams_client/src/main.c +++ b/samples/bluetooth/peripheral_ams_client/src/main.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -261,7 +262,7 @@ static void connected(struct bt_conn *conn, uint8_t err) char addr[BT_ADDR_LE_STR_LEN]; if (err) { - printk("Connection failed (err 0x%02x)\n", err); + printk("Connection failed, err 0x%02x %s\n", err, bt_hci_err_to_str(err)); return; } @@ -282,7 +283,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason) char addr[BT_ADDR_LE_STR_LEN]; bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); - printk("Disconnected from %s (reason 0x%02x)\n", addr, reason); + printk("Disconnected from %s, reason 0x%02x %s\n", addr, reason, bt_hci_err_to_str(reason)); dk_set_led_off(CON_STATUS_LED); } diff --git a/samples/bluetooth/peripheral_ancs_client/src/main.c b/samples/bluetooth/peripheral_ancs_client/src/main.c index b0a4f2d22b5..95e86ca7515 100644 --- a/samples/bluetooth/peripheral_ancs_client/src/main.c +++ b/samples/bluetooth/peripheral_ancs_client/src/main.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -322,7 +323,7 @@ static void connected(struct bt_conn *conn, uint8_t err) char addr[BT_ADDR_LE_STR_LEN]; if (err) { - printk("Connection failed (err 0x%02x)\n", err); + printk("Connection failed, err 0x%02x %s\n", err, bt_hci_err_to_str(err)); return; } @@ -343,7 +344,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason) char addr[BT_ADDR_LE_STR_LEN]; bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); - printk("Disconnected from %s (reason 0x%02x)\n", addr, reason); + printk("Disconnected from %s, reason 0x%02x %s\n", addr, reason, bt_hci_err_to_str(reason)); dk_set_led_off(CON_STATUS_LED); } diff --git a/samples/bluetooth/peripheral_bms/src/main.c b/samples/bluetooth/peripheral_bms/src/main.c index bb501b271be..6fef3abd5a7 100644 --- a/samples/bluetooth/peripheral_bms/src/main.c +++ b/samples/bluetooth/peripheral_bms/src/main.c @@ -51,7 +51,7 @@ static const struct bt_data sd[] = { static void connected(struct bt_conn *conn, uint8_t err) { if (err) { - printk("Connection failed (err %u)\n", err); + printk("Connection failed, err 0x%02x %s\n", err, bt_hci_err_to_str(err)); return; } @@ -62,7 +62,7 @@ static void connected(struct bt_conn *conn, uint8_t err) static void disconnected(struct bt_conn *conn, uint8_t reason) { - printk("Disconnected (reason %u)\n", reason); + printk("Disconnected, reason 0x%02x %s\n", reason, bt_hci_err_to_str(reason)); dk_set_led_off(CON_STATUS_LED); } diff --git a/samples/bluetooth/peripheral_cgms/src/main.c b/samples/bluetooth/peripheral_cgms/src/main.c index 9ded7961bb3..1ba6d8e70fa 100644 --- a/samples/bluetooth/peripheral_cgms/src/main.c +++ b/samples/bluetooth/peripheral_cgms/src/main.c @@ -41,7 +41,8 @@ static void connected(struct bt_conn *conn, uint8_t err) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); if (err) { - printk("Failed to connect to %s (err 0x%02x)\n", addr, err); + printk("Failed to connect to %s, err 0x%02x %s\n", addr, err, + bt_hci_err_to_str(err)); } else { printk("Connected %s\n", addr); } @@ -52,11 +53,10 @@ static void disconnected(struct bt_conn *conn, uint8_t reason) char addr[BT_ADDR_LE_STR_LEN]; bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); - printk("Disconnected from %s (reason %u)\n", addr, reason); + printk("Disconnected from %s, reason 0x%02x %s\n", addr, reason, bt_hci_err_to_str(reason)); } -static void security_changed(struct bt_conn *conn, bt_security_t level, - enum bt_security_err err) +static void security_changed(struct bt_conn *conn, bt_security_t level, enum bt_security_err err) { char addr[BT_ADDR_LE_STR_LEN]; diff --git a/samples/bluetooth/peripheral_cts_client/src/main.c b/samples/bluetooth/peripheral_cts_client/src/main.c index 9f9e4089646..0b53dbd4732 100644 --- a/samples/bluetooth/peripheral_cts_client/src/main.c +++ b/samples/bluetooth/peripheral_cts_client/src/main.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include @@ -166,7 +167,7 @@ static void connected(struct bt_conn *conn, uint8_t err) char addr[BT_ADDR_LE_STR_LEN]; if (err) { - printk("Connection failed (err 0x%02x)\n", err); + printk("Connection failed, err 0x%02x %s\n", err, bt_hci_err_to_str(err)); return; } @@ -188,7 +189,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason) char addr[BT_ADDR_LE_STR_LEN]; bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); - printk("Disconnected from %s (reason 0x%02x)\n", addr, reason); + printk("Disconnected from %s, reason 0x%02x %s\n", addr, reason, bt_hci_err_to_str(reason)); dk_set_led_off(CON_STATUS_LED); } diff --git a/samples/bluetooth/peripheral_gatt_dm/src/main.c b/samples/bluetooth/peripheral_gatt_dm/src/main.c index e83e7c58c32..27c1e6579dd 100644 --- a/samples/bluetooth/peripheral_gatt_dm/src/main.c +++ b/samples/bluetooth/peripheral_gatt_dm/src/main.c @@ -79,7 +79,7 @@ static void connected(struct bt_conn *conn, uint8_t err) char addr[BT_ADDR_LE_STR_LEN]; if (err) { - printk("Connection failed (err 0x%02x)\n", err); + printk("Connection failed, err 0x%02x %s\n", err, bt_hci_err_to_str(err)); return; } @@ -97,11 +97,10 @@ static void disconnected(struct bt_conn *conn, uint8_t reason) char addr[BT_ADDR_LE_STR_LEN]; bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); - printk("Disconnected from %s (reason 0x%02x)\n", addr, reason); + printk("Disconnected from %s, reason 0x%02x %s\n", addr, reason, bt_hci_err_to_str(reason)); } -static void security_changed(struct bt_conn *conn, bt_security_t level, - enum bt_security_err err) +static void security_changed(struct bt_conn *conn, bt_security_t level, enum bt_security_err err) { char addr[BT_ADDR_LE_STR_LEN]; diff --git a/samples/bluetooth/peripheral_hids_keyboard/src/main.c b/samples/bluetooth/peripheral_hids_keyboard/src/main.c index e4667171ccf..5690e4a1e75 100644 --- a/samples/bluetooth/peripheral_hids_keyboard/src/main.c +++ b/samples/bluetooth/peripheral_hids_keyboard/src/main.c @@ -247,7 +247,7 @@ static void connected(struct bt_conn *conn, uint8_t err) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); if (err) { - printk("Failed to connect to %s (%u)\n", addr, err); + printk("Failed to connect to %s 0x%02x %s\n", addr, err, bt_hci_err_to_str(err)); return; } @@ -289,7 +289,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); - printk("Disconnected from %s (reason %u)\n", addr, reason); + printk("Disconnected from %s, reason 0x%02x %s\n", addr, reason, bt_hci_err_to_str(reason)); err = bt_hids_disconnected(&hids_obj, conn); diff --git a/samples/bluetooth/peripheral_hids_mouse/src/main.c b/samples/bluetooth/peripheral_hids_mouse/src/main.c index e769a59a249..245ad4c3220 100644 --- a/samples/bluetooth/peripheral_hids_mouse/src/main.c +++ b/samples/bluetooth/peripheral_hids_mouse/src/main.c @@ -286,7 +286,8 @@ static void connected(struct bt_conn *conn, uint8_t err) printk("Direct advertising to %s timed out\n", addr); k_work_submit(&adv_work); } else { - printk("Failed to connect to %s (%u)\n", addr, err); + printk("Failed to connect to %s 0x%02x %s\n", addr, err, + bt_hci_err_to_str(err)); } return; } @@ -315,7 +316,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); - printk("Disconnected from %s (reason %u)\n", addr, reason); + printk("Disconnected from %s, reason 0x%02x %s\n", addr, reason, bt_hci_err_to_str(reason)); err = bt_hids_disconnected(&hids_obj, conn); diff --git a/samples/bluetooth/peripheral_hr_coded/src/main.c b/samples/bluetooth/peripheral_hr_coded/src/main.c index 932b0e941c1..c9d973c6387 100644 --- a/samples/bluetooth/peripheral_hr_coded/src/main.c +++ b/samples/bluetooth/peripheral_hr_coded/src/main.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -57,7 +58,7 @@ static void connected(struct bt_conn *conn, uint8_t conn_err) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); if (conn_err) { - printk("Connection failed (err %d)\n", conn_err); + printk("Connection failed, err 0x%02x %s\n", conn_err, bt_hci_err_to_str(conn_err)); return; } @@ -77,7 +78,7 @@ static void connected(struct bt_conn *conn, uint8_t conn_err) static void disconnected(struct bt_conn *conn, uint8_t reason) { - printk("Disconnected (reason 0x%02x)\n", reason); + printk("Disconnected, reason 0x%02x %s\n", reason, bt_hci_err_to_str(reason)); k_work_submit(&start_advertising_worker); diff --git a/samples/bluetooth/peripheral_lbs/src/main.c b/samples/bluetooth/peripheral_lbs/src/main.c index 7d8ecdffa06..c7facd1f4df 100644 --- a/samples/bluetooth/peripheral_lbs/src/main.c +++ b/samples/bluetooth/peripheral_lbs/src/main.c @@ -52,7 +52,7 @@ static const struct bt_data sd[] = { static void connected(struct bt_conn *conn, uint8_t err) { if (err) { - printk("Connection failed (err %u)\n", err); + printk("Connection failed, err 0x%02x %s\n", err, bt_hci_err_to_str(err)); return; } @@ -63,7 +63,7 @@ static void connected(struct bt_conn *conn, uint8_t err) static void disconnected(struct bt_conn *conn, uint8_t reason) { - printk("Disconnected (reason %u)\n", reason); + printk("Disconnected, reason 0x%02x %s\n", reason, bt_hci_err_to_str(reason)); dk_set_led_off(CON_STATUS_LED); } diff --git a/samples/bluetooth/peripheral_mds/src/main.c b/samples/bluetooth/peripheral_mds/src/main.c index bbbc089570d..cbf4ec1499e 100644 --- a/samples/bluetooth/peripheral_mds/src/main.c +++ b/samples/bluetooth/peripheral_mds/src/main.c @@ -8,6 +8,7 @@ #include #include +#include #include #include @@ -69,7 +70,7 @@ static void connected(struct bt_conn *conn, uint8_t conn_err) char addr[BT_ADDR_LE_STR_LEN]; if (conn_err) { - printk("Connection failed (err %u)\n", conn_err); + printk("Connection failed, err 0x%02x %s\n", conn_err, bt_hci_err_to_str(conn_err)); return; } @@ -81,7 +82,7 @@ static void connected(struct bt_conn *conn, uint8_t conn_err) static void disconnected(struct bt_conn *conn, uint8_t reason) { - printk("Disconnected (reason %u)\n", reason); + printk("Disconnected, reason 0x%02x %s\n", reason, bt_hci_err_to_str(reason)); dk_set_led_off(CON_STATUS_LED); diff --git a/samples/bluetooth/peripheral_nfc_pairing/src/main.c b/samples/bluetooth/peripheral_nfc_pairing/src/main.c index 848b04a0d0f..e188c7b74da 100644 --- a/samples/bluetooth/peripheral_nfc_pairing/src/main.c +++ b/samples/bluetooth/peripheral_nfc_pairing/src/main.c @@ -373,7 +373,8 @@ static void connected(struct bt_conn *conn, uint8_t err) printk("Direct advertising to %s timed out\n", addr); k_work_submit(&adv_work); } else { - printk("Failed to connect to %s (%u)\n", addr, err); + printk("Failed to connect to %s 0x%02x %s\n", addr, err, + bt_hci_err_to_str(err)); } return; @@ -401,11 +402,10 @@ static void disconnected(struct bt_conn *conn, uint8_t reason) dk_set_led_off(CON_STATUS_LED); } - printk("Disconnected from %s (reason %u)\n", addr, reason); + printk("Disconnected from %s, reason 0x%02x %s\n", addr, reason, bt_hci_err_to_str(reason)); } -static void security_changed(struct bt_conn *conn, bt_security_t level, - enum bt_security_err err) +static void security_changed(struct bt_conn *conn, bt_security_t level, enum bt_security_err err) { char addr[BT_ADDR_LE_STR_LEN]; diff --git a/samples/bluetooth/peripheral_power_profiling/src/main.c b/samples/bluetooth/peripheral_power_profiling/src/main.c index 1e6a17c798f..71d69358f80 100644 --- a/samples/bluetooth/peripheral_power_profiling/src/main.c +++ b/samples/bluetooth/peripheral_power_profiling/src/main.c @@ -15,6 +15,7 @@ #include #include +#include #include @@ -145,7 +146,7 @@ static void connected(struct bt_conn *conn, uint8_t conn_err) char addr[BT_ADDR_LE_STR_LEN]; if (conn_err) { - printk("Connection failed (err %u)\n", conn_err); + printk("Connection failed, err 0x%02x %s\n", conn_err, bt_hci_err_to_str(conn_err)); return; } @@ -159,7 +160,7 @@ static void connected(struct bt_conn *conn, uint8_t conn_err) static void disconnected(struct bt_conn *conn, uint8_t reason) { - printk("Disconnected (reason %u)\n", reason); + printk("Disconnected, reason 0x%02x %s\n", reason, bt_hci_err_to_str(reason)); dk_set_led_off(CON_STATUS_LED); diff --git a/samples/bluetooth/peripheral_rscs/src/main.c b/samples/bluetooth/peripheral_rscs/src/main.c index 82c1122ab3c..99de1edb0fa 100644 --- a/samples/bluetooth/peripheral_rscs/src/main.c +++ b/samples/bluetooth/peripheral_rscs/src/main.c @@ -16,6 +16,7 @@ #include #include #include +#include #include @@ -119,7 +120,7 @@ static const struct bt_rscs_cp_cb control_point_cb = { static void connected(struct bt_conn *conn, uint8_t err) { if (err) { - printk("Connection failed (err 0x%02x)\n", err); + printk("Connection failed, err 0x%02x %s\n", err, bt_hci_err_to_str(err)); } else { printk("Connected\n"); } @@ -131,7 +132,7 @@ static void connected(struct bt_conn *conn, uint8_t err) static void disconnected(struct bt_conn *conn, uint8_t reason) { - printk("Disconnected (reason 0x%02x)\n", reason); + printk("Disconnected, reason 0x%02x %s\n", reason, bt_hci_err_to_str(reason)); if (current_conn) { bt_conn_unref(current_conn); diff --git a/samples/bluetooth/peripheral_status/src/main.c b/samples/bluetooth/peripheral_status/src/main.c index 8c588f4c4d1..fc5d08dcf02 100644 --- a/samples/bluetooth/peripheral_status/src/main.c +++ b/samples/bluetooth/peripheral_status/src/main.c @@ -55,7 +55,7 @@ static const struct bt_data sd[] = { static void connected(struct bt_conn *conn, uint8_t err) { if (err) { - printk("Connection failed (err %u)\n", err); + printk("Connection failed, err 0x%02x %s\n", err, bt_hci_err_to_str(err)); return; } @@ -66,7 +66,7 @@ static void connected(struct bt_conn *conn, uint8_t err) static void disconnected(struct bt_conn *conn, uint8_t reason) { - printk("Disconnected (reason %u)\n", reason); + printk("Disconnected, reason 0x%02x %s\n", reason, bt_hci_err_to_str(reason)); dk_set_led_off(CON_STATUS_LED); } diff --git a/samples/bluetooth/peripheral_uart/src/main.c b/samples/bluetooth/peripheral_uart/src/main.c index baf1015e9eb..58f4b13d557 100644 --- a/samples/bluetooth/peripheral_uart/src/main.c +++ b/samples/bluetooth/peripheral_uart/src/main.c @@ -338,7 +338,7 @@ static void connected(struct bt_conn *conn, uint8_t err) char addr[BT_ADDR_LE_STR_LEN]; if (err) { - LOG_ERR("Connection failed (err %u)", err); + LOG_ERR("Connection failed, err 0x%02x %s", err, bt_hci_err_to_str(err)); return; } @@ -356,7 +356,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); - LOG_INF("Disconnected: %s (reason %u)", addr, reason); + LOG_INF("Disconnected: %s, reason 0x%02x %s", addr, reason, bt_hci_err_to_str(reason)); if (auth_conn) { bt_conn_unref(auth_conn); diff --git a/samples/bluetooth/radio_notification_cb/src/main.c b/samples/bluetooth/radio_notification_cb/src/main.c index 5c110f0f949..34967f3505d 100644 --- a/samples/bluetooth/radio_notification_cb/src/main.c +++ b/samples/bluetooth/radio_notification_cb/src/main.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -62,7 +63,8 @@ static void connected(struct bt_conn *conn, uint8_t conn_err) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); if (conn_err) { - printk("Failed to connect to %s (%u)\n", addr, conn_err); + printk("Failed to connect to %s, 0x%02x %s\n", addr, conn_err, + bt_hci_err_to_str(conn_err)); if (role == 'c') { scan_start(); } else { @@ -107,7 +109,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); - printk("Disconnected: %s (reason %u)\n", addr, reason); + printk("Disconnected: %s, reason 0x%02x %s\n", addr, reason, bt_hci_err_to_str(reason)); latency_request_time_in_use = false; discovery_completed = false; diff --git a/samples/bluetooth/shell_bt_nus/src/main.c b/samples/bluetooth/shell_bt_nus/src/main.c index eb985009cee..6f5120cbd8d 100644 --- a/samples/bluetooth/shell_bt_nus/src/main.c +++ b/samples/bluetooth/shell_bt_nus/src/main.c @@ -38,7 +38,7 @@ static const struct bt_data sd[] = { static void connected(struct bt_conn *conn, uint8_t err) { if (err) { - LOG_ERR("Connection failed (err %u)", err); + LOG_ERR("Connection failed, err 0x%02x %s", err, bt_hci_err_to_str(err)); return; } @@ -49,7 +49,7 @@ static void connected(struct bt_conn *conn, uint8_t err) static void disconnected(struct bt_conn *conn, uint8_t reason) { - LOG_INF("Disconnected (reason %u)", reason); + LOG_INF("Disconnected, reason 0x%02x %s", reason, bt_hci_err_to_str(reason)); shell_bt_nus_disable(); if (current_conn) { diff --git a/samples/bluetooth/throughput/src/main.c b/samples/bluetooth/throughput/src/main.c index ce95c51080b..2abaa1a0d1d 100644 --- a/samples/bluetooth/throughput/src/main.c +++ b/samples/bluetooth/throughput/src/main.c @@ -183,7 +183,7 @@ static void connected(struct bt_conn *conn, uint8_t hci_err) return; } - printk("Connection failed (err 0x%02x)\n", hci_err); + printk("Connection failed, err 0x%02x %s\n", hci_err, bt_hci_err_to_str(hci_err)); return; } @@ -305,7 +305,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason) struct bt_conn_info info = {0}; int err; - printk("Disconnected (reason 0x%02x)\n", reason); + printk("Disconnected, reason 0x%02x %s\n", reason, bt_hci_err_to_str(reason)); test_ready = false; if (default_conn) {