applications: nrf5340_audio: Update code to follow upmerge

- Change to nrf_gpio_pin_control_select in led.c
- Fix reset bug in program.py
- Add sequence number to le_audio_send in both BIS and CIS
- Add location and context to all presets

Signed-off-by: Alexander Svensen <alexander.svensen@nordicsemi.no>

Author: alexsven

applications/nrf5340_audio/bin/ble5-ctr-rpmsg_3296.hex renamed to applications/nrf5340_audio/bin/ble5-ctr-rpmsg_3301.hex

@@ -1,7 +1,7 @@
 description: LE Audio Controller Subsystem for nRF53
-git_revision: 640e043873fee52cf9e6d2e5625a8180ee275f92
-ll_subversion_number: '0x0CE0'
+git_revision: 722e1bbc2f69cd95f0cd13540b5754d1ddaa3e48
+ll_subversion_number: '0x0CE5'
 ll_version_number: '0x0B'
-ll_subversion_number_decimal: '3296'
+ll_subversion_number_decimal: '3301'
 ll_version_number_decimal: '11'
-timestamp: '2022-08-09T08:03:54Z'
+timestamp: '2022-08-16T14:33:02Z'

applications/nrf5340_audio/bin/manifest.yaml

@@ -180,6 +180,10 @@ config BT_OBSERVER
 	bool
 	default y
 
+config BT_PERIPHERAL
+	bool
+	default y
+
 config BT_ISO_SYNC_RECEIVER
 	bool
 	default y
@@ -200,6 +204,14 @@ config BT_ISO_MAX_CHAN
 	int
 	default 2
 
+config BT_SMP
+	bool
+	default y
+
+config BT_PAC_SNK
+	bool
+	default y
+
 endif # AUDIO_DEV = 1 (HEADSET)
 
 # GATEWAY

applications/nrf5340_audio/src/bluetooth/Kconfig.defaults

