CI purposes only. Not for review. Upmerge 01 03 2024 plus tfm fix

applications/asset_tracker_v2/src/ext_sensors/ext_sensors.c

@@ -374,7 +374,7 @@ int ext_sensors_pressure_get(double *ext_press)
 	k_spinlock_key_t key = k_spin_lock(&(press_sensor.lock));
 #if defined(CONFIG_BME680)
 	/* Pressure is in kPascals */
-	*ext_press = sensor_value_to_double(&data) * 1000.0f;
+	*ext_press = sensor_value_to_double(&data) * 1000.0;
 #else
 	/* Pressure is in Pascals */
 	*ext_press = sensor_value_to_double(&data);

applications/asset_tracker_v2/src/modules/location_module.c

@@ -395,10 +395,13 @@ void location_event_handler(const struct location_event_data *event_data)
 		LOG_DBG("  method: %s", location_method_str(event_data->method));
 		LOG_DBG("  latitude: %.06f", event_data->location.latitude);
 		LOG_DBG("  longitude: %.06f", event_data->location.longitude);
-		LOG_DBG("  accuracy: %.01f m", event_data->location.accuracy);
-		LOG_DBG("  altitude: %.01f m", event_data->location.details.gnss.pvt_data.altitude);
-		LOG_DBG("  speed: %.01f m", event_data->location.details.gnss.pvt_data.speed);
-		LOG_DBG("  heading: %.01f deg", event_data->location.details.gnss.pvt_data.heading);
+		LOG_DBG("  accuracy: %.01f m", (double)event_data->location.accuracy);
+		LOG_DBG("  altitude: %.01f m",
+			(double)event_data->location.details.gnss.pvt_data.altitude);
+		LOG_DBG("  speed: %.01f m",
+			(double)event_data->location.details.gnss.pvt_data.speed);
+		LOG_DBG("  heading: %.01f deg",
+			(double)event_data->location.details.gnss.pvt_data.heading);
 
 		if (event_data->location.datetime.valid) {
 			LOG_DBG("  date: %04d-%02d-%02d",

applications/asset_tracker_v2/src/modules/modem_module.c

@@ -212,7 +212,7 @@ static void lte_evt_handler(const struct lte_lc_evt *const evt)
 
 		len = snprintf(log_buf, sizeof(log_buf),
 			       "eDRX parameter update: eDRX: %.2f, PTW: %.2f",
-			       evt->edrx_cfg.edrx, evt->edrx_cfg.ptw);
+			       (double)evt->edrx_cfg.edrx, (double)evt->edrx_cfg.ptw);
 		if (len > 0) {
 			LOG_DBG("%s", log_buf);
 		}

applications/machine_learning/src/events/ml_result_event.c

@@ -14,7 +14,7 @@ static void log_ml_result_event(const struct app_event_header *aeh)
 	const struct ml_result_event *event = cast_ml_result_event(aeh);
 
 	APP_EVENT_MANAGER_LOG(aeh, "%s val: %0.2f anomaly: %0.2f",
-			event->label, event->value, event->anomaly);
+			event->label, (double)event->value, (double)event->anomaly);
 }
 
 static void profile_ml_result_event(struct log_event_buf *buf,

applications/machine_learning/src/modules/led_state.c

@@ -24,8 +24,8 @@ LOG_MODULE_REGISTER(MODULE, CONFIG_ML_APP_LED_STATE_LOG_LEVEL);
 #define DISPLAY_SIM_SIGNAL		IS_ENABLED(CONFIG_ML_APP_SENSOR_SIM_EVENTS)
 #define DISPLAY_DATA_FORWARDER		IS_ENABLED(CONFIG_ML_APP_EI_DATA_FORWARDER_EVENTS)
 
-#define ANOMALY_THRESH			(CONFIG_ML_APP_LED_STATE_ANOMALY_THRESH / 1000.0)
-#define VALUE_THRESH			(CONFIG_ML_APP_LED_STATE_VALUE_THRESH / 1000.0)
+#define ANOMALY_THRESH			(CONFIG_ML_APP_LED_STATE_ANOMALY_THRESH / 1000.0f)
+#define VALUE_THRESH			(CONFIG_ML_APP_LED_STATE_VALUE_THRESH / 1000.0f)
 #define PREDICTION_STREAK_THRESH	CONFIG_ML_APP_LED_STATE_PREDICTION_STREAK_THRESH
 
 BUILD_ASSERT(PREDICTION_STREAK_THRESH > 0);

applications/nrf5340_audio/src/audio/audio_datapath.c

@@ -1129,7 +1129,7 @@ static int cmd_i2s_tone_play(const struct shell *shell, size_t argc, const char
 	}
 
 	shell_print(shell, "Tone play: %d Hz for %d ms with amplitude %.02f", freq, dur_ms,
-		    amplitude);
+		    (double)amplitude);
 
 	return ret;
 }

