add open source work on it

apps/main/apps.cpp

@@ -659,7 +659,6 @@ const  APP_KEY_HANDLE  pwron_key_handle_cfg[] = {
     {{APP_KEY_CODE_PWR,APP_KEY_EVENT_UP},           "power on: shutdown"     , app_bt_key_shutdown, NULL},
 };
 #elif defined(__ENGINEER_MODE_SUPPORT__)
-s
 const  APP_KEY_HANDLE  pwron_key_handle_cfg[] = {
     {{APP_KEY_CODE_PWR,APP_KEY_EVENT_INITUP},           "power on: normal"     , app_poweron_normal, NULL},
 #if !defined(BLE_ONLY_ENABLED)

build.sh

@@ -1,4 +1,5 @@
-make -j T=mic_alg DEBUG=1 > log.txt 2>&1
+#make -j T=2300_open_source DEBUG=1 > log.txt 2>&1
+make -j T=open_source DEBUG=1 > log.txt 2>&1
 
 if [ $? -eq 0 ];then
 	echo "build success"

config/best2300p_ibrt/tgt_hardware.c

@@ -160,9 +160,7 @@ const struct AUD_IO_PATH_CFG_T cfg_audio_input_path_cfg[CFG_HW_AUD_INPUT_PATH_NU
 #endif
 };
 
-const struct HAL_IOMUX_PIN_FUNCTION_MAP MuteOutPwl ={
+
-	HAL_IOMUX_PIN_P1_1, HAL_IOMUX_FUNC_AS_GPIO, HAL_IOMUX_PIN_VOLTAGE_VIO, HAL_IOMUX_PIN_NOPULL 
-};
 
 const struct HAL_IOMUX_PIN_FUNCTION_MAP app_battery_ext_charger_enable_cfg = {
     HAL_IOMUX_PIN_NUM, HAL_IOMUX_FUNC_AS_GPIO, HAL_IOMUX_PIN_VOLTAGE_VIO, HAL_IOMUX_PIN_PULLUP_ENABLE

config/common.mk

@@ -2155,6 +2155,11 @@ ifeq ($(SPEECH_RX_EQ),1)
 export SPEECH_RX_24BIT = 1
 endif
 
+export WL_UI ?= 0
+ifeq ($(WL_UI),1)
+KBUILD_CPPFLAGS += -DWL_UI
+endif
+
 
 export SPEECH_PROCESS_FRAME_MS 	?= 16
 ifeq ($(SPEECH_CODEC_CAPTURE_CHANNEL_NUM),1)

config/open_source/target.mk

@@ -10,13 +10,14 @@ RTOS        ?= 1
 
 #KERNEL      ?= FREERTOS
 
+
 LIBC_ROM    ?= 1
 
 export USER_SECURE_BOOT	?= 0
 # enable:1
 # disable:0
 
-WATCHER_DOG ?= 1
+WATCHER_DOG ?= 0
 
 DEBUG_PORT  ?= 1
 # 0: usb
@@ -39,7 +40,9 @@ export FORCE_SCO_MAX_RETX ?= 0
 export FA_RX_GAIN_CTRL ?= 1
 
 export BT_FA_ECC ?= 0
+
 export CONTROLLER_DUMP_ENABLE ?= 0
+
 export CONTROLLER_MEM_LOG_ENABLE ?= 0
 
 export INTERSYS_DEBUG ?= 1
@@ -58,27 +61,11 @@ AUDIO_OUTPUT_MONO ?= 0
 
 AUDIO_OUTPUT_DIFF ?= 0
 
-#### ANC DEFINE START ######
-export ANC_APP		    ?= 0
-export ANC_FF_ENABLED	?= 0
-export ANC_FB_ENABLED	?= 0
-export AUDIO_ANC_FB_MC ?= 0
-export AUDIO_SECTION_SUPPT ?= 0
-export AUD_SECTION_STRUCT_VERSION ?= 2
-export AUDIO_ANC_FB_MC_HW ?=0
-export APP_ANC_KEY ?= 0
-export ANC_FB_CHECK ?= 0
-##### ANC DEFINE END ######
-
-APP_ANC_TEST ?= 0
-
-TEST_OVER_THE_AIR ?= 0
-
 HW_FIR_EQ_PROCESS ?= 0
 
-SW_IIR_EQ_PROCESS ?= 1
+SW_IIR_EQ_PROCESS ?= 0
 
-HW_DAC_IIR_EQ_PROCESS ?= 0
+HW_DAC_IIR_EQ_PROCESS ?= 1
 
 HW_IIR_EQ_PROCESS ?= 0
 
@@ -98,7 +85,7 @@ RESAMPLE_ANY_SAMPLE_RATE ?= 1
 
 OSC_26M_X4_AUD2BB ?= 1
 
-AUDIO_OUTPUT_VOLUME_DEFAULT ?= 17
+AUDIO_OUTPUT_VOLUME_DEFAULT ?= 12
 # range:1~16
 
 AUDIO_INPUT_CAPLESSMODE ?= 0
@@ -148,8 +135,6 @@ HSP_ENABLE ?= 0
 
 HFP_1_6_ENABLE ?= 1
 
-BTIF_HID_DEVICE ?= 1
-
 MSBC_PLC_ENABLE ?= 1
 
 MSBC_PLC_ENCODER ?= 1
@@ -166,6 +151,8 @@ APP_I2S_A2DP_SOURCE ?= 0
 
 VOICE_PROMPT ?= 1
 
+export THROUGH_PUT ?= 0
+
 #### Google related feature ####
 # the overall google service switch
 # currently, google service includes BISTO and GFPS
@@ -175,25 +162,30 @@ export GOOGLE_SERVICE_ENABLE ?= 0
 # BISTO is an isolated service relative to GFPS
 export BISTO_ENABLE ?= 0
 
+# macro switch for reduced_guesture
+export REDUCED_GUESTURE_ENABLE ?= 0
+
 # GSOUND_HOTWORD is a hotword library running on Bluetooth audio device
 # GSOUND_HOTWORD is a subset of BISTO
 export GSOUND_HOTWORD_ENABLE ?= 0
 
+# this is a subset choice for gsound hotword
+export GSOUND_HOTWORD_EXTERNAL ?= 0
+
 # GFPS is google fastpair service
 # GFPS is an isolated service relative to BISTO
 export GFPS_ENABLE ?= 0
 #### Google related feature ####
 
-export BTIF_HID_DEVICE ?= 1
+export WL_UI ?= 1
-ifeq ($(BTIF_HID_DEVICE),1)
-KBUILD_CPPFLAGS += -DBTIF_HID_DEVICE
-endif
 
 BLE ?= 0
 
 TOTA ?= 0
 
-OTA_ENABLE ?= 1
+GATT_OVER_BR_EDR ?= 0
+
+OTA_ENABLE ?= 0
 
 TILE_DATAPATH_ENABLED ?= 0
 
@@ -218,7 +210,7 @@ A2DP_SCALABLE_ON ?= 0
 A2DP_LHDC_ON ?= 0
 ifeq ($(A2DP_LHDC_ON),1)
 A2DP_LHDC_V3 ?= 1
-A2DP_LHDC_LARC ?= 0
+A2DP_LHDC_LARC ?= 1
 export FLASH_UNIQUE_ID ?= 1
 endif
 
@@ -230,7 +222,7 @@ A2DP_SCALABLE_ON ?= 0
 
 FACTORY_MODE ?= 1
 
-ENGINEER_MODE ?= 0
+ENGINEER_MODE ?= 1
 
 ULTRA_LOW_POWER	?= 1
 
@@ -246,6 +238,8 @@ ENHANCED_STACK ?= 1
 
 export SYNC_BT_CTLR_PROFILE ?= 0
 
+export A2DP_AVDTP_CP ?= 0
+
 export A2DP_DECODER_VER := 2
 
 export IBRT ?= 1
@@ -262,6 +256,7 @@ export SPEECH_CODEC ?= 1
 
 export TWS_PROMPT_SYNC ?= 0
 export MIX_AUDIO_PROMPT_WITH_A2DP_MEDIA_ENABLED ?= 0
+export IOS_MFI ?= 0
 
 export FLASH_SIZE ?= 0x400000
 export FLASH_SUSPEND ?= 1
@@ -289,12 +284,13 @@ endif
 
 USE_THIRDPARTY ?= 0
 export USE_KNOWLES ?= 0
-export USE_CYBERON ?= 0
 
 ifeq ($(CURRENT_TEST),1)
 export VCODEC_VOLT ?= 1.6V
 export VANA_VOLT ?= 1.35V
 else
+export VCODEC_VOLT ?= 1.8V
+export VANA_VOLT ?= 1.35V
 endif
 
 export LAURENT_ALGORITHM ?= 0
@@ -307,8 +303,14 @@ export BTADDR_FOR_DEBUG ?= 1
 
 export POWERKEY_I2C_SWITCH ?=0
 
+export WL_DET ?= 0
+
+export AUDIO_LOOPBACK ?= 0
+
 AUTO_TEST ?= 0
 
+BES_AUTOMATE_TEST ?= 0
+
 export DUMP_NORMAL_LOG ?= 0
 
 SUPPORT_BATTERY_REPORT ?= 1
@@ -332,12 +334,13 @@ AUDIO_BUFFER_SIZE := 100*1024
 endif
 
 export TRACE_BUF_SIZE := 16*1024
-export TRACE_BAUD_RATE := 10*115200
+export TRACE_BAUD_RATE := 921600
 
 init-y :=
 core-y := platform/ services/ apps/ utils/cqueue/ utils/list/ services/multimedia/ utils/intersyshci/
 
-KBUILD_CPPFLAGS +=  -Iplatform/cmsis/inc \
+KBUILD_CPPFLAGS += \
+    -Iplatform/cmsis/inc \
     -Iservices/audioflinger \
     -Iplatform/hal \
     -Iservices/fs/ \
@@ -347,7 +350,7 @@ KBUILD_CPPFLAGS +=  -Iplatform/cmsis/inc \
 
 KBUILD_CPPFLAGS += \
     -DAPP_AUDIO_BUFFER_SIZE=$(AUDIO_BUFFER_SIZE) \
-    -DCHARGER_PLUGINOUT_RESET=0 \
+    -DCHARGER_PLUGINOUT_RESET=0 
 #    -D__A2DP_AVDTP_CP__ \
     
 ifeq ($(BES_AUDIO_DEV_Main_Board_9v0),1)
@@ -376,6 +379,11 @@ else
 LDS_FILE := best1000.lds
 endif
 
+ifeq ($(GATT_OVER_BR_EDR),1)
+export GATT_OVER_BR_EDR ?= 1
+KBUILD_CPPFLAGS += -D__GATT_OVER_BR_EDR__
+endif
+
 ifeq ($(TOTA),1)
 ifeq ($(BLE),1)
 KBUILD_CPPFLAGS += -DBLE_TOTA_ENABLED
@@ -385,35 +393,23 @@ KBUILD_CPPFLAGS += -DTEST_OVER_THE_AIR_ENANBLED
 export TEST_OVER_THE_AIR ?= 1
 endif
 
+KBUILD_CPPFLAGS += -DSHOW_RSSI
 ifneq ($(A2DP_DECODER_VER), )
 KBUILD_CPPFLAGS += -DA2DP_DECODER_VER=$(A2DP_DECODER_VER)
 endif
 
-ifeq ($(ANC_APP),1)
+KBUILD_CPPFLAGS += \
-KBUILD_CPPFLAGS += -DANC_APP
+    # -DHAL_TRACE_RX_ENABLE
-endif
-
-ifeq ($(USE_CYBERON),1)
-
-export THIRDPARTY_LIB ?= cyberon
-KBUILD_CPPFLAGS += -D__CYBERON
-
-export KWS_IN_RAM := 1
-ifeq ($(KWS_IN_RAM),1)
-CPPFLAGS_${LDS_FILE} += -DKWS_IN_RAM
-endif #KWS_IN_RAM
-
-endif #USE_CYBERON
 
 KBUILD_CFLAGS +=
 
 LIB_LDFLAGS += -lstdc++ -lsupc++
 
-#CFLAGS_IMAGE += -u _printf_float -u _scanf_float
-
-#LDFLAGS_IMAGE += --wrap main
-
 export BTIF_HID_DEVICE ?= 1
 ifeq ($(BTIF_HID_DEVICE),1)
 KBUILD_CPPFLAGS += -DBTIF_HID_DEVICE
 endif
+
+#CFLAGS_IMAGE += -u _printf_float -u _scanf_float
+
+#LDFLAGS_IMAGE += --wrap main

config/open_source/tgt_hardware.c

@@ -0,0 +1,326 @@
+/***************************************************************************
+ *
+ * Copyright 2015-2019 BES.
+ * All rights reserved. All unpublished rights reserved.
+ *
+ * No part of this work may be used or reproduced in any form or by any
+ * means, or stored in a database or retrieval system, without prior written
+ * permission of BES.
+ *
+ * Use of this work is governed by a license granted by BES.
+ * This work contains confidential and proprietary information of
+ * BES. which is protected by copyright, trade secret,
+ * trademark and other intellectual property rights.
+ *
+ ****************************************************************************/
+#include "tgt_hardware.h"
+#include "iir_process.h"
+#include "fir_process.h"
+#include "drc.h"
+#include "limiter.h"
+#include "spectrum_fix.h"
+
+const struct HAL_IOMUX_PIN_FUNCTION_MAP cfg_hw_pinmux_pwl[CFG_HW_PLW_NUM] = {
+#if (CFG_HW_PLW_NUM > 0)
+    {HAL_IOMUX_PIN_LED2, HAL_IOMUX_FUNC_AS_GPIO, HAL_IOMUX_PIN_VOLTAGE_VIO, HAL_IOMUX_PIN_PULLUP_ENABLE},
+    {HAL_IOMUX_PIN_LED1, HAL_IOMUX_FUNC_AS_GPIO, HAL_IOMUX_PIN_VOLTAGE_VIO, HAL_IOMUX_PIN_PULLUP_ENABLE},
+#endif
+};
+
+#ifdef __APP_USE_LED_INDICATE_IBRT_STATUS__
+const struct HAL_IOMUX_PIN_FUNCTION_MAP cfg_ibrt_indication_pinmux_pwl[3] = {
+    {HAL_IOMUX_PIN_P1_5, HAL_IOMUX_FUNC_AS_GPIO, HAL_IOMUX_PIN_VOLTAGE_VIO, HAL_IOMUX_PIN_PULLUP_ENABLE},
+    {HAL_IOMUX_PIN_LED1, HAL_IOMUX_FUNC_AS_GPIO, HAL_IOMUX_PIN_VOLTAGE_VBAT, HAL_IOMUX_PIN_PULLUP_ENABLE},
+    {HAL_IOMUX_PIN_LED2, HAL_IOMUX_FUNC_AS_GPIO, HAL_IOMUX_PIN_VOLTAGE_VBAT, HAL_IOMUX_PIN_PULLUP_ENABLE},
+};
+#endif
+
+#ifdef __KNOWLES
+const struct HAL_IOMUX_PIN_FUNCTION_MAP cfg_pinmux_uart[2] = {
+    {HAL_IOMUX_PIN_P2_2, HAL_IOMUX_FUNC_UART2_RX, HAL_IOMUX_PIN_VOLTAGE_VIO, HAL_IOMUX_PIN_NOPULL},
+    {HAL_IOMUX_PIN_P2_3, HAL_IOMUX_FUNC_UART2_TX,  HAL_IOMUX_PIN_VOLTAGE_VIO, HAL_IOMUX_PIN_NOPULL},
+};
+#endif
+
+//adckey define
+const uint16_t CFG_HW_ADCKEY_MAP_TABLE[CFG_HW_ADCKEY_NUMBER] = {
+#if (CFG_HW_ADCKEY_NUMBER > 0)
+    HAL_KEY_CODE_FN9,HAL_KEY_CODE_FN8,HAL_KEY_CODE_FN7,
+    HAL_KEY_CODE_FN6,HAL_KEY_CODE_FN5,HAL_KEY_CODE_FN4,
+    HAL_KEY_CODE_FN3,HAL_KEY_CODE_FN2,HAL_KEY_CODE_FN1,
+#endif
+};
+
+//gpiokey define
+#define CFG_HW_GPIOKEY_DOWN_LEVEL          (0)
+#define CFG_HW_GPIOKEY_UP_LEVEL            (1)
+const struct HAL_KEY_GPIOKEY_CFG_T cfg_hw_gpio_key_cfg[CFG_HW_GPIOKEY_NUM] = {
+/*
+#if (CFG_HW_GPIOKEY_NUM > 0)
+#ifdef BES_AUDIO_DEV_Main_Board_9v0
+    {HAL_KEY_CODE_FN1,{HAL_IOMUX_PIN_P0_3, HAL_IOMUX_FUNC_AS_GPIO, HAL_IOMUX_PIN_VOLTAGE_VIO, HAL_IOMUX_PIN_PULLUP_ENABLE}},
+    {HAL_KEY_CODE_FN2,{HAL_IOMUX_PIN_P0_0, HAL_IOMUX_FUNC_AS_GPIO, HAL_IOMUX_PIN_VOLTAGE_VIO, HAL_IOMUX_PIN_PULLUP_ENABLE}},
+    {HAL_KEY_CODE_FN3,{HAL_IOMUX_PIN_P0_1, HAL_IOMUX_FUNC_AS_GPIO, HAL_IOMUX_PIN_VOLTAGE_VIO, HAL_IOMUX_PIN_PULLUP_ENABLE}},
+    {HAL_KEY_CODE_FN4,{HAL_IOMUX_PIN_P0_2, HAL_IOMUX_FUNC_AS_GPIO, HAL_IOMUX_PIN_VOLTAGE_VIO, HAL_IOMUX_PIN_PULLUP_ENABLE}},
+    //{HAL_KEY_CODE_FN5,{HAL_IOMUX_PIN_P2_0, HAL_IOMUX_FUNC_AS_GPIO, HAL_IOMUX_PIN_VOLTAGE_VIO, HAL_IOMUX_PIN_PULLUP_ENABLE}},
+   // {HAL_KEY_CODE_FN6,{HAL_IOMUX_PIN_P2_1, HAL_IOMUX_FUNC_AS_GPIO, HAL_IOMUX_PIN_VOLTAGE_VIO, HAL_IOMUX_PIN_PULLUP_ENABLE}},
+#else
+#ifndef TPORTS_KEY_COEXIST
+    {HAL_KEY_CODE_FN1,{HAL_IOMUX_PIN_P1_3, HAL_IOMUX_FUNC_AS_GPIO, HAL_IOMUX_PIN_VOLTAGE_VIO, HAL_IOMUX_PIN_PULLUP_ENABLE}},
+    {HAL_KEY_CODE_FN2,{HAL_IOMUX_PIN_P1_0, HAL_IOMUX_FUNC_AS_GPIO, HAL_IOMUX_PIN_VOLTAGE_VIO, HAL_IOMUX_PIN_PULLUP_ENABLE}},
+    // {HAL_KEY_CODE_FN3,{HAL_IOMUX_PIN_P1_2, HAL_IOMUX_FUNC_AS_GPIO, HAL_IOMUX_PIN_VOLTAGE_VIO, HAL_IOMUX_PIN_PULLUP_ENABLE}},
+    {HAL_KEY_CODE_FN15,{HAL_IOMUX_PIN_P1_2, HAL_IOMUX_FUNC_AS_GPIO, HAL_IOMUX_PIN_VOLTAGE_VIO, HAL_IOMUX_PIN_PULLUP_ENABLE}},
+#else
+    {HAL_KEY_CODE_FN1,{HAL_IOMUX_PIN_P1_3, HAL_IOMUX_FUNC_AS_GPIO, HAL_IOMUX_PIN_VOLTAGE_VIO, HAL_IOMUX_PIN_PULLUP_ENABLE}},
+    {HAL_KEY_CODE_FN15,{HAL_IOMUX_PIN_P1_0, HAL_IOMUX_FUNC_AS_GPIO, HAL_IOMUX_PIN_VOLTAGE_VIO, HAL_IOMUX_PIN_PULLUP_ENABLE}},
+#endif
+#endif
+#ifdef IS_MULTI_AI_ENABLED
+    //{HAL_KEY_CODE_FN13,{HAL_IOMUX_PIN_P1_3, HAL_IOMUX_FUNC_AS_GPIO, HAL_IOMUX_PIN_VOLTAGE_VIO, HAL_IOMUX_PIN_PULLUP_ENABLE}},
+    //{HAL_KEY_CODE_FN14,{HAL_IOMUX_PIN_P1_2, HAL_IOMUX_FUNC_AS_GPIO, HAL_IOMUX_PIN_VOLTAGE_VIO, HAL_IOMUX_PIN_PULLUP_ENABLE}},
+#endif
+#endif
+*/
+	{HAL_KEY_CODE_FN1,{HAL_IOMUX_PIN_P1_5, HAL_IOMUX_FUNC_AS_GPIO, HAL_IOMUX_PIN_VOLTAGE_VIO, HAL_IOMUX_PIN_PULLUP_ENABLE}},
+};
+
+//bt config
+const char *BT_LOCAL_NAME = TO_STRING(BT_DEV_NAME) "\0";
+const char *BLE_DEFAULT_NAME = "BES_BLE";
+uint8_t ble_addr[6] = {
+#ifdef BLE_DEV_ADDR
+	BLE_DEV_ADDR
+#else
+	0xBE,0x99,0x34,0x45,0x56,0x67
+#endif
+};
+uint8_t bt_addr[6] = {
+#ifdef BT_DEV_ADDR
+	BT_DEV_ADDR
+#else
+	0x1e,0x57,0x34,0x45,0x56,0x67
+#endif
+};
+
+//audio config
+//freq bands range {[0k:2.5K], [2.5k:5K], [5k:7.5K], [7.5K:10K], [10K:12.5K], [12.5K:15K], [15K:17.5K], [17.5K:20K]}
+//gain range -12~+12
+const int8_t cfg_aud_eq_sbc_band_settings[CFG_HW_AUD_EQ_NUM_BANDS] = {0, 0, 0, 0, 0, 0, 0, 0};
+
+#define TX_PA_GAIN                          CODEC_TX_PA_GAIN_DEFAULT
+
+const struct CODEC_DAC_VOL_T codec_dac_vol[TGT_VOLUME_LEVEL_QTY] = {
+    {TX_PA_GAIN,0x03,-21},
+    {TX_PA_GAIN,0x03,-99},
+    {TX_PA_GAIN,0x03,-45},
+    {TX_PA_GAIN,0x03,-42},
+    {TX_PA_GAIN,0x03,-39},
+    {TX_PA_GAIN,0x03,-36},
+    {TX_PA_GAIN,0x03,-33},
+    {TX_PA_GAIN,0x03,-30},
+    {TX_PA_GAIN,0x03,-27},
+    {TX_PA_GAIN,0x03,-24},
+    {TX_PA_GAIN,0x03,-21},
+    {TX_PA_GAIN,0x03,-18},
+    {TX_PA_GAIN,0x03,-15},
+    {TX_PA_GAIN,0x03,-12},
+    {TX_PA_GAIN,0x03, -9},
+    {TX_PA_GAIN,0x03, -6},
+    {TX_PA_GAIN,0x03, -3},
+    {TX_PA_GAIN,0x03,  0},  //0dBm
+};
+
+#if SPEECH_CODEC_CAPTURE_CHANNEL_NUM == 2
+#define CFG_HW_AUD_INPUT_PATH_MAINMIC_DEV   (AUD_CHANNEL_MAP_CH0 | AUD_CHANNEL_MAP_CH4 | AUD_VMIC_MAP_VMIC2|AUD_VMIC_MAP_VMIC3)
+#elif SPEECH_CODEC_CAPTURE_CHANNEL_NUM == 3
+#define CFG_HW_AUD_INPUT_PATH_MAINMIC_DEV   (AUD_CHANNEL_MAP_CH0 | AUD_CHANNEL_MAP_CH1 | AUD_CHANNEL_MAP_CH4 | AUD_VMIC_MAP_VMIC1)
+#else
+#define CFG_HW_AUD_INPUT_PATH_MAINMIC_DEV   (AUD_CHANNEL_MAP_CH4 | AUD_VMIC_MAP_VMIC3)
+#endif
+
+#define CFG_HW_AUD_INPUT_PATH_LINEIN_DEV    (AUD_CHANNEL_MAP_CH0 | AUD_CHANNEL_MAP_CH1)
+#ifdef VOICE_DETECTOR_EN
+#define CFG_HW_AUD_INPUT_PATH_VADMIC_DEV    (AUD_CHANNEL_MAP_CH4 | AUD_VMIC_MAP_VMIC1)
+#else
+#define CFG_HW_AUD_INPUT_PATH_ASRMIC_DEV    (AUD_CHANNEL_MAP_CH4 | AUD_VMIC_MAP_VMIC3)
+#endif
+
+const struct AUD_IO_PATH_CFG_T cfg_audio_input_path_cfg[CFG_HW_AUD_INPUT_PATH_NUM] = {
+#if defined(SPEECH_TX_AEC_CODEC_REF)
+    // NOTE: If enable Ch5 and CH6, need to add channel_num when setup audioflinger stream
+    { AUD_INPUT_PATH_MAINMIC, CFG_HW_AUD_INPUT_PATH_MAINMIC_DEV | AUD_CHANNEL_MAP_CH4, },
+#else
+    { AUD_INPUT_PATH_MAINMIC, CFG_HW_AUD_INPUT_PATH_MAINMIC_DEV, },
+#endif
+    { AUD_INPUT_PATH_LINEIN,  CFG_HW_AUD_INPUT_PATH_LINEIN_DEV, },
+#ifdef VOICE_DETECTOR_EN
+    { AUD_INPUT_PATH_VADMIC,  CFG_HW_AUD_INPUT_PATH_VADMIC_DEV, },
+#else
+    { AUD_INPUT_PATH_ASRMIC,  CFG_HW_AUD_INPUT_PATH_ASRMIC_DEV, },
+#endif
+};
+
+const struct HAL_IOMUX_PIN_FUNCTION_MAP app_battery_ext_charger_enable_cfg = {
+    HAL_IOMUX_PIN_NUM, HAL_IOMUX_FUNC_AS_GPIO, HAL_IOMUX_PIN_VOLTAGE_VIO, HAL_IOMUX_PIN_PULLUP_ENABLE
+};
+
+const struct HAL_IOMUX_PIN_FUNCTION_MAP app_battery_ext_charger_detecter_cfg = {
+    HAL_IOMUX_PIN_P1_1, HAL_IOMUX_FUNC_AS_GPIO, HAL_IOMUX_PIN_VOLTAGE_VIO, HAL_IOMUX_PIN_PULLUP_ENABLE
+};
+
+const struct HAL_IOMUX_PIN_FUNCTION_MAP app_battery_ext_charger_indicator_cfg = {
+    HAL_IOMUX_PIN_NUM, HAL_IOMUX_FUNC_AS_GPIO, HAL_IOMUX_PIN_VOLTAGE_VIO, HAL_IOMUX_PIN_PULLUP_ENABLE
+};
+
+
+/*
+const struct HAL_IOMUX_PIN_FUNCTION_MAP TOUCH_INT ={
+	HAL_IOMUX_PIN_P1_5, HAL_IOMUX_FUNC_AS_GPIO, HAL_IOMUX_PIN_VOLTAGE_VIO, HAL_IOMUX_PIN_PULLUP_ENABLE
+};
+*/
+
+const struct HAL_IOMUX_PIN_FUNCTION_MAP TOUCH_I2C_SDA ={
+	HAL_IOMUX_PIN_P2_1, HAL_IOMUX_FUNC_AS_GPIO, HAL_IOMUX_PIN_VOLTAGE_VIO, HAL_IOMUX_PIN_PULLUP_ENABLE
+};
+
+const struct HAL_IOMUX_PIN_FUNCTION_MAP TOUCH_I2C_SCL ={
+	HAL_IOMUX_PIN_P2_0, HAL_IOMUX_FUNC_AS_GPIO, HAL_IOMUX_PIN_VOLTAGE_VIO, HAL_IOMUX_PIN_PULLUP_ENABLE
+};
+
+
+const IIR_CFG_T audio_eq_sw_iir_cfg = {
+    .gain0 = 0,
+    .gain1 = 0,
+    .num = 5,
+    .param = {
+        {IIR_TYPE_PEAK, .0,   200,   2},
+        {IIR_TYPE_PEAK, .0,   600,  2},
+        {IIR_TYPE_PEAK, .0,   2000.0, 2},
+        {IIR_TYPE_PEAK, .0,  6000.0, 2},
+        {IIR_TYPE_PEAK, .0,  12000.0, 2}            
+    }
+};
+
+const IIR_CFG_T * const audio_eq_sw_iir_cfg_list[EQ_SW_IIR_LIST_NUM]={
+    &audio_eq_sw_iir_cfg,
+};
+
+const FIR_CFG_T audio_eq_hw_fir_cfg_44p1k = {
+    .gain = 0.0f,
+    .len = 384,
+    .coef =
+    {
+        (1<<23)-1,
+    }
+};
+
+const FIR_CFG_T audio_eq_hw_fir_cfg_48k = {
+    .gain = 0.0f,
+    .len = 384,
+    .coef =
+    {
+        (1<<23)-1,
+    }
+};
+
+
+const FIR_CFG_T audio_eq_hw_fir_cfg_96k = {
+    .gain = 0.0f,
+    .len = 384,
+    .coef =
+    {
+        (1<<23)-1,
+    }
+};
+
+const FIR_CFG_T * const audio_eq_hw_fir_cfg_list[EQ_HW_FIR_LIST_NUM]={
+    &audio_eq_hw_fir_cfg_44p1k,
+    &audio_eq_hw_fir_cfg_48k,
+    &audio_eq_hw_fir_cfg_96k,    
+};
+
+//hardware dac iir eq
+const IIR_CFG_T audio_eq_hw_dac_iir_cfg = {
+    .gain0 = 0,
+    .gain1 = 0,
+    .num = 8,
+    .param = {
+        {IIR_TYPE_PEAK, 0,   1000.0,   0.7},
+        {IIR_TYPE_PEAK, 0,   1000.0,   0.7},
+        {IIR_TYPE_PEAK, 0,   1000.0,   0.7},
+        {IIR_TYPE_PEAK, 0,   1000.0,   0.7},
+        {IIR_TYPE_PEAK, 0,   1000.0,   0.7},
+        {IIR_TYPE_PEAK, 0,   1000.0,   0.7},
+        {IIR_TYPE_PEAK, 0,   1000.0,   0.7},
+        {IIR_TYPE_PEAK, 0,   1000.0,   0.7},
+    }
+};
+
+const IIR_CFG_T * const POSSIBLY_UNUSED audio_eq_hw_dac_iir_cfg_list[EQ_HW_DAC_IIR_LIST_NUM]={
+    &audio_eq_hw_dac_iir_cfg,
+};
+
+//hardware dac iir eq
+const IIR_CFG_T audio_eq_hw_adc_iir_adc_cfg = {
+    .gain0 = 0,
+    .gain1 = 0,
+    .num = 1,
+    .param = {
+        {IIR_TYPE_PEAK, 0.0,   1000.0,   0.7},
+    }
+};
+
+const IIR_CFG_T * const POSSIBLY_UNUSED audio_eq_hw_adc_iir_cfg_list[EQ_HW_ADC_IIR_LIST_NUM]={
+    &audio_eq_hw_adc_iir_adc_cfg,
+};
+
+
+
+//hardware iir eq
+const IIR_CFG_T audio_eq_hw_iir_cfg = {
+    .gain0 = 0,
+    .gain1 = 0,
+    .num = 8,
+    .param = {
+        {IIR_TYPE_PEAK, -10.1,   100.0,   7},
+        {IIR_TYPE_PEAK, -10.1,   400.0,   7},
+        {IIR_TYPE_PEAK, -10.1,   700.0,   7},
+        {IIR_TYPE_PEAK, -10.1,   1000.0,   7},
+        {IIR_TYPE_PEAK, -10.1,   3000.0,   7},
+        {IIR_TYPE_PEAK, -10.1,   5000.0,   7},
+        {IIR_TYPE_PEAK, -10.1,   7000.0,   7},
+        {IIR_TYPE_PEAK, -10.1,   9000.0,   7},
+            
+    }
+};
+
+const IIR_CFG_T * const POSSIBLY_UNUSED audio_eq_hw_iir_cfg_list[EQ_HW_IIR_LIST_NUM]={
+    &audio_eq_hw_iir_cfg,
+};
+
+const DrcConfig audio_drc_cfg = {
+     .knee = 3,
+     .filter_type = {14, -1},
+     .band_num = 2,
+     .look_ahead_time = 10,
+     .band_settings = {
+         {-20, 0, 2, 3, 3000, 1},
+         {-20, 0, 2, 3, 3000, 1},
+     }
+ };
+
+const LimiterConfig audio_drc2_cfg = {
+    .knee = 2,
+    .look_ahead_time = 10,
+    .threshold = -20,
+    .makeup_gain = 19,
+    .ratio = 1000,
+    .attack_time = 3,
+    .release_time = 3000,
+};
+
+const SpectrumFixConfig audio_spectrum_cfg = {
+    .freq_num = 9,
+    .freq_list = {200, 400, 600, 800, 1000, 1200, 1400, 1600, 1800},
+};
+

config/open_source/tgt_hardware.h

@@ -33,8 +33,25 @@ extern "C" {
 #define EQ_HW_FIR_LIST_NUM                  3
 
 //pwl
+
+#ifdef __BT_DEBUG_TPORTS__
+#define CFG_HW_PLW_NUM (0)
+#else
+#ifdef __APP_USE_LED_INDICATE_IBRT_STATUS__
+#define CFG_HW_PLW_NUM (0)
+#else
 #define CFG_HW_PLW_NUM (2)
+#endif
+#endif
+	
 extern const struct HAL_IOMUX_PIN_FUNCTION_MAP cfg_hw_pinmux_pwl[CFG_HW_PLW_NUM];
+#ifdef __APP_USE_LED_INDICATE_IBRT_STATUS__	
+extern const struct HAL_IOMUX_PIN_FUNCTION_MAP cfg_ibrt_indication_pinmux_pwl[3];
+#endif
+
+#ifdef __KNOWLES
+extern const struct HAL_IOMUX_PIN_FUNCTION_MAP cfg_pinmux_uart[2];
+#endif
 
 //adckey define
 #define CFG_HW_ADCKEY_NUMBER 0
@@ -46,15 +63,22 @@ extern const uint16_t CFG_HW_ADCKEY_MAP_TABLE[CFG_HW_ADCKEY_NUMBER];
 
 #define BTA_AV_CO_SBC_MAX_BITPOOL  52
 
+#ifdef __BT_DEBUG_TPORTS__
+#ifdef TPORTS_KEY_COEXIST
+#define CFG_HW_GPIOKEY_NUM (2)
+#else
+#define CFG_HW_GPIOKEY_NUM (0)
+#endif
+#else
 //gpiokey define
 #ifdef IS_MULTI_AI_ENABLED
 #define CFG_HW_GPIOKEY_NUM (3)
 #elif BES_AUDIO_DEV_Main_Board_9v0
 #define CFG_HW_GPIOKEY_NUM (6)
 #else
-#define CFG_HW_GPIOKEY_NUM (3)
+#define CFG_HW_GPIOKEY_NUM (1)
+#endif
 #endif
-
 
 extern const struct HAL_KEY_GPIOKEY_CFG_T cfg_hw_gpio_key_cfg[CFG_HW_GPIOKEY_NUM];
 
@@ -73,14 +97,12 @@ extern const struct HAL_KEY_GPIOKEY_CFG_T cfg_hw_gpio_key_cfg[CFG_HW_GPIOKEY_NUM
 #endif
 
 #define ANC_FF_MIC_CH_L                     AUD_CHANNEL_MAP_CH0
-#define ANC_FF_MIC_CH_R                     0
+#define ANC_FF_MIC_CH_R                     AUD_CHANNEL_MAP_CH1
 #define ANC_FB_MIC_CH_L                     AUD_CHANNEL_MAP_CH2
-#define ANC_FB_MIC_CH_R                     0
+#define ANC_FB_MIC_CH_R                     AUD_CHANNEL_MAP_CH3
-
-#define ANC_VMIC_CFG                        (AUD_VMIC_MAP_VMIC3)
 
 // audio codec
-#define CFG_HW_AUD_INPUT_PATH_NUM           4
+#define CFG_HW_AUD_INPUT_PATH_NUM           3
 extern const struct AUD_IO_PATH_CFG_T cfg_audio_input_path_cfg[CFG_HW_AUD_INPUT_PATH_NUM];
 
 #define CFG_HW_AUD_OUTPUT_PATH_SPEAKER_DEV  (AUD_CHANNEL_MAP_CH0)
@@ -113,6 +135,12 @@ extern const struct HAL_IOMUX_PIN_FUNCTION_MAP app_battery_ext_charger_enable_cf
 extern const struct HAL_IOMUX_PIN_FUNCTION_MAP app_battery_ext_charger_detecter_cfg;
 extern const struct HAL_IOMUX_PIN_FUNCTION_MAP app_battery_ext_charger_indicator_cfg;
 
+//extern const struct HAL_IOMUX_PIN_FUNCTION_MAP TOUCH_INT;
+	
+extern bool tgt_tws_get_channel_is_right(void);
+
+extern const struct HAL_IOMUX_PIN_FUNCTION_MAP TOUCH_I2C_SDA;
+extern const struct HAL_IOMUX_PIN_FUNCTION_MAP TOUCH_I2C_SCL;
 #ifdef __cplusplus
 }
 #endif

download.sh

@@ -1,8 +1,9 @@
 #! /bin/bash
 
 num=$(ls -l /dev/ttyUSB* | rev | cut -c 1)
-#num=5
+#num=3
 echo com is:$num
+#sudo -S dldtool -c $num -f out/2300_open_source/2300_open_source.bin
 sudo -S dldtool -c $num -f out/mic_alg/mic_alg.bin
 sudo minicom port$num
 

platform/hal/best2300p/hal_iomux_best2300p.c

@@ -699,7 +699,7 @@ void hal_iomux_set_i2s1(void)
 #else
         {HAL_IOMUX_PIN_P1_4, HAL_IOMUX_FUNC_I2S1_SDI0, I2S1_VOLTAGE_SEL, HAL_IOMUX_PIN_NOPULL},
         {HAL_IOMUX_PIN_P1_5, HAL_IOMUX_FUNC_I2S1_SDO,  I2S1_VOLTAGE_SEL, HAL_IOMUX_PIN_NOPULL},
-        {HAL_IOMUX_PIN_P1_1, HAL_IOMUX_FUNC_I2S1_WS,   I2S1_VOLTAGE_SEL, HAL_IOMUX_PIN_NOPULL},
+        {HAL_IOMUX_PIN_P1_2, HAL_IOMUX_FUNC_I2S1_WS,   I2S1_VOLTAGE_SEL, HAL_IOMUX_PIN_NOPULL},
         {HAL_IOMUX_PIN_P1_0, HAL_IOMUX_FUNC_I2S1_SCK,  I2S1_VOLTAGE_SEL, HAL_IOMUX_PIN_NOPULL},
     };
 #endif

services/app_ibrt/src/app_ibrt_ui_test.cpp

@@ -612,17 +612,7 @@ void app_ibrt_ui_test_voice_assistant_key(APP_KEY_STATUS *status, void *param)
 
 const APP_KEY_HANDLE  app_ibrt_ui_test_key_cfg[] =
 {
-#if defined(__AI_VOICE__) || defined(BISTO_ENABLED)
+
-    {{APP_KEY_CODE_GOOGLE, APP_KEY_EVENT_FIRST_DOWN}, "google assistant key", app_ibrt_ui_test_voice_assistant_key, NULL},
-    {{APP_KEY_CODE_GOOGLE, APP_KEY_EVENT_UP}, "google assistant key", app_ibrt_ui_test_voice_assistant_key, NULL},
-    {{APP_KEY_CODE_GOOGLE, APP_KEY_EVENT_LONGPRESS}, "google assistant key", app_ibrt_ui_test_voice_assistant_key, NULL},
-    {{APP_KEY_CODE_GOOGLE, APP_KEY_EVENT_CLICK}, "google assistant key", app_ibrt_ui_test_voice_assistant_key, NULL},
-    {{APP_KEY_CODE_GOOGLE, APP_KEY_EVENT_DOUBLECLICK}, "google assistant key", app_ibrt_ui_test_voice_assistant_key, NULL},
-#endif
-#ifdef TILE_DATAPATH
-    {{APP_KEY_CODE_TILE,APP_KEY_EVENT_DOWN},"tile function key",app_ibrt_ui_test_key, NULL},
-    {{APP_KEY_CODE_TILE,APP_KEY_EVENT_UP},"tile function key",app_ibrt_ui_test_key, NULL},
-#endif
 #if defined( __BT_ANC_KEY__)&&defined(ANC_APP)
     {{APP_KEY_CODE_PWR,APP_KEY_EVENT_CLICK},"bt anc key",app_anc_key, NULL},
 #else
@@ -634,60 +624,6 @@ const APP_KEY_HANDLE  app_ibrt_ui_test_key_cfg[] =
     {{APP_KEY_CODE_PWR,APP_KEY_EVENT_DOUBLECLICK},"app_ibrt_ui_test_key", app_ibrt_ui_test_key, NULL},
     {{APP_KEY_CODE_PWR,APP_KEY_EVENT_TRIPLECLICK},"app_ibrt_ui_test_key", app_ibrt_ui_test_key, NULL},
     {{APP_KEY_CODE_PWR,APP_KEY_EVENT_ULTRACLICK},"app_ibrt_ui_test_key", app_ibrt_ui_test_key, NULL},
-    //{{APP_KEY_CODE_PWR,APP_KEY_EVENT_DOWN},"app_ibrt_ui_test_key", app_wakeup_sleep, NULL},
-    //{{APP_KEY_CODE_PWR,APP_KEY_EVENT_LONGPRESS},"app_ibrt_ui_test_key", app_test_key, NULL},
-    //{{APP_KEY_CODE_PWR,APP_KEY_EVENT_DOUBLECLICK},"app_ibrt_ui_test_key", app_test_key, NULL},
-   // {{APP_KEY_CODE_PWR,APP_KEY_EVENT_NONE},"app_ibrt_ui_test_key", app_test_key, NULL},
-    
-
-#if defined(CHIP_BEST1400)
-#ifdef IBRT_SEARCH_UI
-    {{APP_KEY_CODE_FN1,APP_KEY_EVENT_CLICK},"app_ibrt_ui_test_key", app_ibrt_search_ui_gpio_key_handle, NULL},
-    {{APP_KEY_CODE_FN2,APP_KEY_EVENT_CLICK},"app_ibrt_ui_test_key", app_ibrt_search_ui_gpio_key_handle, NULL},
-    {{APP_KEY_CODE_FN1,APP_KEY_EVENT_DOUBLECLICK},"app_ibrt_ui_test_key",app_ibrt_search_ui_gpio_key_handle, NULL},
-    {{APP_KEY_CODE_FN2,APP_KEY_EVENT_DOUBLECLICK},"app_ibrt_ui_test_key", app_ibrt_search_ui_gpio_key_handle, NULL},
-    {{APP_KEY_CODE_FN1,APP_KEY_EVENT_LONGPRESS},"app_ibrt_ui_test_key",app_ibrt_search_ui_gpio_key_handle, NULL},
-#endif
-#elif defined(CHIP_BEST1402)
-#ifdef IBRT_SEARCH_UI
-    {{APP_KEY_CODE_FN1,APP_KEY_EVENT_CLICK},"app_ibrt_ui_test_key", app_ibrt_search_ui_gpio_key_handle, NULL},
-    {{APP_KEY_CODE_FN2,APP_KEY_EVENT_CLICK},"app_ibrt_ui_test_key", app_ibrt_search_ui_gpio_key_handle, NULL},
-    {{APP_KEY_CODE_FN1,APP_KEY_EVENT_DOUBLECLICK},"app_ibrt_ui_test_key",app_ibrt_search_ui_gpio_key_handle, NULL},
-    {{APP_KEY_CODE_FN2,APP_KEY_EVENT_DOUBLECLICK},"app_ibrt_ui_test_key", app_ibrt_search_ui_gpio_key_handle, NULL},
-    {{APP_KEY_CODE_FN1,APP_KEY_EVENT_LONGPRESS},"app_ibrt_ui_test_key",app_ibrt_search_ui_gpio_key_handle, NULL},
-#endif
-#else
-#ifdef IBRT_SEARCH_UI
-#ifdef TPORTS_KEY_COEXIST
-    {{APP_KEY_CODE_FN1,APP_KEY_EVENT_CLICK},"app_ibrt_ui_test_key", app_ibrt_search_ui_gpio_key_handle, NULL},
-    {{APP_KEY_CODE_FN1,HAL_KEY_EVENT_LONGPRESS},"app_ibrt_ui_test_key", app_ibrt_search_ui_gpio_key_handle, NULL},
-#else
-    {{APP_KEY_CODE_FN1,APP_KEY_EVENT_CLICK},"app_ibrt_ui_test_key", app_ibrt_ui_test_key, NULL},
-    //{{APP_KEY_CODE_FN2,APP_KEY_EVENT_CLICK},"app_ibrt_ui_test_key", app_ibrt_search_ui_gpio_key_handle, NULL},
-   // {{APP_KEY_CODE_FN1,APP_KEY_EVENT_DOUBLECLICK},"app_ibrt_ui_test_key",app_ibrt_search_ui_gpio_key_handle, NULL},
-   // {{APP_KEY_CODE_FN2,APP_KEY_EVENT_DOUBLECLICK},"app_ibrt_ui_test_key", app_ibrt_search_ui_gpio_key_handle, NULL},
-    {{APP_KEY_CODE_FN1,APP_KEY_EVENT_LONGLONGPRESS},"app_ibrt_ui_test_key",app_ibrt_ui_test_key, NULL},
-
-#endif
-#else
-    {{APP_KEY_CODE_FN1,APP_KEY_EVENT_CLICK},"app_ibrt_ui_test_key", app_ibrt_ui_test_key_io_event, NULL},
-    {{APP_KEY_CODE_FN1,APP_KEY_EVENT_DOUBLECLICK},"app_ibrt_ui_test_key", app_ibrt_ui_test_key_io_event, NULL},
-    {{APP_KEY_CODE_FN2,APP_KEY_EVENT_CLICK},"app_ibrt_ui_test_key", app_ibrt_ui_test_key_io_event, NULL},
-    {{APP_KEY_CODE_FN2,APP_KEY_EVENT_DOUBLECLICK},"app_ibrt_ui_test_key", app_ibrt_ui_test_key_io_event, NULL},
-#endif
-#endif
-    {{APP_KEY_CODE_FN3,APP_KEY_EVENT_CLICK},"app_ibrt_ui_test_key", app_ibrt_ui_test_key_io_event, NULL},
-    {{APP_KEY_CODE_FN3,APP_KEY_EVENT_DOUBLECLICK},"app_ibrt_ui_test_key", app_ibrt_ui_test_key_io_event, NULL},
-    /*
-    #ifdef BES_AUDIO_DEV_Main_Board_9v0
-        {{APP_KEY_CODE_FN1,APP_KEY_EVENT_CLICK},"app_ibrt_ui_test_key", app_ibrt_key1, NULL},
-        {{APP_KEY_CODE_FN2,APP_KEY_EVENT_CLICK},"app_ibrt_ui_test_key", app_ibrt_key2, NULL},
-        {{APP_KEY_CODE_FN3,APP_KEY_EVENT_CLICK},"app_ibrt_ui_test_key", app_ibrt_key3, NULL},
-        {{APP_KEY_CODE_FN4,APP_KEY_EVENT_CLICK},"app_ibrt_ui_test_key", app_ibrt_key4, NULL},
-        {{APP_KEY_CODE_FN5,APP_KEY_EVENT_CLICK},"app_ibrt_ui_test_key", app_ibrt_key5, NULL},
-        {{APP_KEY_CODE_FN6,APP_KEY_EVENT_CLICK},"app_ibrt_ui_test_key", app_ibrt_key6, NULL},
-    #endif
-    */
 };
 
 /*