Kaotings/KT25-1015_AC695x_SDK310
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改能量mute

Browse Source
This commit is contained in:
FlyM 2026-03-23 14:20:03 +08:00
parent 1a0d74bdfe
commit bcdf1af495
16 changed files with 33423 additions and 33272 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
apps/kaotings/kt.c
View File

@ -1,5 +1,14 @@
#include "kt.h"
#include "app_task.h"
#include "avctp_user.h"
extern void kt_auto_mute_pa_init(void);
static u16 led_timer_id = 0;
static int led_cnt = 0;
/* static int mute_test = 0;
static u8 mute_test_flag = 0; */
void kt_boot_init(void)
{
@ -7,6 +16,7 @@ void kt_boot_init(void)
gpio_set_pull_up(KT_CFG_MUTE_PIN, 0);
gpio_set_pull_down(KT_CFG_MUTE_PIN, 0);
gpio_set_direction(KT_CFG_MUTE_PIN, 0);
gpio_set_output_value(KT_CFG_MUTE_PIN, 0);
PA_MUTE();
// b led pin
gpio_set_pull_up(KT_CFG_B_LED_PIN, 0);
@ -29,22 +39,101 @@ void kt_eq_switch_to(u8 eq_idx)
{
if (eq_idx == KT_EQ_IDX_LP)
{
//LP EQ
//strcpy(EFF_CFG_FILE_NAME, EQ_FILE_BT);
// LP EQ
// strcpy(EFF_CFG_FILE_NAME, EQ_FILE_BT);
printf("kt_eq_switch_to: LP\n");
eff_file_switch(EQ_FILE_LP);
}
else
{
//BT EQ
//strcpy(EFF_CFG_FILE_NAME, EQ_FILE_BT);
// BT EQ
// strcpy(EFF_CFG_FILE_NAME, EQ_FILE_BT);
printf("kt_eq_switch_to: BT\n");
eff_file_switch(EQ_FILE_BT);
}
}
static void led_timer_callback(void *priv)
{
/* mute_test++;
if (mute_test > 100)
{
mute_test = 0;
if (mute_test_flag)
{
PA_MUTE();
mute_test_flag = 0;
}
else
{
PA_UNMUTE();
mute_test_flag = 1;
}
} */
if (app_get_curr_task() == APP_BT_TASK)
{
KT_CFG_R_LED_OFF();
if (get_bt_connect_status() >= BT_STATUS_CONNECTING)
{
KT_CFG_B_LED_ON();
}
else
{
led_cnt++;
if (led_cnt < 4)
{
KT_CFG_B_LED_ON();
}
else if (led_cnt < 8)
{
KT_CFG_B_LED_OFF();
}
else
{
led_cnt = 0;
}
}
}
else if (app_get_curr_task() == APP_MUSIC_TASK)
{
KT_CFG_R_LED_OFF();
led_cnt++;
if (led_cnt < 10)
{
KT_CFG_B_LED_ON();
}
else if (led_cnt < 20)
{
KT_CFG_B_LED_OFF();
}
else
{
led_cnt = 0;
}
}
else
{
KT_CFG_R_LED_ON();
KT_CFG_B_LED_OFF();
}
}
static void start_led_timer(void)
{
if (led_timer_id)
{
sys_timer_del(led_timer_id);
led_timer_id = 0;
}
sys_timer_add(NULL, led_timer_callback, 50);
}
void kt_init(void)
{
printf("kt_init\n");
kt_auto_mute_pa_init();
start_led_timer();
//gpio_set_output_value(KT_CFG_MUTE_PIN, 1);
}

17
apps/kaotings/kt.h
View File

@ -18,8 +18,11 @@
#define KT_CFG_R_LED_OFF() gpio_set_output_value(KT_CFG_R_LED_PIN, 0)
#define KT_CFG_MUTE_PIN IO_PORTB_00
#define PA_MUTE() gpio_set_output_value(KT_CFG_MUTE_PIN, 0)
#define PA_UNMUTE() gpio_set_output_value(KT_CFG_MUTE_PIN, 1)
#define PA_MUTE() do { printf("[<"); gpio_set_output_value(KT_CFG_MUTE_PIN, 0); } while(0)
#define PA_UNMUTE() do { printf(">]"); gpio_set_output_value(KT_CFG_MUTE_PIN, 1); } while(0)
//#define PA_MUTE()
//#define PA_UNMUTE()
//#define KT_CFG_AUX_IDX_LINEIN 0
//#define KT_CFG_AUX_IDX_LP 1
@ -37,6 +40,16 @@
#define KT_EQ_IDX_LP 3
//#define KT_EQ_IDX_NORMAL 4
typedef struct __PA_MUTE_VAR {
u8 mute_flag;
u8 unmute_flag;
u16 mute_cnt;
u16 unmute_cnt;
u16 pa_mute_tid;
} PA_MUTE_VAR;
void kt_eq_switch_to(u8 eq_idx);
void kt_boot_init(void);

10
apps/soundbox/task_manager/app_task_switch.c
View File

@ -7,12 +7,18 @@
///模式配置表，这里可以配置切换模式的顺序，方案根据需求定义
static const u8 app_task_list[] = {
#if TCFG_APP_BT_EN
APP_BT_TASK,
#if TCFG_APP_MUSIC_EN
APP_MUSIC_TASK,
#endif
#if TCFG_APP_LP_EN
APP_LP_TASK,
#endif
#if TCFG_APP_MUSIC_EN
APP_MUSIC_TASK,
#endif
#if TCFG_APP_BT_EN
APP_BT_TASK,
#endif
#if TCFG_APP_FM_EN
APP_FM_TASK,
#endif

57
apps/soundbox/task_manager/bt/bt.c
View File

@ -1151,43 +1151,6 @@ static void bt_tone_play_end_callback(void *priv, int flag)
}
}
static u16 tim_id = 0;
static u8 b_led_flag = 0;
static void bt_timer_callback(void *priv)
{
if (get_bt_connect_status() >= BT_STATUS_CONNECTING)
{
sys_timer_del(tim_id);
tim_id = 0;
KT_CFG_B_LED_ON();
b_led_flag = 1;
}
else
{
if (b_led_flag)
{
KT_CFG_B_LED_OFF();
b_led_flag = 0;
}
else
{
KT_CFG_B_LED_ON();
b_led_flag = 1;
}
}
}
static void start_bt_timer(void)
{
if (tim_id)
{
sys_timer_del(tim_id);
tim_id = 0;
}
tim_id = sys_timer_add(NULL, bt_timer_callback, 300);
}
/*----------------------------------------------------------------------------*/
/**@brief 蓝牙模式
@param
@ -1200,12 +1163,8 @@ void app_bt_task()
int res;
int msg[32];
ui_update_status(STATUS_EXIT_LOWPOWER);
KT_CFG_R_LED_OFF();
KT_CFG_B_LED_ON();
b_led_flag = 1;
start_bt_timer();
bt_task_init(); // 初始化变量、时钟、显示(未进行协议栈初始化)
@ -1278,7 +1237,7 @@ void app_bt_task()
#endif
if (app_task_exitting())
{
{
if (__this->init_start)
{
bt_task_close();
@ -1289,17 +1248,7 @@ void app_bt_task()
bt_task_close();
return;
}
if (tim_id)
{
sys_timer_del(tim_id);
tim_id = 0;
KT_CFG_B_LED_OFF();
b_led_flag = 0;
}
KT_CFG_R_LED_OFF();
KT_CFG_B_LED_OFF();
b_led_flag = 0;
}
if (__this->wait_exit)

6
apps/soundbox/task_manager/linein/linein.c
View File

@ -304,10 +304,6 @@ void app_linein_task()
int res;
int err = 0;
int msg[32];
KT_CFG_R_LED_ON();
KT_CFG_B_LED_ON();
#if TCFG_APP_BT_EN
linein_bt_back_flag = get_bt_back_flag(); // 从蓝牙后台返回标志
set_bt_back_flag(0);
@ -360,8 +356,6 @@ void app_linein_task()
if (app_task_exitting())
{
linein_task_close();
KT_CFG_R_LED_OFF();
KT_CFG_B_LED_OFF();
return;
}
}

15
apps/soundbox/task_manager/lp/lp.c
View File

@ -287,7 +287,15 @@ static int lp_sys_event_handler(struct sys_event *event)
else if (event->u.dev.event == DEVICE_EVENT_OUT)
{
log_info("lp offline \n");
app_task_switch_next();
if (music_app_check())
{
app_task_switch_to(APP_MUSIC_TASK);
}
else
{
app_task_switch_next();
}
}
return true;
}
@ -328,9 +336,6 @@ void app_lp_task()
int err = 0;
int msg[32];
KT_CFG_R_LED_ON();
KT_CFG_B_LED_OFF();
#if TCFG_APP_BT_EN
lp_bt_back_flag = get_bt_back_flag(); // 从蓝牙后台返回标志
set_bt_back_flag(0);
@ -384,8 +389,6 @@ void app_lp_task()
if (app_task_exitting())
{
lp_task_close();
KT_CFG_R_LED_OFF();
KT_CFG_B_LED_OFF();
return;
}
}

635
apps/soundbox/task_manager/music/music.c
View File

File diff suppressed because it is too large Load Diff

113
cpu/br23/audio_dec/audio_dec.c
View File

@ -1045,32 +1045,104 @@ REGISTER_LP_TARGET(audio_dec_init_lp_target) = {
#if AUDIO_OUTPUT_AUTOMUTE
#include "kt.h"
#include "app_task.h"
static u8 bt_mute_flag = 0;
PA_MUTE_VAR pa_mute_var = {0};
static void pa_mute_timer_callback(void *priv)
{
// 10ms timer
if (pa_mute_var.mute_flag)
{
printf(">>> 1.\n");
pa_mute_var.mute_cnt++;
if (pa_mute_var.mute_cnt > 50)
{
printf(">>> 11\n");
pa_mute_var.mute_cnt = 0;
pa_mute_var.mute_flag = 0;
PA_MUTE();
}
}
if (pa_mute_var.unmute_flag)
{
printf(">>> 2.\n");
pa_mute_var.unmute_cnt++;
if (pa_mute_var.unmute_cnt > 2)
{
printf(">>> 22\n");
pa_mute_var.unmute_cnt = 0;
pa_mute_var.unmute_flag = 0;
PA_UNMUTE();
}
}
}
void kt_auto_mute_pa_init(void)
{
memset(&pa_mute_var, 0, sizeof(PA_MUTE_VAR));
if (pa_mute_var.pa_mute_tid)
{
sys_timer_del(pa_mute_var.pa_mute_tid);
pa_mute_var.pa_mute_tid = 0;
}
pa_mute_var.pa_mute_tid = sys_timer_add(NULL, pa_mute_timer_callback, 10);
}
void audio_mix_out_automute_mute(u8 mute)
{
printf(">>>>>>>>>>>>>>>>>>>> %s\n", mute ? ("MUTE") : ("UNMUTE"));
//printf(">>> %s\n", mute ? ("MUTE") : ("UNMUTE"));
if (mute)
{
printf(">>> mute.\n");
if (app_get_curr_task() == APP_LP_TASK)
{
printf(">>> mute1\n");
PA_MUTE();
pa_mute_var.mute_flag = 0;
pa_mute_var.unmute_flag = 0;
pa_mute_var.mute_cnt = 0;
pa_mute_var.unmute_cnt = 0;
}
else
{
printf(">>> mute2\n");
//pa_mute_var.mute_cnt = 0;
//pa_mute_var.mute_flag = 1;
}
}
else
{
printf(">>> unmute.\n");
pa_mute_var.mute_cnt = 0;
pa_mute_var.mute_flag = 0;
pa_mute_var.unmute_cnt = 0;
pa_mute_var.unmute_flag = 1;
}
#if 0
if (mute)
{
if (app_get_curr_task() == APP_LP_TASK)
{
PA_MUTE();
//PA_MUTE();
}
else
{
bt_mute_flag++;
if (bt_mute_flag > 10)
{
PA_MUTE();
//PA_MUTE();
}
}
//PA_MUTE();
}
else
{
PA_UNMUTE();
//PA_UNMUTE();
bt_mute_flag = 0;
}
#endif
}
/* #define AUDIO_E_DET_UNMUTE (0x00) */
@ -1115,24 +1187,23 @@ void mix_out_automute_open()
e_det_param.unmute_time_ms = 50;
e_det_param.count_cycle_ms = 10;
#else
/* 黑胶空白处喀拉声：提高 mute_energy 使表面噪声被判定为静音并 mute 掉 */
/*
e_det_param.mute_energy = 150;
e_det_param.unmute_energy = 210;
e_det_param.mute_time_ms = 30;
e_det_param.unmute_time_ms = 20;
e_det_param.count_cycle_ms = 5;
*/
e_det_param.mute_energy = 240;
/* 混音输出自动静音：能量检测，低能量时 mute 以减少底噪/杂音（如黑胶空白处喀拉声） */
e_det_param.mute_energy = 120; /* 能量阈值：低于此值视为“静音”，配合 mute_time_ms 达成后触发 mute */
e_det_param.unmute_energy = 180; /* 能量阈值：高于此值视为“有声音”，配合 unmute_time_ms 达成后解除 mute */
e_det_param.mute_time_ms = 150; /* 静音判定时长(ms)：持续低能量超过此时间后才执行 mute，避免误判 */
e_det_param.unmute_time_ms = 15; /* 解除静音时长(ms)：持续高能量超过此时间后才 unmute，喀拉声随机短促宜设小 */
e_det_param.count_cycle_ms = 5; /* 检测周期(ms)：每 5ms 采样一次能量，周期越短响应越快、耗 CPU 略增 */
/* e_det_param.mute_energy = 240;
e_det_param.unmute_energy = 300;
e_det_param.mute_time_ms = 40;
e_det_param.unmute_time_ms = 25;
e_det_param.count_cycle_ms = 5;
/*e_det_param.mute_energy = 180;
e_det_param.unmute_energy = 240;
e_det_param.mute_time_ms = 30;
e_det_param.unmute_time_ms = 80; // 需连续 80ms 高能量才 unmute，滤掉随机喀拉
e_det_param.count_cycle_ms = 5;*/
/*e_det_param.mute_energy = 180;
e_det_param.unmute_energy = 240;
e_det_param.mute_time_ms = 30;
e_det_param.unmute_time_ms = 80; // 需连续 80ms 高能量才 unmute，滤掉随机喀拉
e_det_param.count_cycle_ms = 5;*/
#endif
e_det_param.sample_rate = 44100;
e_det_param.event_handler = mix_out_automute_handler;

