Applications: nrf5340_audio: Upmerge fixes2

OCT-3020
Resolved BIS+ACL tester upmerge issues

Signed-off-by: Kristoffer Rist Skøien <kristoffer.skoien@nordicsemi.no>

Author: koffes

tests/bluetooth/iso/modules/iso_broadcast_src.c

@@ -110,6 +110,10 @@ static struct bt_iso_big *big;
 static uint32_t iso_send_count;
 static uint8_t iso_data[CONFIG_BT_ISO_TX_MTU] = {0};
 
+static const struct bt_data ad[] = {
+	BT_DATA(BT_DATA_NAME_COMPLETE, CONFIG_BT_DEVICE_NAME, sizeof(CONFIG_BT_DEVICE_NAME) - 1),
+};
+
 static void broadcaster_t(void *arg1, void *arg2, void *arg3)
 {
 	static uint8_t initial_send = 2;
@@ -227,12 +231,19 @@ int iso_broadcast_src_start(const struct shell *shell, size_t argc, char **argv)
 	}
 
 	/* Create a non-connectable non-scannable advertising set */
-	ret = bt_le_ext_adv_create(BT_LE_EXT_ADV_NCONN_NAME, NULL, &adv);
+	ret = bt_le_ext_adv_create(BT_LE_EXT_ADV_NCONN, NULL, &adv);
 	if (ret) {
 		LOG_ERR("Failed to create advertising set (ret %d)", ret);
 		return ret;
 	}
 
+	/* Set advertising data to have complete local name set */
+	ret = bt_le_ext_adv_set_data(adv, ad, ARRAY_SIZE(ad), NULL, 0);
+	if (ret) {
+		LOG_ERR("Failed to set advertising data (ret %d)", ret);
+		return 0;
+	}
+
 	/* Set periodic advertising parameters */
 	ret = bt_le_per_adv_set_param(adv, BROADCAST_PERIODIC_ADV);
 	if (ret) {

tests/bluetooth/iso/prj.conf

@@ -1,16 +1,15 @@
 CONFIG_BT=y
 CONFIG_BT_ISO_BROADCASTER=y
-CONFIG_BT_DEBUG_LOG=y
 CONFIG_BT_DEVICE_NAME="ISO broadcast+ACL central"
 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_OBSERVER=y
 CONFIG_BT_ISO_SYNC_RECEIVER=y
+CONFIG_BT_SMP=y
 
 CONFIG_BT_ISO_MAX_CHAN=2
 CONFIG_BT_ISO_TX_BUF_COUNT=2
 CONFIG_BT_ISO_TX_MTU=251
-CONFIG_BT_ISO_LOG_LEVEL_DBG=y
 
 CONFIG_BT_EXT_ADV=y
 CONFIG_BT_PER_ADV_SYNC=y
@@ -41,9 +40,11 @@ CONFIG_USE_SEGGER_RTT=y
 CONFIG_SHELL_RTT_INIT_LOG_LEVEL_NONE=y
 CONFIG_SHELL_BACKEND_RTT=y
 CONFIG_SHELL_BACKEND_SERIAL=n
+CONFIG_SHELL_VT100_COMMANDS=y
 CONFIG_SHELL_VT100_COLORS=y
 CONFIG_SHELL_STACK_SIZE=2048
 CONFIG_SHELL_CMD_BUFF_SIZE=128
+CONFIG_SHELL_TAB=y
 CONFIG_SHELL_TAB_AUTOCOMPLETION=y
 
 # Getopt