samples: bluetooth: Add logging of CS config

The CS config that is being used is important
information and can be useful for debugging.

The configuration will be logged once, when it is
created.

Signed-off-by: Erik Sandgren <[email protected]>

Author: eriksandgren

samples/bluetooth/channel_sounding_ras_initiator/src/main.c

@@ -12,6 +12,7 @@
 #include <stdlib.h>
 #include <zephyr/kernel.h>
 #include <zephyr/types.h>
+#include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/reboot.h>
 #include <zephyr/bluetooth/cs.h>
 #include <zephyr/bluetooth/gatt.h>
@@ -396,15 +397,67 @@ static void remote_capabilities_cb(struct bt_conn *conn,
 	}
 }
 
-static void config_create_cb(struct bt_conn *conn,
-			     uint8_t status,
+static void config_create_cb(struct bt_conn *conn, uint8_t status,
 			     struct bt_conn_le_cs_config *config)
 {
 	ARG_UNUSED(conn);
 
 	if (status == BT_HCI_ERR_SUCCESS) {
 		cs_config = *config;
-		LOG_INF("CS config creation complete. ID: %d", config->id);
+
+		const char *mode_str[5] = {"Unused", "1 (RTT)", "2 (PBR)", "3 (RTT + PBR)",
+					   "Invalid"};
+		const char *role_str[3] = {"Initiator", "Reflector", "Invalid"};
+		const char *rtt_type_str[8] = {
+			"AA only",	 "32-bit sounding", "96-bit sounding", "32-bit random",
+			"64-bit random", "96-bit random",   "128-bit random",  "Invalid"};
+		const char *phy_str[4] = {"Invalid", "LE 1M PHY", "LE 2M PHY", "LE 2M 2BT PHY"};
+		const char *chsel_type_str[3] = {"Algorithm #3b", "Algorithm #3c", "Invalid"};
+		const char *ch3c_shape_str[3] = {"Hat shape", "X shape", "Invalid"};
+
+		uint8_t main_mode_idx = config->main_mode_type > 0 && config->main_mode_type < 4
+						? config->main_mode_type
+						: 4;
+		uint8_t sub_mode_idx = config->sub_mode_type < 4 ? config->sub_mode_type : 0;
+		uint8_t role_idx = MIN(config->role, 2);
+		uint8_t rtt_type_idx = MIN(config->rtt_type, 7);
+		uint8_t phy_idx = config->cs_sync_phy > 0 && config->cs_sync_phy < 4
+					  ? config->cs_sync_phy
+					  : 0;
+		uint8_t chsel_type_idx = MIN(config->channel_selection_type, 2);
+		uint8_t ch3c_shape_idx = MIN(config->ch3c_shape, 2);
+
+		LOG_INF("CS config creation complete.\n"
+			" - id: %u\n"
+			" - main_mode_type: %s\n"
+			" - sub_mode_type: %s\n"
+			" - min_main_mode_steps: %u\n"
+			" - max_main_mode_steps: %u\n"
+			" - main_mode_repetition: %u\n"
+			" - mode_0_steps: %u\n"
+			" - role: %s\n"
+			" - rtt_type: %s\n"
+			" - cs_sync_phy: %s\n"
+			" - channel_map_repetition: %u\n"
+			" - channel_selection_type: %s\n"
+			" - ch3c_shape: %s\n"
+			" - ch3c_jump: %u\n"
+			" - t_ip1_time_us: %u\n"
+			" - t_ip2_time_us: %u\n"
+			" - t_fcs_time_us: %u\n"
+			" - t_pm_time_us: %u\n"
+			" - channel_map: 0x%08X%08X%04X\n",
+			config->id, mode_str[main_mode_idx], mode_str[sub_mode_idx],
+			config->min_main_mode_steps, config->max_main_mode_steps,
+			config->main_mode_repetition, config->mode_0_steps, role_str[role_idx],
+			rtt_type_str[rtt_type_idx], phy_str[phy_idx],
+			config->channel_map_repetition, chsel_type_str[chsel_type_idx],
+			ch3c_shape_str[ch3c_shape_idx], config->ch3c_jump, config->t_ip1_time_us,
+			config->t_ip2_time_us, config->t_fcs_time_us, config->t_pm_time_us,
+			sys_get_le32(&config->channel_map[6]),
+			sys_get_le32(&config->channel_map[2]),
+			sys_get_le16(&config->channel_map[0]));
+
 		k_sem_give(&sem_config_created);
 	} else {
 		LOG_WRN("CS config creation failed. (HCI status 0x%02x)", status);
@@ -731,8 +784,8 @@ int main(void)
 					ap, (double)distance_on_ap.ifft,
 					(double)distance_on_ap.phase_slope,
 					(double)distance_on_ap.rtt);
-				}
 			}