BIN
cpu/br23/tools/app.bin
View File

Binary file not shown.

BIN
cpu/br23/tools/download/standard/app.bin
View File

Binary file not shown.

BIN
cpu/br23/tools/download/standard/jl_isd.bin
View File

Binary file not shown.

BIN
cpu/br23/tools/download/standard/jl_isd.fw
View File

Binary file not shown.

BIN
cpu/br23/tools/download/standard/nor_update.ufw
View File

Binary file not shown.

BIN
cpu/br23/tools/download/standard/update.ufw
View File

Binary file not shown.

16
cpu/br23/tools/sdk.elf.resolution.txt
View File

@ -2904,9 +2904,14 @@ objs/apps/kaotings/kt.c.o
-r=objs/apps/kaotings/kt.c.o,gpio_set_pull_down,l
-r=objs/apps/kaotings/kt.c.o,gpio_set_direction,l
-r=objs/apps/kaotings/kt.c.o,gpio_set_output_value,l
-r=objs/apps/kaotings/kt.c.o,printf,l
-r=objs/apps/kaotings/kt.c.o,kt_eq_switch_to,pl
-r=objs/apps/kaotings/kt.c.o,eff_file_switch,l
-r=objs/apps/kaotings/kt.c.o,kt_init,pl
-r=objs/apps/kaotings/kt.c.o,kt_auto_mute_pa_init,l
-r=objs/apps/kaotings/kt.c.o,sys_timer_add,l
-r=objs/apps/kaotings/kt.c.o,app_get_curr_task,l
-r=objs/apps/kaotings/kt.c.o,get_bt_connect_status,l
-r=objs/apps/kaotings/kt.c.o,puts,l
objs/apps/soundbox/task_manager/app_common.c.o
-r=objs/apps/soundbox/task_manager/app_common.c.o,app_common_key_msg_deal,pl
@ -3015,7 +3020,6 @@ objs/apps/soundbox/task_manager/bt/bt.c.o
-r=objs/apps/soundbox/task_manager/bt/bt.c.o,app_task_switch_next,l
-r=objs/apps/soundbox/task_manager/bt/bt.c.o,app_bt_task,pl
-r=objs/apps/soundbox/task_manager/bt/bt.c.o,ui_update_status,l
-r=objs/apps/soundbox/task_manager/bt/bt.c.o,gpio_set_output_value,l
-r=objs/apps/soundbox/task_manager/bt/bt.c.o,bt_task_init,l
-r=objs/apps/soundbox/task_manager/bt/bt.c.o,get_tws_background_connected_flag,l
-r=objs/apps/soundbox/task_manager/bt/bt.c.o,bt_task_start,l
@ -3023,7 +3027,6 @@ objs/apps/soundbox/task_manager/bt/bt.c.o
-r=objs/apps/soundbox/task_manager/bt/bt.c.o,app_default_event_deal,l
-r=objs/apps/soundbox/task_manager/bt/bt.c.o,app_task_exitting,l
-r=objs/apps/soundbox/task_manager/bt/bt.c.o,bt_task_close,l
-r=objs/apps/soundbox/task_manager/bt/bt.c.o,sys_timer_del,l
-r=objs/apps/soundbox/task_manager/bt/bt.c.o,bt_app_exit_check,pl
-r=objs/apps/soundbox/task_manager/bt/bt.c.o,bt_app_switch_exit_check,l
-r=objs/apps/soundbox/task_manager/bt/bt.c.o,bt_status_event_filter,l
@ -3059,8 +3062,6 @@ objs/apps/soundbox/task_manager/bt/bt.c.o
-r=objs/apps/soundbox/task_manager/bt/bt.c.o,bt_hci_event_page_timeout,l
-r=objs/apps/soundbox/task_manager/bt/bt.c.o,bt_hci_event_connection_timeout,l
-r=objs/apps/soundbox/task_manager/bt/bt.c.o,bt_hci_event_connection_exist,l
-r=objs/apps/soundbox/task_manager/bt/bt.c.o,sys_timer_add,l
-r=objs/apps/soundbox/task_manager/bt/bt.c.o,get_bt_connect_status,l
-r=objs/apps/soundbox/task_manager/bt/bt.c.o,app_protocol_sys_event_handler,l
-r=objs/apps/soundbox/task_manager/bt/bt.c.o,puts,l
-r=objs/apps/soundbox/task_manager/bt/bt.c.o,app_bt_hdl,pl
@ -3381,7 +3382,6 @@ objs/apps/soundbox/task_manager/linein/linein.c.o
-r=objs/apps/soundbox/task_manager/linein/linein.c.o,linein_app_check,pl
-r=objs/apps/soundbox/task_manager/linein/linein.c.o,linein_is_online,l
-r=objs/apps/soundbox/task_manager/linein/linein.c.o,app_linein_task,pl
-r=objs/apps/soundbox/task_manager/linein/linein.c.o,gpio_set_output_value,l
-r=objs/apps/soundbox/task_manager/linein/linein.c.o,get_bt_back_flag,l
-r=objs/apps/soundbox/task_manager/linein/linein.c.o,set_bt_back_flag,l
-r=objs/apps/soundbox/task_manager/linein/linein.c.o,kt_eq_switch_to,l
@ -3449,7 +3449,6 @@ objs/apps/soundbox/task_manager/lp/lp.c.o
-r=objs/apps/soundbox/task_manager/lp/lp.c.o,lp_app_check,pl
-r=objs/apps/soundbox/task_manager/lp/lp.c.o,lp_is_online,l
-r=objs/apps/soundbox/task_manager/lp/lp.c.o,app_lp_task,pl
-r=objs/apps/soundbox/task_manager/lp/lp.c.o,gpio_set_output_value,l
-r=objs/apps/soundbox/task_manager/lp/lp.c.o,get_bt_back_flag,l
-r=objs/apps/soundbox/task_manager/lp/lp.c.o,set_bt_back_flag,l
-r=objs/apps/soundbox/task_manager/lp/lp.c.o,log_print,l
@ -3460,6 +3459,8 @@ objs/apps/soundbox/task_manager/lp/lp.c.o
-r=objs/apps/soundbox/task_manager/lp/lp.c.o,app_task_exitting,l
-r=objs/apps/soundbox/task_manager/lp/lp.c.o,sys_key_event_enable,l
-r=objs/apps/soundbox/task_manager/lp/lp.c.o,clock_idle,l
-r=objs/apps/soundbox/task_manager/lp/lp.c.o,music_app_check,l
-r=objs/apps/soundbox/task_manager/lp/lp.c.o,app_task_switch_to,l
-r=objs/apps/soundbox/task_manager/lp/lp.c.o,app_task_switch_next,l
-r=objs/apps/soundbox/task_manager/lp/lp.c.o,lp_start,l
-r=objs/apps/soundbox/task_manager/lp/lp.c.o,lp_volume_pp,l
@ -3988,6 +3989,8 @@ objs/cpu/br23/audio_dec/audio_dec.c.o
-r=objs/cpu/br23/audio_dec/audio_dec.c.o,audio_mixer_stream_resume,l
-r=objs/cpu/br23/audio_dec/audio_dec.c.o,audio_stream_add_list,l
-r=objs/cpu/br23/audio_dec/audio_dec.c.o,app_audio_volume_init,l
-r=objs/cpu/br23/audio_dec/audio_dec.c.o,kt_auto_mute_pa_init,pl
-r=objs/cpu/br23/audio_dec/audio_dec.c.o,sys_timer_add,l
-r=objs/cpu/br23/audio_dec/audio_dec.c.o,audio_mix_out_automute_mute,pl
-r=objs/cpu/br23/audio_dec/audio_dec.c.o,app_get_curr_task,l
-r=objs/cpu/br23/audio_dec/audio_dec.c.o,gpio_set_output_value,l
@ -4023,6 +4026,7 @@ objs/cpu/br23/audio_dec/audio_dec.c.o
-r=objs/cpu/br23/audio_dec/audio_dec.c.o,mix_buff,pl
-r=objs/cpu/br23/audio_dec/audio_dec.c.o,audio_phase_inver_hdl,pl
-r=objs/cpu/br23/audio_dec/audio_dec.c.o,audio_dec_init_lp_target,pl
-r=objs/cpu/br23/audio_dec/audio_dec.c.o,pa_mute_var,pl
-r=objs/cpu/br23/audio_dec/audio_dec.c.o,dac_sync_buff,pl
objs/cpu/br23/audio_dec/audio_dec_bt.c.o
-r=objs/cpu/br23/audio_dec/audio_dec_bt.c.o,a2dp_rx_notice_to_decode,pl

65729
cpu/br23/tools/symbol_tbl.txt
View File

File diff suppressed because it is too large Load Diff