Applications: nrf5340_audio: defines cleanup

OCT-3419
Cleaned up defines with CONFIG_* names to avoid conflicts.
Removed unused defines.

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

Author: koffes

applications/nrf5340_audio/src/audio/sw_codec_select.c

@@ -19,6 +19,9 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(sw_codec_select, CONFIG_SW_CODEC_SELECT_LOG_LEVEL);
 
+/* Used for debugging, inserts 0 instead of packet loss concealment */
+#define SW_CODEC_OVERRIDE_PLC false
+
 static struct sw_codec_config m_config;
 
 static struct sample_rate_converter_ctx encoder_converters[CONFIG_AUDIO_ENCODE_CHANNELS_MAX];
@@ -222,7 +225,7 @@ int sw_codec_decode(struct net_buf const *const audio_frame, void **decoded_data
 
 		switch (m_config.decoder.channel_mode) {
 		case SW_CODEC_MONO: {
-			if (meta->bad_data && IS_ENABLED(CONFIG_SW_CODEC_OVERRIDE_PLC)) {
+			if (meta->bad_data && SW_CODEC_OVERRIDE_PLC) {
 				memset(decoded_data_mono[0], 0, PCM_NUM_BYTES_MONO);
 				decoded_data_size = PCM_NUM_BYTES_MONO;
 			} else {
@@ -261,7 +264,7 @@ int sw_codec_decode(struct net_buf const *const audio_frame, void **decoded_data
 		}
 		case SW_CODEC_STEREO: {
 
-			if (meta->bad_data && IS_ENABLED(CONFIG_SW_CODEC_OVERRIDE_PLC)) {
+			if (meta->bad_data && SW_CODEC_OVERRIDE_PLC) {
 				memset(decoded_data_mono[0], 0, PCM_NUM_BYTES_MONO);
 				memset(decoded_data_mono[1], 0, PCM_NUM_BYTES_MONO);
 				decoded_data_size = PCM_NUM_BYTES_MONO;

applications/nrf5340_audio/src/bluetooth/bt_management/dfu/bt_mgmt_dfu.c

@@ -18,10 +18,6 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bt_mgmt_dfu, CONFIG_BT_MGMT_DFU_LOG_LEVEL);
 
-/* These defined name only used by DFU */
-#define DEVICE_NAME_DFU	    CONFIG_BT_DFU_DEVICE_NAME
-#define DEVICE_NAME_DFU_LEN (sizeof(DEVICE_NAME_DFU) - 1)
-
 static const struct bt_data ad_peer[] = {
 	BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)),
 	BT_DATA_BYTES(BT_DATA_UUID128_ALL, 0x84, 0xaa, 0x60, 0x74, 0x52, 0x8a, 0x8b, 0x86, 0xd3,

applications/nrf5340_audio/src/modules/audio_i2s.c

@@ -27,11 +27,11 @@ static enum audio_i2s_state state = AUDIO_I2S_STATE_UNINIT;
 PINCTRL_DT_DEFINE(I2S_NL);
 
 #if CONFIG_AUDIO_SAMPLE_RATE_16000_HZ
-#define CONFIG_AUDIO_RATIO NRF_I2S_RATIO_384X
+#define I2S_RATIO NRF_I2S_RATIO_384X
 #elif CONFIG_AUDIO_SAMPLE_RATE_24000_HZ
-#define CONFIG_AUDIO_RATIO NRF_I2S_RATIO_256X
+#define I2S_RATIO NRF_I2S_RATIO_256X
 #elif CONFIG_AUDIO_SAMPLE_RATE_48000_HZ
-#define CONFIG_AUDIO_RATIO NRF_I2S_RATIO_128X
+#define I2S_RATIO NRF_I2S_RATIO_128X
 #else
 #error "Current AUDIO_SAMPLE_RATE_HZ setting not supported"
 #endif
@@ -46,7 +46,7 @@ static nrfx_i2s_config_t cfg = {
 	.mode = NRF_I2S_MODE_MASTER,
 	.format = NRF_I2S_FORMAT_I2S,
 	.alignment = NRF_I2S_ALIGN_LEFT,
-	.ratio = CONFIG_AUDIO_RATIO,
+	.ratio = I2S_RATIO,
 	.mck_setup = 0x66666000,
 #if (CONFIG_AUDIO_BIT_DEPTH_16)
 	.sample_width = NRF_I2S_SWIDTH_16BIT,

tests/subsys/audio/audio_module_template/src/template_test.c

@@ -14,7 +14,7 @@
 /* Define a timeout to prevent system locking */
 #define TEST_TX_RX_TIMEOUT_US (K_FOREVER)
 
-#define CONFIG_TEXT   "Template config"
+#define ORIGINAL_TEXT   "Template config"
 #define RECONFIG_TEXT "Template reconfig"
 
 #define TEST_MSG_QUEUE_SIZE	   (4)
@@ -78,7 +78,7 @@ ZTEST(suite_audio_module_template, test_module_template)
 	struct audio_module_parameters mod_parameters;
 
 	struct audio_module_template_configuration configuration = {
-		.sample_rate_hz = 48000, .bit_depth = 24, .module_description = CONFIG_TEXT};
+		.sample_rate_hz = 48000, .bit_depth = 24, .module_description = ORIGINAL_TEXT};
 	struct audio_module_template_configuration reconfiguration = {
 		.sample_rate_hz = 16000, .bit_depth = 8, .module_description = RECONFIG_TEXT};
 	struct audio_module_template_configuration return_configuration;
@@ -114,7 +114,7 @@ ZTEST(suite_audio_module_template, test_module_template)
 		zassert_equal(test_config->sample_rate_hz, configuration.sample_rate_hz,
 			      "Failed to configure module in the open function");
 		zassert_mem_equal(test_config->module_description, configuration.module_description,
-				  sizeof(CONFIG_TEXT),
+				  sizeof(ORIGINAL_TEXT),
 				  "Failed to configure module in the open function");
 	}
 
@@ -146,7 +146,7 @@ ZTEST(suite_audio_module_template, test_module_template)
 	zassert_equal(return_configuration.sample_rate_hz, configuration.sample_rate_hz,
 		      "Failed to get configuration");
 	zassert_mem_equal(return_configuration.module_description, configuration.module_description,
-			  sizeof(CONFIG_TEXT), "Failed to get configuration");
+			  sizeof(ORIGINAL_TEXT), "Failed to get configuration");
 
 	ret = audio_module_connect(&handle, NULL, true);
 	zassert_equal(ret, 0, "Connect function did not return successfully (0): ret %d", ret);
@@ -234,7 +234,7 @@ ZTEST(suite_audio_module_template, test_module_template_stream)
 	struct audio_module_parameters mod_parameters;
 
 	struct audio_module_template_configuration configuration = {
-		.sample_rate_hz = 48000, .bit_depth = 16, .module_description = CONFIG_TEXT};
+		.sample_rate_hz = 48000, .bit_depth = 16, .module_description = ORIGINAL_TEXT};
 
 	struct audio_module_template_context context = {0};