+		}
 	}
 
 	return 0;

samples/bluetooth/channel_sounding_ras_reflector/src/main.c

@@ -11,6 +11,7 @@
 #include <zephyr/types.h>
 #include <zephyr/kernel.h>
 #include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/reboot.h>
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/uuid.h>
@@ -80,14 +81,65 @@ static void remote_capabilities_cb(struct bt_conn *conn,
 	}
 }
 
-static void config_create_cb(struct bt_conn *conn,
-			      uint8_t status,
-			      struct bt_conn_le_cs_config *config)
+static void config_create_cb(struct bt_conn *conn, uint8_t status,
+			     struct bt_conn_le_cs_config *config)
 {
 	ARG_UNUSED(conn);
 
 	if (status == BT_HCI_ERR_SUCCESS) {
-		LOG_INF("CS config creation complete. ID: %d", config->id);
+		const char *mode_str[5] = {"Unused", "1 (RTT)", "2 (PBR)", "3 (RTT + PBR)",
+					   "Invalid"};
+		const char *role_str[3] = {"Initiator", "Reflector", "Invalid"};
+		const char *rtt_type_str[8] = {
+			"AA only",	 "32-bit sounding", "96-bit sounding", "32-bit random",
+			"64-bit random", "96-bit random",   "128-bit random",  "Invalid"};
+		const char *phy_str[4] = {"Invalid", "LE 1M PHY", "LE 2M PHY", "LE 2M 2BT PHY"};
+		const char *chsel_type_str[3] = {"Algorithm #3b", "Algorithm #3c", "Invalid"};
+		const char *ch3c_shape_str[3] = {"Hat shape", "X shape", "Invalid"};
+
+		uint8_t main_mode_idx = config->main_mode_type > 0 && config->main_mode_type < 4
+						? config->main_mode_type
+						: 4;
+		uint8_t sub_mode_idx = config->sub_mode_type < 4 ? config->sub_mode_type : 0;
+		uint8_t role_idx = MIN(config->role, 2);
+		uint8_t rtt_type_idx = MIN(config->rtt_type, 7);
+		uint8_t phy_idx = config->cs_sync_phy > 0 && config->cs_sync_phy < 4
+					  ? config->cs_sync_phy
+					  : 0;
+		uint8_t chsel_type_idx = MIN(config->channel_selection_type, 2);
+		uint8_t ch3c_shape_idx = MIN(config->ch3c_shape, 2);
+
+		LOG_INF("CS config creation complete.\n"
+			" - id: %u\n"
+			" - main_mode_type: %s\n"
+			" - sub_mode_type: %s\n"
+			" - min_main_mode_steps: %u\n"
+			" - max_main_mode_steps: %u\n"
+			" - main_mode_repetition: %u\n"
+			" - mode_0_steps: %u\n"
+			" - role: %s\n"
+			" - rtt_type: %s\n"
+			" - cs_sync_phy: %s\n"
+			" - channel_map_repetition: %u\n"
+			" - channel_selection_type: %s\n"
+			" - ch3c_shape: %s\n"
+			" - ch3c_jump: %u\n"
+			" - t_ip1_time_us: %u\n"
+			" - t_ip2_time_us: %u\n"
+			" - t_fcs_time_us: %u\n"
+			" - t_pm_time_us: %u\n"
+			" - channel_map: 0x%08X%08X%04X\n",
+			config->id, mode_str[main_mode_idx], mode_str[sub_mode_idx],
+			config->min_main_mode_steps, config->max_main_mode_steps,
+			config->main_mode_repetition, config->mode_0_steps, role_str[role_idx],
+			rtt_type_str[rtt_type_idx], phy_str[phy_idx],
+			config->channel_map_repetition, chsel_type_str[chsel_type_idx],
+			ch3c_shape_str[ch3c_shape_idx], config->ch3c_jump, config->t_ip1_time_us,
+			config->t_ip2_time_us, config->t_fcs_time_us, config->t_pm_time_us,
+			sys_get_le32(&config->channel_map[6]),
+			sys_get_le32(&config->channel_map[2]),
+			sys_get_le16(&config->channel_map[0]));
+
 		k_sem_give(&sem_config);
 	} else {
 		LOG_WRN("CS config creation failed. (HCI status 0x%02x)", status);