From: p15692025051 <846603105@qq.com>
Date: Mon, 21 Jul 2025 02:55:17 +0000 (+0800)
Subject: Merge branch 'master' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/7PIN_V1_5... 
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=f4188edc299b082ef139e6bf981d50fceff35df7;p=mirrors%2F7PIN_V1_5_Jl_SDK.git

Merge branch 'master' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/7PIN_V1_5_Jl_SDK

# Conflicts:
#	2.code/1.sdk/apps/watch/board/br28/board_7014f5_demo/board_7014f5_demo_cfg.h
#	2.code/1.sdk/apps/watch/common/task_table.c
#	2.code/1.sdk/cpu/br28/audio_config.h
---

f4188edc299b082ef139e6bf981d50fceff35df7
diff --cc 2.code/1.sdk/.vscode/settings.json
index 7bb9027,7bb9027..0b49315
--- a/2.code/1.sdk/.vscode/settings.json
+++ b/2.code/1.sdk/.vscode/settings.json
@@@ -32,6 -32,6 +32,15 @@@
          "user_cfg.h": "c",
          "audio_user_custom_adc.h": "c",
          "avctp_user.h": "c",
--        "audio_pitch.h": "c"
++        "audio_pitch.h": "c",
++        "uos_iis.h": "c",
++        "audio_dec.h": "c",
++        "circular_buf.h": "c",
++        "audio_decoder.h": "c",
++        "log.h": "c",
++        "pcm_decoder.h": "c",
++        "uos_type.h": "c",
++        "debug.h": "c",
++        "uos_vendor_cfg.h": "c"
      }
  }
diff --cc 2.code/1.sdk/apps/watch/board/br28/board_7014f5_demo/board_7014f5_demo_cfg.h
index 2ead4b3,10479b5..6df3b42
--- a/2.code/1.sdk/apps/watch/board/br28/board_7014f5_demo/board_7014f5_demo_cfg.h
+++ b/2.code/1.sdk/apps/watch/board/br28/board_7014f5_demo/board_7014f5_demo_cfg.h
@@@ -310,7 -309,7 +309,7 @@@
      AD_CH_PB6    AD_CH_PB7    AD_CH_DP     AD_CH_DM
      AD_CH_PB2
  */
--#define TCFG_ADKEY_AD_CHANNEL               AD_CH_PB1
++#define TCFG_ADKEY_AD_CHANNEL               AD_CH_DM
  #define TCFG_ADKEY_EXTERN_UP_ENABLE         ENABLE_THIS_MOUDLE //是否使用外部上拉
  
  #if TCFG_ADKEY_EXTERN_UP_ENABLE
diff --cc 2.code/1.sdk/apps/watch/common/task_table.c
index 3d5fc16,62535df..b442a2f
--- a/2.code/1.sdk/apps/watch/common/task_table.c
+++ b/2.code/1.sdk/apps/watch/common/task_table.c
@@@ -124,7 -124,7 +124,7 @@@ const struct task_info task_info_table[
      {"user_mic_record",             3,     0,   256  ,128 },
      {"user_mic_record_play",             2,     0,   512,256 },
      {"user_ble_protocol",             3,     0,   1024, 256 },
-     {"BK_audio_task",     2,     1,   16*1024,   32 },
 -    {"periph_demo",                   2,    0,  512,    256},
++    {"BK_audio_task",     2,     1,   1024,   32 },
      {0, 0},
  };