Fix ability to build anc_assist

This commit is contained in:
Ben V. Brown 2024-05-13 19:12:26 +10:00
parent 850cb666c4
commit f64468868c
3 changed files with 6 additions and 5 deletions

View File

@ -25,6 +25,7 @@ endif
ifeq ($(ANC_ASSIST_ENABLED),1) ifeq ($(ANC_ASSIST_ENABLED),1)
CFLAGS_app_anc.o += -DANC_ASSIST_ENABLED CFLAGS_app_anc.o += -DANC_ASSIST_ENABLED
CFLAGS_anc_assist.o += -DANC_ASSIST_ENABLED
ifeq ($(ANC_ASSIST_WNR_ENABLED),1) ifeq ($(ANC_ASSIST_WNR_ENABLED),1)
CFLAGS_anc_assist.o += -DANC_ASSIST_WNR_ENABLED CFLAGS_anc_assist.o += -DANC_ASSIST_WNR_ENABLED

View File

@ -64,7 +64,7 @@ AUDIO_OUTPUT_MONO ?= 0
AUDIO_OUTPUT_DIFF ?= 0 AUDIO_OUTPUT_DIFF ?= 0
# Raise mic bias from 2.2V to 3.3V # Raise mic bias from 2.2V to 3.3V
DIGMIC_HIGH_VOLT?=0 DIGMIC_HIGH_VOLT ?= 0
#### ANC DEFINE START ###### #### ANC DEFINE START ######
export ANC_APP ?= 1 export ANC_APP ?= 1
@ -84,10 +84,10 @@ export AUDIO_ANC_FB_MC_HW ?=0
export APP_ANC_KEY ?= 1 export APP_ANC_KEY ?= 1
# Feedback check for feedforward mic. Locked on due to blobs # Feedback check for feedforward mic. Locked on due to blobs
export ANC_FB_CHECK ?= 1 export ANC_FB_CHECK ?= 1
##### ANC DEFINE END ######
# Build in ANC testing app (closed source) # Build in ANC testing app (closed source)
APP_ANC_TEST ?= 0 APP_ANC_TEST ?= 0
export ANC_ASSIST_ENABLED ?= 0
##### ANC DEFINE END ######
# Allow test commands via bluetooth # Allow test commands via bluetooth
TEST_OVER_THE_AIR ?= 0 TEST_OVER_THE_AIR ?= 0

View File

@ -205,7 +205,7 @@ enum AUD_STREAM_ID_T {
AUD_STREAM_ID_0 = 0, AUD_STREAM_ID_0 = 0,
AUD_STREAM_ID_1, AUD_STREAM_ID_1,
AUD_STREAM_ID_2, AUD_STREAM_ID_2,
#ifdef __ANC_ASSIST__ #ifdef ANC_ASSIST_ENABLED
AUD_STREAM_ID_3, AUD_STREAM_ID_3,
#endif #endif
AUD_STREAM_ID_NUM, AUD_STREAM_ID_NUM,
@ -230,7 +230,7 @@ enum AUD_IO_PATH_T {
AUD_INPUT_PATH_NTMIC, AUD_INPUT_PATH_NTMIC,
AUD_INPUT_PATH_ANC_WNR, // Wind Noise Reduction AUD_INPUT_PATH_ANC_WNR, // Wind Noise Reduction
AUD_INPUT_PATH_USBAUDIO, AUD_INPUT_PATH_USBAUDIO,
#ifdef __ANC_ASSIST__ #ifdef ANC_ASSIST_ENABLED
AUD_INPUT_PATH_AF_ANC, AUD_INPUT_PATH_AF_ANC,
#endif #endif
// Output path // Output path