applications/nrf5340_audio/src/bluetooth/bt_content_control/media/bt_content_ctrl_media.c

@@ -128,6 +128,7 @@ static void mcc_discover_mcs_cb(struct bt_conn *conn, int err)
 	}
 }
 
+#if defined(CONFIG_BT_MCC_SET_MEDIA_CONTROL_POINT)
 /**
  * @brief	Callback handler for sent MCS commands.
  *
@@ -143,6 +144,7 @@ static void mcc_send_command_cb(struct bt_conn *conn, int err, const struct mpl_
 			cmd->param);
 	}
 }
+#endif /* defined(CONFIG_BT_MCC_SET_MEDIA_CONTROL_POINT) */
 
 /**
  * @brief  Callback handler for received notifications.
@@ -160,6 +162,7 @@ static void mcc_cmd_notification_cb(struct bt_conn *conn, int err, const struct
 	}
 }
 
+#if defined(CONFIG_BT_MCC_READ_MEDIA_STATE)
 /**
  * @brief  Callback handler for reading media state.
  *
@@ -177,6 +180,7 @@ static void mcc_read_media_state_cb(struct bt_conn *conn, int err, uint8_t state
 
 	media_player_state = state;
 }
+#endif /* defined(CONFIG_BT_MCC_READ_MEDIA_STATE) */
 
 /**
  * @brief  Callback handler for received MCS commands.
@@ -462,10 +466,17 @@ int bt_content_ctrl_media_client_init(void)
 
 	static struct bt_mcc_cb mcc_cb;
 
+
+
+
 	mcc_cb.discover_mcs = mcc_discover_mcs_cb;
+#if defined(CONFIG_BT_MCC_SET_MEDIA_CONTROL_POINT)
 	mcc_cb.send_cmd = mcc_send_command_cb;
+#endif /* defined(CONFIG_BT_MCC_SET_MEDIA_CONTROL_POINT) */
 	mcc_cb.cmd_ntf = mcc_cmd_notification_cb;
+#if defined(CONFIG_BT_MCC_READ_MEDIA_STATE)
 	mcc_cb.read_media_state = mcc_read_media_state_cb;
+#endif /* defined(CONFIG_BT_MCC_READ_MEDIA_STATE) */
 	return bt_mcc_init(&mcc_cb);
 }
 

applications/nrf5340_audio/src/bluetooth/bt_management/controller_config/Kconfig.defaults

@@ -7,10 +7,6 @@
 # Bluetooth controller type
 if BT_LL_ACS_NRF53
 
-# Not supported on LE Audio Controller Subsystem for nRF53
-config BT_ATT_ENFORCE_FLOW
-	default n
-
 # Disable Zephyr HCI Vendor-Specific extensions
 config BT_HCI_VS_EXT
 	default n

applications/nrf5340_audio/src/bluetooth/bt_stream/broadcast/broadcast_sink.c

