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 zephyrproject-rtos/zephyr#75442. Signed-off-by: Rubin Gerritsen <[email protected]>
nrfconnect · Aug 5, 2024 · 7359e3d · 7359e3d
1 parent c177ed8
commit 7359e3d
Show file tree

Hide file tree

Showing 37 changed files with 107 additions and 80 deletions.
diff --git 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 <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/uuid.h>
 #include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/hci.h>
 #include <bluetooth/gatt_dm.h>
 #include <bluetooth/scan.h>
 
@@ -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
@@ -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
@@ -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
@@ -19,6 +19,7 @@
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/uuid.h>
 #include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/hci.h>
 #include <bluetooth/gatt_dm.h>
 #include <bluetooth/scan.h>
 #include <bluetooth/services/hrs_client.h>
@@ -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
@@ -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
@@ -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
@@ -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
@@ -7,6 +7,7 @@
 #include <zephyr/sys/atomic.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/hci.h>
 #include <bluetooth/services/nus.h>
 #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
@@ -7,6 +7,7 @@
 #include <zephyr/sys/atomic.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/hci.h>
 #include <bluetooth/services/nus.h>
 #include <bluetooth/services/nus_client.h>
 #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
@@ -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
@@ -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
@@ -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
@@ -8,6 +8,7 @@
 #include <zephyr/sys/__assert.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/hci.h>
 #include <zephyr/settings/settings.h>
 #include <bluetooth/services/fast_pair/fast_pair.h>
 #include <bluetooth/adv_prov/fast_pair.h>
@@ -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
@@ -16,6 +16,7 @@
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/iso.h>
+#include <zephyr/bluetooth/hci.h>
 #include <zephyr/sys/ring_buffer.h>
 
 #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
@@ -16,6 +16,7 @@
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/iso.h>
+#include <zephyr/bluetooth/hci.h>
 
 #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
@@ -14,6 +14,7 @@
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/iso.h>
+#include <zephyr/bluetooth/hci.h>
 
 #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
@@ -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;