@@ -26,8 +26,8 @@ BUILD_ASSERT(CONFIG_BT_AUDIO_BROADCAST_SRC_STREAM_COUNT <= 2,
 #define BT_AUDIO_LC3_BROADCAST_PRESET_NRF5340_AUDIO                                                \
 	BT_AUDIO_LC3_PRESET(                                                                       \
 		BT_CODEC_LC3_CONFIG(BT_CODEC_CONFIG_LC3_FREQ_48KHZ,                                \
-				    BT_CODEC_CONFIG_LC3_DURATION_10,                               \
-				    LE_AUDIO_SDU_SIZE_OCTETS(CONFIG_LC3_BITRATE),                  \
+				    BT_CODEC_CONFIG_LC3_DURATION_10, BT_AUDIO_LOCATION_FRONT_LEFT, \
+				    LE_AUDIO_SDU_SIZE_OCTETS(CONFIG_LC3_BITRATE), 1,               \
 				    BT_AUDIO_CONTEXT_TYPE_MEDIA),                                  \
 		BT_CODEC_LC3_QOS_10_UNFRAMED(LE_AUDIO_SDU_SIZE_OCTETS(CONFIG_LC3_BITRATE), 4u,     \
 					     20u, LE_AUDIO_PRES_DELAY_US))
@@ -53,6 +53,7 @@ static struct bt_audio_lc3_preset lc3_preset = BT_AUDIO_LC3_BROADCAST_PRESET_NRF
 
 static atomic_t iso_tx_pool_alloc[CONFIG_BT_ISO_MAX_CHAN];
 static bool delete_broadcast_src;
+static uint32_t seq_num[CONFIG_BT_ISO_MAX_CHAN];
 
 static bool is_iso_buffer_full(uint8_t idx)
 {
@@ -243,7 +244,7 @@ int le_audio_send(uint8_t const *const data, size_t size)
 
 		atomic_inc(&iso_tx_pool_alloc[i]);
 
-		ret = bt_audio_stream_send(&streams[i], buf);
+		ret = bt_audio_stream_send(&streams[i], buf, seq_num[i]++, BT_ISO_TIMESTAMP_NONE);
 		if (ret < 0) {
 			LOG_WRN("Failed to send audio data: %d", ret);
 			net_buf_unref(buf);

applications/nrf5340_audio/src/bluetooth/le_audio_bis_gateway.c

@@ -8,6 +8,8 @@
 
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/audio/audio.h>
+#include <bluetooth/audio/capabilities.h>
+
 /* TODO: Remove when a get_info function is implemented in host */
 #include <../subsys/bluetooth/audio/endpoint.h>
 
@@ -27,7 +29,9 @@ static struct bt_audio_broadcast_sink *broadcast_sink;
 static struct bt_audio_stream streams[CONFIG_LC3_DEC_CHAN_MAX];
 static struct bt_audio_stream *streams_p[ARRAY_SIZE(streams)];
 
-static struct bt_audio_lc3_preset lc3_preset = BT_AUDIO_LC3_BROADCAST_PRESET_48_4_1;
+/* We need to set a location as a pre-compile, this changed in initialize */
+static struct bt_codec codec =
+	BT_CODEC_LC3_CONFIG_48_4(BT_AUDIO_LOCATION_FRONT_LEFT, BT_AUDIO_CONTEXT_TYPE_MEDIA);
 
 /* Create a mask for the maximum BIS we can sync to using the number of streams
  * broadcasted. We add an additional 1 since the bis indexes start from 1 and not
@@ -128,7 +132,8 @@ static struct bt_audio_stream_ops stream_ops = { .started = stream_started_cb,
 						 .stopped = stream_stopped_cb,
 						 .recv = stream_recv_cb };
 
-static bool scan_recv_cb(const struct bt_le_scan_recv_info *info, uint32_t broadcast_id)
+static bool scan_recv_cb(const struct bt_le_scan_recv_info *info, struct net_buf_simple *ad,
+			 uint32_t broadcast_id)
 {
 	LOG_DBG("Broadcast source found, waiting for PA sync");
 
@@ -256,8 +261,7 @@ static void syncable_cb(struct bt_audio_broadcast_sink *sink, bool encrypted)
 
 	LOG_INF("Syncing to broadcast");
 
-	ret = bt_audio_broadcast_sink_sync(broadcast_sink, bis_index_bitfield, streams_p,
-					   &lc3_preset.codec, NULL);
+	ret = bt_audio_broadcast_sink_sync(broadcast_sink, bis_index_bitfield, streams_p, NULL);
 	if (ret) {
 		LOG_ERR("Unable to sync to broadcast source");
 		return;
@@ -273,13 +277,42 @@ static struct bt_audio_broadcast_sink_cb broadcast_sink_cbs = { .scan_recv = sca
 								.base_recv = base_recv_cb,
 								.syncable = syncable_cb };
 
+static struct bt_audio_capability capabilities = {
+	.dir = BT_AUDIO_DIR_SINK,
+	.codec = &codec,
+};
+
 static void initialize(le_audio_receive_cb recv_cb)
 {
+	int ret;
 	static bool initialized;
+	enum audio_channel channel;
 
 	if (!initialized) {
 		receive_cb = recv_cb;
 
+		ret = channel_assignment_get(&channel);
+		if (ret) {
+			/* Channel is not assigned yet: use default */
+			channel = AUDIO_CHANNEL_DEFAULT;
+		}
+		if (channel == AUDIO_CH_L) {
+			ret = bt_audio_capability_set_location(BT_AUDIO_DIR_SINK,
+							       BT_AUDIO_LOCATION_FRONT_LEFT);
+		} else {
+			ret = bt_audio_capability_set_location(BT_AUDIO_DIR_SINK,
+							       BT_AUDIO_LOCATION_FRONT_RIGHT);
+		}
+		if (ret) {
+			LOG_ERR("Location set failed");
+		}
+
+		ret = bt_audio_capability_register(&capabilities);
+		if (ret) {
+			LOG_ERR("Capability register failed (ret %d)", ret);
+			ERR_CHK(ret);
+		}
+
 		bt_audio_broadcast_sink_register_cb(&broadcast_sink_cbs);
 
 		for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {

applications/nrf5340_audio/src/bluetooth/le_audio_bis_headset.c

@@ -22,8 +22,8 @@ LOG_MODULE_REGISTER(cis_gateway, CONFIG_LOG_BLE_LEVEL);
 #define BT_AUDIO_LC3_UNICAST_PRESET_NRF5340_AUDIO                                                  \
 	BT_AUDIO_LC3_PRESET(                                                                       \
 		BT_CODEC_LC3_CONFIG(BT_CODEC_CONFIG_LC3_FREQ_48KHZ,                                \
-				    BT_CODEC_CONFIG_LC3_DURATION_10,                               \
-				    LE_AUDIO_SDU_SIZE_OCTETS(CONFIG_LC3_BITRATE),                  \
+				    BT_CODEC_CONFIG_LC3_DURATION_10, BT_AUDIO_LOCATION_FRONT_LEFT, \
+				    LE_AUDIO_SDU_SIZE_OCTETS(CONFIG_LC3_BITRATE), 1,               \
 				    BT_AUDIO_CONTEXT_TYPE_MEDIA),                                  \
 		BT_CODEC_LC3_QOS_10_UNFRAMED(LE_AUDIO_SDU_SIZE_OCTETS(CONFIG_LC3_BITRATE), 2u,     \
 					     20u, LE_AUDIO_PRES_DELAY_US))
@@ -44,8 +44,12 @@ static struct bt_conn *headset_conn[CONFIG_BT_MAX_CONN];
 static struct bt_audio_stream audio_streams[CONFIG_BT_AUDIO_UNICAST_CLIENT_ASE_SNK_COUNT];
 static struct bt_audio_unicast_group *unicast_group;
 static struct bt_codec *remote_codecs[CONFIG_BT_AUDIO_UNICAST_CLIENT_PAC_COUNT];
-static struct bt_audio_ep *sinks[CONFIG_BT_AUDIO_UNICAST_CLIENT_ASE_SNK_COUNT];
 static struct bt_audio_discover_params audio_discover_param[CONFIG_BT_MAX_CONN];
+
+static struct bt_audio_sink {
+	struct bt_audio_ep *ep;
+	uint32_t seq_num;
+} sinks[CONFIG_BT_AUDIO_UNICAST_CLIENT_ASE_SNK_COUNT];
 /* clang-format off */
 static struct net_buf_pool *iso_tx_pools[] = { LISTIFY(CONFIG_BT_ISO_MAX_CHAN,
 						       NET_BUF_POOL_PTR_ITERATE, (,)) };
@@ -111,6 +115,19 @@ static int headset_conn_index_get(struct bt_conn *conn, uint8_t *index)
 	return -EINVAL;
 }
 
+static uint32_t get_and_incr_seq_num(const struct bt_audio_stream *stream)
+{
+	for (size_t i = 0U; i < ARRAY_SIZE(sinks); i++) {
+		if (stream->ep == sinks[i].ep) {
+			return sinks[i].seq_num++;
+		}
+	}
+
+	LOG_WRN("Could not find endpoint from stream %p", stream);
+
+	return 0;
+}
+
 static void unicast_client_location_cb(struct bt_conn *conn, enum bt_audio_dir dir,
 				       enum bt_audio_location loc)
 {
@@ -236,6 +253,14 @@ static void stream_started_cb(struct bt_audio_stream *stream)
 {
 	int ret;
 
+	/* Reset sequence number for sinks */
+	for (size_t i = 0U; i < ARRAY_SIZE(sinks); i++) {
+		if (stream->ep == sinks[i].ep) {
+			sinks[i].seq_num = 0U;
+			break;
+		}
+	}
+
 	LOG_INF("Stream %p started", (void *)stream);
 
 	ret = ctrl_events_le_audio_event_send(LE_AUDIO_EVT_STREAMING);
@@ -295,7 +320,7 @@ static void add_remote_sink(struct bt_audio_ep *ep, uint8_t index)
 	if (index > sizeof(sinks)) {
 		LOG_ERR("Sink index is out of range");
 	} else {
-		sinks[index] = ep;
+		sinks[index].ep = ep;
 	}
 }
 
@@ -358,7 +383,7 @@ static void discover_sink_cb(struct bt_conn *conn, struct bt_codec *codec, struc
 			LOG_ERR("Could not do VCS discover");
 		}
 #endif /* (CONFIG_BT_VCS_CLIENT) */
-		ret = bt_audio_stream_config(conn, &audio_streams[conn_index], sinks[conn_index],
+		ret = bt_audio_stream_config(conn, &audio_streams[conn_index], sinks[conn_index].ep,
 					     &lc3_preset_nrf5340.codec);
 		if (ret) {
 			LOG_ERR("Could not configure stream");
@@ -630,7 +655,9 @@ static int iso_stream_send(uint8_t const *const data, size_t size, uint8_t iso_c
 
 	atomic_inc(&iso_tx_pool_alloc[iso_chan_idx]);
 
-	ret = bt_audio_stream_send(&audio_streams[iso_chan_idx], buf);
+	ret = bt_audio_stream_send(&audio_streams[iso_chan_idx], buf,
+				   get_and_incr_seq_num(&audio_streams[iso_chan_idx]),
+				   BT_ISO_TIMESTAMP_NONE);
 	if (ret < 0) {
 		LOG_WRN("Failed to send audio data: %d", ret);
 		net_buf_unref(buf);

applications/nrf5340_audio/src/bluetooth/le_audio_cis_gateway.c

@@ -365,10 +365,10 @@ static int initialize(le_audio_receive_cb recv_cb)
 		}
 		if (channel == AUDIO_CH_L) {
 			ret = bt_audio_capability_set_location(BT_AUDIO_DIR_SINK,
-							       BT_AUDIO_LOCATION_SIDE_LEFT);
+							       BT_AUDIO_LOCATION_FRONT_LEFT);
 		} else {
 			ret = bt_audio_capability_set_location(BT_AUDIO_DIR_SINK,
-							       BT_AUDIO_LOCATION_SIDE_RIGHT);
+							       BT_AUDIO_LOCATION_FRONT_RIGHT);
 		}
 		if (ret) {
 			LOG_ERR("Location set failed");

applications/nrf5340_audio/src/bluetooth/le_audio_cis_headset.c

@@ -198,7 +198,8 @@ int button_handler_init(void)
 	}
 
 	for (uint8_t i = 0; i < ARRAY_SIZE(btn_cfg); i++) {
-		ret = gpio_pin_configure(gpio_53_dev, btn_cfg[i].btn_pin, btn_cfg[i].btn_cfg_mask);
+		ret = gpio_pin_configure(gpio_53_dev, btn_cfg[i].btn_pin,
+					 GPIO_INPUT | btn_cfg[i].btn_cfg_mask);
 		if (ret) {
 			return ret;
 		}

applications/nrf5340_audio/src/modules/button_handler.c

@@ -105,18 +105,7 @@ static int config_led_monochrome(uint8_t led_unit, uint8_t led)
  */
 static int transfer_pin_to_net(uint8_t led)
 {
-	uint8_t pin_to_transfer;
-
-	if (strcmp(leds[led].port->name, "GPIO_0") == 0) {
-		pin_to_transfer = leds[led].pin;
-	} else if (strcmp(leds[led].port->name, "GPIO_1") == 0) {
-		pin_to_transfer = leds[led].pin + P0_PIN_NUM;
-	} else {
-		LOG_ERR("Invalid GPIO device");
-		return -ENODEV;
-	}
-
-	nrf_gpio_pin_mcu_select(pin_to_transfer, NRF_GPIO_PIN_MCUSEL_NETWORK);
+	nrf_gpio_pin_control_select(leds[led].pin, NRF_GPIO_PIN_SEL_NETWORK);
 	LOG_DBG("Pin %d transferred on device %s", leds[led].pin, leds[led].port->name);
 	return 0;
 }

applications/nrf5340_audio/src/modules/led.c

@@ -64,7 +64,7 @@ def _program_cores(dev: DeviceConf) -> int:
             dev.core_app_programmed = SelectFlags.FAIL
             return 1
 
-    if dev.core_net_programmed != SelectFlags.NOT and dev.core_app_programmed != SelectFlags.NOT:
+    if dev.core_net_programmed != SelectFlags.NOT or dev.core_app_programmed != SelectFlags.NOT:
         print(f"Resetting {dev}")
         cmd = f"nrfjprog -r --snr {dev.nrf5340_audio_dk_snr}"
         ret_val = system(cmd)