Applications: nrf5340_audio: Upmerge

OCT-3374
Upmerge 02-06-2025

Signed-off-by: Kristoffer Skøien <[email protected]>

Author: koffes

applications/nrf5340_audio/Kconfig.defaults

@@ -39,10 +39,6 @@ config ZBUS_RUNTIME_OBSERVERS
 config ZBUS_MSG_SUBSCRIBER
 	default y
 
-choice ZBUS_RUNTIME_OBSERVERS_NODE_ALLOC
-	default ZBUS_RUNTIME_OBSERVERS_NODE_ALLOC_NONE
-endchoice
-
 config SENSOR
 	default y
 

samples/bluetooth/nrf_auraconfig/prj.conf

@@ -36,7 +36,6 @@ CONFIG_SOC_NRF53_CPUNET_ENABLE=y
 
 CONFIG_ZBUS=y
 CONFIG_ZBUS_RUNTIME_OBSERVERS=y
-CONFIG_ZBUS_RUNTIME_OBSERVERS_NODE_ALLOC_NONE=y
 CONFIG_ZBUS_MSG_SUBSCRIBER=y
 CONFIG_ZBUS_MSG_SUBSCRIBER_NET_BUF_POOL_SIZE=20
 

samples/bluetooth/nrf_auraconfig/src/nrf_auraconfig.c

@@ -28,9 +28,6 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(main, CONFIG_MAIN_LOG_LEVEL);
 
-static struct zbus_observer_node zbus_obs_node_mgmt;
-static struct zbus_observer_node zbus_obs_node_audio;
-
 ZBUS_CHAN_DECLARE(bt_mgmt_chan);
 ZBUS_CHAN_DECLARE(sdu_ref_chan);
 ZBUS_CHAN_DECLARE(le_audio_chan);
@@ -483,14 +480,14 @@ static int zbus_link_producers_observers(void)
 		return -ENOTSUP;
 	}
 
-	ret = zbus_chan_add_obs_with_node(&bt_mgmt_chan, &bt_mgmt_evt_listen, &zbus_obs_node_mgmt,
+	ret = zbus_chan_add_obs(&bt_mgmt_chan, &bt_mgmt_evt_listen,
 					  ZBUS_ADD_OBS_TIMEOUT_MS);
 	if (ret) {
 		LOG_ERR("Failed to add bt_mgmt listener");
 		return ret;
 	}
 
-	ret = zbus_chan_add_obs_with_node(&le_audio_chan, &le_audio_evt_sub, &zbus_obs_node_audio,
+	ret = zbus_chan_add_obs(&le_audio_chan, &le_audio_evt_sub,
 					  ZBUS_ADD_OBS_TIMEOUT_MS);
 	if (ret) {
 		LOG_ERR("Failed to add le_audio sub");