From f64468868c562e30e3427af16ae7da35cbecdaf6 Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" Date: Mon, 13 May 2024 19:12:26 +1000 Subject: [PATCH] Fix ability to build anc_assist --- apps/anc/Makefile | 1 + config/open_source/target.mk | 6 +++--- platform/hal/hal_aud.h | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/anc/Makefile b/apps/anc/Makefile index 39072db..3ab8bc1 100644 --- a/apps/anc/Makefile +++ b/apps/anc/Makefile @@ -25,6 +25,7 @@ endif ifeq ($(ANC_ASSIST_ENABLED),1) CFLAGS_app_anc.o += -DANC_ASSIST_ENABLED +CFLAGS_anc_assist.o += -DANC_ASSIST_ENABLED ifeq ($(ANC_ASSIST_WNR_ENABLED),1) CFLAGS_anc_assist.o += -DANC_ASSIST_WNR_ENABLED diff --git a/config/open_source/target.mk b/config/open_source/target.mk index eeadf46..e12478e 100644 --- a/config/open_source/target.mk +++ b/config/open_source/target.mk @@ -64,7 +64,7 @@ AUDIO_OUTPUT_MONO ?= 0 AUDIO_OUTPUT_DIFF ?= 0 # Raise mic bias from 2.2V to 3.3V -DIGMIC_HIGH_VOLT?=0 +DIGMIC_HIGH_VOLT ?= 0 #### ANC DEFINE START ###### export ANC_APP ?= 1 @@ -84,10 +84,10 @@ export AUDIO_ANC_FB_MC_HW ?=0 export APP_ANC_KEY ?= 1 # Feedback check for feedforward mic. Locked on due to blobs export ANC_FB_CHECK ?= 1 -##### ANC DEFINE END ###### - # Build in ANC testing app (closed source) APP_ANC_TEST ?= 0 +export ANC_ASSIST_ENABLED ?= 0 +##### ANC DEFINE END ###### # Allow test commands via bluetooth TEST_OVER_THE_AIR ?= 0 diff --git a/platform/hal/hal_aud.h b/platform/hal/hal_aud.h index 508170e..cfcec67 100644 --- a/platform/hal/hal_aud.h +++ b/platform/hal/hal_aud.h @@ -205,7 +205,7 @@ enum AUD_STREAM_ID_T { AUD_STREAM_ID_0 = 0, AUD_STREAM_ID_1, AUD_STREAM_ID_2, -#ifdef __ANC_ASSIST__ +#ifdef ANC_ASSIST_ENABLED AUD_STREAM_ID_3, #endif AUD_STREAM_ID_NUM, @@ -230,7 +230,7 @@ enum AUD_IO_PATH_T { AUD_INPUT_PATH_NTMIC, AUD_INPUT_PATH_ANC_WNR, // Wind Noise Reduction AUD_INPUT_PATH_USBAUDIO, -#ifdef __ANC_ASSIST__ +#ifdef ANC_ASSIST_ENABLED AUD_INPUT_PATH_AF_ANC, #endif // Output path