@@ -63,8 +63,8 @@ static uint8_t active_stream_index;
 
 static struct bt_audio_codec_cap codec_cap = BT_AUDIO_CODEC_CAP_LC3(
 	BT_AUDIO_CODEC_CAPABILIY_FREQ,
-	(BT_AUDIO_CODEC_LC3_DURATION_10 | BT_AUDIO_CODEC_LC3_DURATION_PREFER_10),
-	BT_AUDIO_CODEC_LC3_CHAN_COUNT_SUPPORT(1), LE_AUDIO_SDU_SIZE_OCTETS(CONFIG_LC3_BITRATE_MIN),
+	(BT_AUDIO_CODEC_CAP_DURATION_10 | BT_AUDIO_CODEC_CAP_DURATION_PREFER_10),
+	BT_AUDIO_CODEC_CAP_CHAN_COUNT_SUPPORT(1), LE_AUDIO_SDU_SIZE_OCTETS(CONFIG_LC3_BITRATE_MIN),
 	LE_AUDIO_SDU_SIZE_OCTETS(CONFIG_LC3_BITRATE_MAX), 1u, BT_AUDIO_CONTEXT_TYPE_MEDIA);
 
 static struct bt_pacs_cap capabilities = {
@@ -288,7 +288,7 @@ static struct bt_bap_stream_ops stream_ops = {
 
 static bool parse_cb(struct bt_data *data, void *codec)
 {
-	if (data->type == BT_AUDIO_CODEC_CONFIG_LC3_CHAN_ALLOC) {
+	if (data->type == BT_AUDIO_CODEC_CFG_CHAN_ALLOC) {
 		((struct audio_codec_info *)codec)->chan_allocation = sys_get_le32(data->data);
 		return false;
 	}

applications/nrf5340_audio/src/bluetooth/bt_stream/broadcast/broadcast_source.c

@@ -181,10 +181,10 @@ static void public_broadcast_features_set(uint8_t *features)
 		*features |= 0x01;
 	}
 
-	if (freq == BT_AUDIO_CODEC_CONFIG_LC3_FREQ_16KHZ ||
-	    freq == BT_AUDIO_CODEC_CONFIG_LC3_FREQ_24KHZ) {
+	if (freq == BT_AUDIO_CODEC_CFG_FREQ_16KHZ ||
+	    freq == BT_AUDIO_CODEC_CFG_FREQ_24KHZ) {
 		*features |= 0x02;
-	} else if (freq == BT_AUDIO_CODEC_CONFIG_LC3_FREQ_48KHZ) {
+	} else if (freq == BT_AUDIO_CODEC_CFG_FREQ_48KHZ) {
 		*features |= 0x04;
 	} else {
 		LOG_WRN("%dkHz is not compatible with Auracast, choose 16kHz, 24kHz or 48kHz",
@@ -298,7 +298,7 @@ static void bt_audio_codec_allocation_set(uint8_t *data, uint8_t data_len,
 					  enum bt_audio_location loc)
 {
 	data[0] = data_len - 1;
-	data[1] = BT_AUDIO_CODEC_CONFIG_LC3_CHAN_ALLOC;
+	data[1] = BT_AUDIO_CODEC_CFG_CHAN_ALLOC;
 	sys_put_le32((const uint32_t)loc, &data[2]);
 }
 

applications/nrf5340_audio/src/bluetooth/bt_stream/bt_le_audio_tx/bt_le_audio_tx.c

@@ -107,10 +107,9 @@ static int iso_stream_send(uint8_t const *const data, size_t size, struct bt_bap
 	atomic_inc(&tx_info->iso_tx_pool_alloc);
 
 	if (IS_ENABLED(CONFIG_BT_LL_ACS_NRF53)) {
-		ret = bt_bap_stream_send(bap_stream, buf, tx_info->iso_tx.seq_num,
-					 BT_ISO_TIMESTAMP_NONE);
+		ret = bt_bap_stream_send(bap_stream, buf, tx_info->iso_tx.seq_num);
 	} else {
-		ret = bt_bap_stream_send(bap_stream, buf, tx_info->iso_tx.seq_num, ts_tx);
+		ret = bt_bap_stream_send_ts(bap_stream, buf, tx_info->iso_tx.seq_num, ts_tx);
 	}
 
 	if (ret < 0) {

applications/nrf5340_audio/src/bluetooth/bt_stream/le_audio.h

@@ -15,17 +15,17 @@
 
 #if CONFIG_SAMPLE_RATE_CONVERTER
 #define BT_AUDIO_CODEC_CAPABILIY_FREQ                                                              \
-	BT_AUDIO_CODEC_LC3_FREQ_48KHZ | BT_AUDIO_CODEC_LC3_FREQ_24KHZ |                            \
-		BT_AUDIO_CODEC_LC3_FREQ_16KHZ
+	BT_AUDIO_CODEC_CAP_FREQ_48KHZ | BT_AUDIO_CODEC_CAP_FREQ_24KHZ |                            \
+		BT_AUDIO_CODEC_CAP_FREQ_16KHZ
 
 #elif CONFIG_AUDIO_SAMPLE_RATE_16000_HZ
-#define BT_AUDIO_CODEC_CAPABILIY_FREQ BT_AUDIO_CODEC_LC3_FREQ_16KHZ
+#define BT_AUDIO_CODEC_CAPABILIY_FREQ BT_AUDIO_CODEC_CAP_FREQ_16KHZ
 
 #elif CONFIG_AUDIO_SAMPLE_RATE_24000_HZ
-#define BT_AUDIO_CODEC_CAPABILIY_FREQ BT_AUDIO_CODEC_LC3_FREQ_24KHZ
+#define BT_AUDIO_CODEC_CAPABILIY_FREQ BT_AUDIO_CODEC_CAP_FREQ_24KHZ
 
 #elif CONFIG_AUDIO_SAMPLE_RATE_48000_HZ
-#define BT_AUDIO_CODEC_CAPABILIY_FREQ BT_AUDIO_CODEC_LC3_FREQ_48KHZ
+#define BT_AUDIO_CODEC_CAPABILIY_FREQ BT_AUDIO_CODEC_CAP_FREQ_48KHZ
 
 #else
 #error No sample rate supported
@@ -34,12 +34,12 @@
 #define BT_BAP_LC3_PRESET_CONFIGURABLE(_loc, _stream_context, _bitrate)                            \
 	BT_BAP_LC3_PRESET(                                                                         \
 		BT_AUDIO_CODEC_LC3_CONFIG(CONFIG_BT_AUDIO_PREF_SAMPLE_RATE_VALUE,                  \
-					  BT_AUDIO_CODEC_CONFIG_LC3_DURATION_10, _loc,             \
+					  BT_AUDIO_CODEC_CFG_DURATION_10, _loc,                    \
 					  LE_AUDIO_SDU_SIZE_OCTETS(_bitrate), 1, _stream_context), \
-		BT_AUDIO_CODEC_LC3_QOS_10_UNFRAMED(LE_AUDIO_SDU_SIZE_OCTETS(_bitrate),             \
-						   CONFIG_BT_AUDIO_RETRANSMITS,                    \
-						   CONFIG_BT_AUDIO_MAX_TRANSPORT_LATENCY_MS,       \
-						   CONFIG_BT_AUDIO_PRESENTATION_DELAY_US))
+		BT_AUDIO_CODEC_QOS_UNFRAMED(10000u, LE_AUDIO_SDU_SIZE_OCTETS(_bitrate),            \
+					    CONFIG_BT_AUDIO_RETRANSMITS,                           \
+					    CONFIG_BT_AUDIO_MAX_TRANSPORT_LATENCY_MS,              \
+					    CONFIG_BT_AUDIO_PRESENTATION_DELAY_US))
 
 /**
  * @brief Callback for receiving Bluetooth LE Audio data.

applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/unicast_client.c

@@ -327,15 +327,15 @@ static void supported_sample_rates_print(uint16_t supported_sample_rates, enum b
 {
 	char supported_str[20] = "";
 
-	if (supported_sample_rates & BT_AUDIO_CODEC_LC3_FREQ_48KHZ) {
+	if (supported_sample_rates & BT_AUDIO_CODEC_CAP_FREQ_48KHZ) {
 		strcat(supported_str, "48, ");
 	}
 
-	if (supported_sample_rates & BT_AUDIO_CODEC_LC3_FREQ_24KHZ) {
+	if (supported_sample_rates & BT_AUDIO_CODEC_CAP_FREQ_24KHZ) {
 		strcat(supported_str, "24, ");
 	}
 
-	if (supported_sample_rates & BT_AUDIO_CODEC_LC3_FREQ_16KHZ) {
+	if (supported_sample_rates & BT_AUDIO_CODEC_CAP_FREQ_16KHZ) {
 		strcat(supported_str, "16, ");
 	}
 
@@ -348,15 +348,15 @@ static void supported_sample_rates_print(uint16_t supported_sample_rates, enum b
 
 static bool sink_parse_cb(struct bt_data *data, void *user_data)
 {
-	if (data->type == BT_AUDIO_CODEC_LC3_FREQ) {
+	if (data->type == BT_AUDIO_CODEC_CAP_TYPE_FREQ) {
 		uint16_t lc3_freq_bit = sys_get_le16(data->data);
 
 		supported_sample_rates_print(lc3_freq_bit, BT_AUDIO_DIR_SINK);
 
 		/* Try with the preferred sample rate first */
 		switch (CONFIG_BT_AUDIO_PREF_SAMPLE_RATE_VALUE) {
-		case BT_AUDIO_CODEC_CONFIG_LC3_FREQ_48KHZ:
-			if (lc3_freq_bit & BT_AUDIO_CODEC_LC3_FREQ_48KHZ) {
+		case BT_AUDIO_CODEC_CFG_FREQ_48KHZ:
+			if (lc3_freq_bit & BT_AUDIO_CODEC_CAP_FREQ_48KHZ) {
 				lc3_preset_sink = lc3_preset_sink_48_4_1;
 				*(bool *)user_data = true;
 				/* Found what we were looking for, stop parsing LTV */
@@ -365,8 +365,8 @@ static bool sink_parse_cb(struct bt_data *data, void *user_data)
 
 			break;
 
-		case BT_AUDIO_CODEC_CONFIG_LC3_FREQ_24KHZ:
-			if (lc3_freq_bit & BT_AUDIO_CODEC_LC3_FREQ_24KHZ) {
+		case BT_AUDIO_CODEC_CFG_FREQ_24KHZ:
+			if (lc3_freq_bit & BT_AUDIO_CODEC_CAP_FREQ_24KHZ) {
 				lc3_preset_sink = lc3_preset_sink_24_2_1;
 				*(bool *)user_data = true;
 				/* Found what we were looking for, stop parsing LTV */
@@ -375,8 +375,8 @@ static bool sink_parse_cb(struct bt_data *data, void *user_data)
 
 			break;
 
-		case BT_AUDIO_CODEC_CONFIG_LC3_FREQ_16KHZ:
-			if (lc3_freq_bit & BT_AUDIO_CODEC_LC3_FREQ_16KHZ) {
+		case BT_AUDIO_CODEC_CFG_FREQ_16KHZ:
+			if (lc3_freq_bit & BT_AUDIO_CODEC_CAP_FREQ_16KHZ) {
 				lc3_preset_sink = lc3_preset_sink_16_2_1;
 				*(bool *)user_data = true;
 				/* Found what we were looking for, stop parsing LTV */
@@ -387,13 +387,13 @@ static bool sink_parse_cb(struct bt_data *data, void *user_data)
 		}
 
 		/* If no match with the preferred, revert to trying highest first */
-		if (lc3_freq_bit & BT_AUDIO_CODEC_LC3_FREQ_48KHZ) {
+		if (lc3_freq_bit & BT_AUDIO_CODEC_CAP_FREQ_48KHZ) {
 			lc3_preset_sink = lc3_preset_sink_48_4_1;
 			*(bool *)user_data = true;
-		} else if (lc3_freq_bit & BT_AUDIO_CODEC_LC3_FREQ_24KHZ) {
+		} else if (lc3_freq_bit & BT_AUDIO_CODEC_CAP_FREQ_24KHZ) {
 			lc3_preset_sink = lc3_preset_sink_24_2_1;
 			*(bool *)user_data = true;
-		} else if (lc3_freq_bit & BT_AUDIO_CODEC_LC3_FREQ_16KHZ) {
+		} else if (lc3_freq_bit & BT_AUDIO_CODEC_CAP_FREQ_16KHZ) {
 			lc3_preset_sink = lc3_preset_sink_16_2_1;
 			*(bool *)user_data = true;
 		}
@@ -408,15 +408,15 @@ static bool sink_parse_cb(struct bt_data *data, void *user_data)
 
 static bool source_parse_cb(struct bt_data *data, void *user_data)
 {
-	if (data->type == BT_AUDIO_CODEC_LC3_FREQ) {
+	if (data->type == BT_AUDIO_CODEC_CAP_TYPE_FREQ) {
 		uint16_t lc3_freq_bit = sys_get_le16(data->data);
 
 		supported_sample_rates_print(lc3_freq_bit, BT_AUDIO_DIR_SOURCE);
 
 		/* Try with the preferred sample rate first */
 		switch (CONFIG_BT_AUDIO_PREF_SAMPLE_RATE_VALUE) {
-		case BT_AUDIO_CODEC_CONFIG_LC3_FREQ_48KHZ:
-			if (lc3_freq_bit & BT_AUDIO_CODEC_LC3_FREQ_48KHZ) {
+		case BT_AUDIO_CODEC_CFG_FREQ_48KHZ:
+			if (lc3_freq_bit & BT_AUDIO_CODEC_CAP_FREQ_48KHZ) {
 				lc3_preset_source = lc3_preset_source_48_4_1;
 				*(bool *)user_data = true;
 				/* Found what we were looking for, stop parsing LTV */
@@ -425,8 +425,8 @@ static bool source_parse_cb(struct bt_data *data, void *user_data)
 
 			break;
 
-		case BT_AUDIO_CODEC_CONFIG_LC3_FREQ_24KHZ:
-			if (lc3_freq_bit & BT_AUDIO_CODEC_LC3_FREQ_24KHZ) {
+		case BT_AUDIO_CODEC_CFG_FREQ_24KHZ:
+			if (lc3_freq_bit & BT_AUDIO_CODEC_CAP_FREQ_24KHZ) {
 				lc3_preset_source = lc3_preset_source_24_2_1;
 				*(bool *)user_data = true;
 				/* Found what we were looking for, stop parsing LTV */
@@ -435,8 +435,8 @@ static bool source_parse_cb(struct bt_data *data, void *user_data)
 
 			break;
 
-		case BT_AUDIO_CODEC_CONFIG_LC3_FREQ_16KHZ:
-			if (lc3_freq_bit & BT_AUDIO_CODEC_LC3_FREQ_16KHZ) {
+		case BT_AUDIO_CODEC_CFG_FREQ_16KHZ:
+			if (lc3_freq_bit & BT_AUDIO_CODEC_CAP_FREQ_16KHZ) {
 				lc3_preset_source = lc3_preset_source_16_2_1;
 				*(bool *)user_data = true;
 				/* Found what we were looking for, stop parsing LTV */
@@ -447,13 +447,13 @@ static bool source_parse_cb(struct bt_data *data, void *user_data)
 		}
 
 		/* If no match with the preferred, revert to trying highest first */
-		if (lc3_freq_bit & BT_AUDIO_CODEC_LC3_FREQ_48KHZ) {
+		if (lc3_freq_bit & BT_AUDIO_CODEC_CAP_FREQ_48KHZ) {
 			lc3_preset_source = lc3_preset_source_48_4_1;
 			*(bool *)user_data = true;
-		} else if (lc3_freq_bit & BT_AUDIO_CODEC_LC3_FREQ_24KHZ) {
+		} else if (lc3_freq_bit & BT_AUDIO_CODEC_CAP_FREQ_24KHZ) {
 			lc3_preset_source = lc3_preset_source_24_2_1;
 			*(bool *)user_data = true;
-		} else if (lc3_freq_bit & BT_AUDIO_CODEC_LC3_FREQ_16KHZ) {
+		} else if (lc3_freq_bit & BT_AUDIO_CODEC_CAP_FREQ_16KHZ) {
 			lc3_preset_source = lc3_preset_source_16_2_1;
 			*(bool *)user_data = true;
 		}
@@ -514,7 +514,7 @@ static void bt_audio_codec_allocation_set(struct bt_audio_codec_cfg *codec_cfg,
 		uint8_t *value = &codec_cfg->data[i];
 		const uint8_t value_len = len - sizeof(type);
 
-		if (type == BT_AUDIO_CODEC_CONFIG_LC3_CHAN_ALLOC) {
+		if (type == BT_AUDIO_CODEC_CFG_CHAN_ALLOC) {
 			const uint32_t loc_32 = loc;
 
 			sys_put_le32(loc_32, value);

applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/unicast_server.c

@@ -127,14 +127,14 @@ struct bt_csip_set_member_register_param csip_param = {
 
 static struct bt_audio_codec_cap lc3_codec_sink = BT_AUDIO_CODEC_CAP_LC3(
 	BT_AUDIO_CODEC_CAPABILIY_FREQ,
-	(BT_AUDIO_CODEC_LC3_DURATION_10 | BT_AUDIO_CODEC_LC3_DURATION_PREFER_10),
-	BT_AUDIO_CODEC_LC3_CHAN_COUNT_SUPPORT(1), LE_AUDIO_SDU_SIZE_OCTETS(CONFIG_LC3_BITRATE_MIN),
+	(BT_AUDIO_CODEC_CAP_DURATION_10 | BT_AUDIO_CODEC_CAP_DURATION_PREFER_10),
+	BT_AUDIO_CODEC_CAP_CHAN_COUNT_SUPPORT(1), LE_AUDIO_SDU_SIZE_OCTETS(CONFIG_LC3_BITRATE_MIN),
 	LE_AUDIO_SDU_SIZE_OCTETS(CONFIG_LC3_BITRATE_MAX), 1u, AVAILABLE_SINK_CONTEXT);
 
 static struct bt_audio_codec_cap lc3_codec_source = BT_AUDIO_CODEC_CAP_LC3(
 	BT_AUDIO_CODEC_CAPABILIY_FREQ,
-	(BT_AUDIO_CODEC_LC3_DURATION_10 | BT_AUDIO_CODEC_LC3_DURATION_PREFER_10),
-	BT_AUDIO_CODEC_LC3_CHAN_COUNT_SUPPORT(1), LE_AUDIO_SDU_SIZE_OCTETS(CONFIG_LC3_BITRATE_MIN),
+	(BT_AUDIO_CODEC_CAP_DURATION_10 | BT_AUDIO_CODEC_CAP_DURATION_PREFER_10),
+	BT_AUDIO_CODEC_CAP_CHAN_COUNT_SUPPORT(1), LE_AUDIO_SDU_SIZE_OCTETS(CONFIG_LC3_BITRATE_MIN),
 	LE_AUDIO_SDU_SIZE_OCTETS(CONFIG_LC3_BITRATE_MAX), 1u, AVAILABLE_SOURCE_CONTEXT);
 
 static enum bt_audio_dir caps_dirs[] = {