BT模式下的按键有效，并且解决数码管点亮问题

sdk_560x_01x_s2256_20241227/app/platform/bsp/bsp_bt.c

@@ -1,5 +1,9 @@
 #include "include.h"
 #include "api.h"
+#if HLW_UI
+#include "hlw_bt.h"
+#include "func_hlw.h"
+#endif // HLW_UI
 
 
 void bt_new_name_init(void);
@@ -160,6 +164,9 @@ uint bsp_bt_get_hfp_vol(uint hfp_vol)
 
 void bt_emit_notice(uint evt, u32 param)
 {
+#if HLW_UI
+    printf("%s evt %d\n", __func__, evt);
+#endif // HLW_UI
     switch(evt) {
     case BT_NOTICE_INIT_FINISH:
         print_btrf_sfr();
@@ -174,11 +181,28 @@ void bt_emit_notice(uint evt, u32 param)
 #else
         bt_connect(BT_POWER_UP_RECONNECT_TIMES);
 #endif
+#if HLW_UI
+        hlw_bt_init();
+#endif // HLW_UI
 #endif
         break;
 
+#if HLW_UI
+    case BT_NOTICE_CONNECT_START:
+        hlw_bt_start_reconnect_handle();
+        break;
+
+    case BT_NOTICE_CONNECT_FAIL:
+        hlw_bt_reconnect_fail_handle();
+        break;
+#endif // HLW_UI
+
     case BT_NOTICE_DISCONNECT:
          printf("BT_NOTICE_DISCONNECT\n");
+#if HLW_UI
+        hlw_cb.disconnect_reason = ((u8 *)param)[0];
+        hlw_bt_disconnected_handle();
+#endif // HLW_UI
 #if LED_MATRIX_HUART_TX
         huart_tx_mode(3);
 #endif
@@ -188,6 +212,9 @@ void bt_emit_notice(uint evt, u32 param)
         break;
     case BT_NOTICE_CONNECTED:
          printf("BT_NOTICE_CONNECTED\n");
+#if HLW_UI
+         hlw_bt_connected_handle();
+#endif // HLW_UI
 #if LED_MATRIX_HUART_TX
         huart_tx_mode(4);
 #endif
@@ -205,6 +232,9 @@ void bt_emit_notice(uint evt, u32 param)
 
     case BT_NOTICE_LOSTCONNECT:
         printf("BT_NOTICE_LOSTCONNECT\n");
+#if HLW_UI
+        hlw_bt_disconnect_linkloss_handle();
+#endif // HLW_UI
         break;
 
 //    case BT_NOTICE_INCOMING:

sdk_560x_01x_s2256_20241227/app/platform/bsp/bsp_key.c

@@ -227,7 +227,9 @@ static u8 get_pwrkey(void)
     if ((!xcfg_cb.user_pwrkey_en) && (!PWRKEY_2_HW_PWRON)) {
         return NO_KEY;
     }
-
+#if HLW_UI
+    //printf("key_val 0x%x\n", key_val);
+#endif // HLW_UI
     if (key_val > 0xff) {
         key_val = 0xff;
     }

sdk_560x_01x_s2256_20241227/app/platform/bsp/bsp_key.h

@@ -426,7 +426,7 @@ extern adc_cb_t adc_cb;
 
 extern const adkey_tbl_t adkey_table[];
 extern const adkey_tbl_t adkey2_table[];
-extern const adkey_tbl_t pwrkey_table[6];
+extern const adkey_tbl_t pwrkey_table[7];
 extern const u8 key_config_table[];
 
 void io_key_init(void);

sdk_560x_01x_s2256_20241227/app/platform/bsp/bsp_sys.c

@@ -401,7 +401,7 @@ void pwrkey_2_hw_pwroff_detect(void)
 #endif // PWRKEY_2_HW_PWRON
 
 
-#define DAC_FIFIO_CHECK          0   
+#define DAC_FIFIO_CHECK          0
 
 #if DAC_FIFIO_CHECK
 AT(.com_text.str_dbg)
@@ -585,6 +585,9 @@ void usr_tmr5ms_isr(void)
             f_tom.rec_time_ms += 100;
         }
 #endif
+#if HLW_UI
+        hlw_bt_disconnect_count_process();
+#endif // HLW_UI
     }
 
     //500ms timer process
@@ -874,6 +877,10 @@ static void bsp_var_init(void)
     sys_cb.lpwr_warning_times = LPWR_WARING_TIMES;
     sfunc_bt_call_flag = 0;
 
+#if HLW_UI
+    hlw_func_var_init();
+#endif // HLW_UI
+
     key_var_init();
     plugin_var_init();
 

sdk_560x_01x_s2256_20241227/app/platform/bsp/hlw_bt.c

@@ -0,0 +1,188 @@
+#include "include.h"
+#include "api.h"
+#include "hlw_bt.h"
+#include "func_hlw.h"
+
+#if HLW_UI
+
+#define HLW_BT_TRACE_EN                1
+
+#if HLW_BT_TRACE_EN
+#define TRACE(...)              printf(__VA_ARGS__)
+#define TRACE_R(...)            print_r(__VA_ARGS__)
+#else
+#define TRACE(...)
+#define TRACE_R(...)
+#endif
+
+void hlw_bt_init(void)
+{
+    if(bt_nor_get_link_info(NULL))
+    {
+        //hlw_bt_mode_set(0x02);
+    }
+    else
+    {
+        hlw_bt_mode_set(0x03);
+    }
+}
+
+/*
+param : scan status
+set bt mode,    0:不可见不可连   2:可连不可见   3：可见可连
+*/
+void hlw_bt_mode_set(u8 scan_status)
+{
+    bt_set_scan_do(scan_status);
+}
+
+
+void hlw_bt_enter_pairmode_handle(void)
+{
+    hlw_bt_mode_set(0x03);
+}
+
+void hlw_bt_start_reconnect_handle(void)
+{
+    hlw_cb.reconnect_flag = true;
+
+    if(hlw_cb.reconnect_count < 2)
+    {
+        hlw_cb.reconnect_count++;
+    }
+
+    TRACE("%s recon flag %d cnt %d\n", __func__, hlw_cb.reconnect_flag, hlw_cb.reconnect_count);
+}
+
+
+void hlw_bt_reconnect_fail_handle(void)
+{
+    if(hlw_cb.reconnect_count > 0)
+    {
+        hlw_cb.reconnect_count--;
+    }
+
+    if(hlw_cb.reconnect_count == 0)
+    {
+        hlw_cb.reconnect_flag = false;
+    }
+
+    if(!hlw_cb.reconnect_flag)
+    {
+        hlw_bt_enter_pairmode_handle();
+    }
+}
+
+
+void hlw_bt_connected_handle(void)
+{
+    if(hlw_cb.reconnect_count > 0)
+    {
+        hlw_cb.reconnect_count--;
+    }
+
+    if(hlw_cb.reconnect_count == 0)
+    {
+        hlw_cb.reconnect_flag = false;
+    }
+
+#if BT_2ACL_EN
+    if(hlw_cb.curr_connect_cnt < 2)
+    {
+        hlw_cb.curr_connect_cnt++;
+    }
+
+    if(hlw_cb.curr_connect_cnt == 2)
+    {
+        hlw_bt_mode_set(0x02);
+    }
+    else
+    {
+        hlw_bt_mode_set(0x00);
+    }
+#else
+    hlw_cb.curr_connect_cnt = 1;
+    hlw_bt_mode_set(0x00);
+#endif // BT_2ACL_EN
+    TRACE("%s con num %d\n", __func__, hlw_cb.curr_connect_cnt);
+}
+
+void hlw_bt_disconnected_handle(void)
+{
+    hlw_cb.disconnect_flag = 1;
+    hlw_cb.disconnect_count = 0;
+
+    if(hlw_cb.curr_connect_cnt > 0)
+    {
+        hlw_cb.curr_connect_cnt--;
+    }
+    TRACE("%s con num %d reson %d\n", __func__, hlw_cb.curr_connect_cnt, hlw_cb.disconnect_reason);
+}
+
+void hlw_bt_disconnect_linkloss_handle(void)
+{
+    hlw_cb.disconnect_flag = 2;
+    hlw_cb.disconnect_count = 0;
+    TRACE("%s con num %d\n", __func__, hlw_cb.curr_connect_cnt);
+}
+
+AT(.com_text.detect)
+void hlw_bt_disconnect_count_process(void)
+{
+    if(hlw_cb.disconnect_flag == 1)
+    {
+        if(++hlw_cb.disconnect_count >= 2)
+        {
+            hlw_cb.disconnect_flag = 2;
+            hlw_cb.disconnect_count = 0;
+        }
+    }
+}
+
+void hlw_bt_disconnect_process_do(void)
+{
+    hlw_cb.disconnect_flag = 0;
+
+#if BT_2ACL_EN
+    if(hlw_cb.curr_connect_cnt == 1)
+    {
+        hlw_bt_mode_set(0x02);
+    }
+    else if(hlw_cb.curr_connect_cnt == 0)
+    {
+        if(hlw_cb.disconnect_reason == 0x08)
+        {
+            hlw_bt_mode_set(0x02);
+        }
+        else
+        {
+            hlw_bt_mode_set(0x03);
+        }
+    }
+#else
+    if(hlw_cb.disconnect_reason == 0x08)
+    {
+        hlw_bt_mode_set(0x02);
+    }
+    else
+    {
+        hlw_bt_mode_set(0x03);
+    }
+#endif
+
+    hlw_cb.disconnect_reason = 0x00;
+}
+
+
+void hlw_bt_disconnect_process(void)
+{
+    if(hlw_cb.disconnect_flag != 2)
+    {
+        return;
+    }
+
+    hlw_bt_disconnect_process_do();
+}
+
+
+#endif // HLW_UI

sdk_560x_01x_s2256_20241227/app/platform/bsp/hlw_bt.h

@@ -0,0 +1,22 @@
+#ifndef _HLW_BT_H
+#define _HLW_BT_H
+
+
+
+#if HLW_UI
+void hlw_bt_init(void);
+void hlw_bt_mode_set(u8 scan_status);
+void hlw_bt_enter_pairmode_handle(void);
+void hlw_bt_start_reconnect_handle(void);
+void hlw_bt_reconnect_fail_handle(void);
+void hlw_bt_connected_handle(void);
+void hlw_bt_disconnected_handle(void);
+void hlw_bt_disconnect_count_process(void);
+void hlw_bt_disconnect_process_do(void);
+void hlw_bt_disconnect_process(void);
+void hlw_bt_disconnect_linkloss_handle(void);
+#endif // HLW_UI
+
+
+
+#endif //_HLW_BT_H

sdk_560x_01x_s2256_20241227/app/platform/functions/func_bt.c

@@ -298,6 +298,9 @@ void func_bt_disp_status(void)
     uint status = bt_get_disp_status();
 
     if(f_bt.disp_status != status) {
+#if HLW_UI
+        printf("%s bt status cur %d  old %d\n", __func__, status, f_bt.disp_status);
+#endif // HLW_UI
         f_bt.disp_status = status;
         f_bt.sta_update = 1;
         if(!bt_is_connected()) {
@@ -434,6 +437,10 @@ void func_bt_process(void)
     if(sleep_process(bt_is_sleep)) {
         f_bt.disp_status = 0xff;
     }
+
+#if HLW_UI
+    hlw_bt_disconnect_process();
+#endif // HLW_UI
 }
 
 AT(.text.func.bt)

sdk_560x_01x_s2256_20241227/app/platform/functions/func_hlw.c

@@ -0,0 +1,31 @@
+#include "include.h"
+#include "func_hlw.h"
+
+#if HLW_UI
+
+
+
+
+#define HLW_FUNC_TRACE_EN                1
+
+#if HLW_FUNC_TRACE_EN
+#define TRACE(...)              printf(__VA_ARGS__)
+#define TRACE_R(...)            print_r(__VA_ARGS__)
+#else
+#define TRACE(...)
+#define TRACE_R(...)
+#endif
+
+
+hlw_cb_t hlw_cb AT(.buf.hlw_cb);
+
+void hlw_func_var_init(void)
+{
+    hlw_cb.reconnect_flag = false;
+    hlw_cb.reconnect_count = 0;
+    hlw_cb.curr_connect_cnt = 0;
+    hlw_cb.disconnect_flag = 0;
+    hlw_cb.disconnect_count = 0;
+    hlw_cb.disconnect_reason = 0;
+}
+#endif // HLW_UI

sdk_560x_01x_s2256_20241227/app/platform/functions/func_hlw.h

@@ -0,0 +1,24 @@
+#ifndef _FUNC_HLW_H
+#define _FUNC_HLW_H
+
+#if HLW_UI
+
+typedef struct {
+    u8 reconnect_flag;
+    u8 reconnect_count;
+    u8 curr_connect_cnt;
+    u8 disconnect_flag;
+    u8 disconnect_count;
+    u8 disconnect_reason;
+}hlw_cb_t;
+
+
+extern hlw_cb_t hlw_cb;
+
+
+void hlw_func_var_init(void);
+
+#endif // HLW_UI
+
+
+#endif // _FUNC_HLW_H

sdk_560x_01x_s2256_20241227/app/platform/functions/sfunc_bt_call.c

@@ -519,6 +519,9 @@ void sfunc_bt_call(void)
         sfunc_bt_call_process();
         sfunc_bt_call_message(msg_dequeue());
         func_bt_display();
+#if HLW_UI
+        hlw_bt_disconnect_process();
+#endif // HLW_UI
     }
 
 #if DAC_DNR_EN

sdk_560x_01x_s2256_20241227/app/platform/functions/sfunc_bt_ring.c

@@ -257,6 +257,9 @@ void sfunc_bt_ring(void)
         sfunc_bt_ring_process();
         sfunc_bt_ring_message(msg_dequeue());
         func_bt_display();
+#if HLW_UI
+        hlw_bt_disconnect_process();
+#endif // HLW_UI
     }
 
     sfunc_bt_ring_exit();

sdk_560x_01x_s2256_20241227/app/projects/standard/Output/bin/Settings/Boombox.setting

@@ -2,8 +2,8 @@
 <configuration>
     <appSettings>
         <add key="lang_id" value="英文" />
-        <add key="func_music_en" value="True" />
-        <add key="func_aux_en" value="True" />
+        <add key="func_music_en" value="False" />
+        <add key="func_aux_en" value="False" />
         <add key="func_fmrx_en" value="True" />
         <add key="powkey_10s_reset" value="False" />
         <add key="spk_mute_en" value="False" />
@@ -37,7 +37,7 @@
         <add key="dacvdd_bypass_en" value="True" />
         <add key="dac_max_gain" value="0DB" />
         <add key="bt_call_max_gain" value="-1DB" />
-        <add key="charge_en" value="True" />
+        <add key="charge_en" value="False" />
         <add key="charge_trick_en" value="True" />
         <add key="charge_dc_reset" value="True" />
         <add key="charge_dc_not_pwron" value="True" />
@@ -100,7 +100,7 @@
         <add key="sddet_iosel" value="21" />
         <add key="sd1det_iosel" value="0" />
         <add key="fmrx_threshold_val" value="128" />
-        <add key="aux_2_sdadc_en" value="True" />
+        <add key="aux_2_sdadc_en" value="False" />
         <add key="linein_2_pwrdown_en" value="False" />
         <add key="mode_2_aux_en" value="False" />
         <add key="aux_anl_gain" value="2" />
@@ -109,12 +109,12 @@
         <add key="auxr_sel" value="4" />
         <add key="linein_det_iosel" value="0" />
         <add key="user_pwrkey_en" value="True" />
-        <add key="user_adkey_en" value="True" />
+        <add key="user_adkey_en" value="False" />
         <add key="user_adkey2_en" value="False" />
         <add key="user_iokey_en" value="False" />
         <add key="user_adkey_mux_sdclk_en" value="False" />
         <add key="user_key_multi_press_en" value="True" />
-        <add key="double_key_time" value="1" />
+        <add key="double_key_time" value="3" />
         <add key="adkey_ch" value="ADCCH_PE7" />
         <add key="adkey2_ch" value="ADCCH_PE6" />
         <add key="pwron_press_time" value="3" />
@@ -169,7 +169,7 @@
         <add key="iokey_num3" value="MODE" />
         <add key="iokey_num4" value="HSF" />
         <add key="iokey_midkey_num" value="REPEAT" />
-        <add key="led_disp_en" value="True" />
+        <add key="led_disp_en" value="False" />
         <add key="led_pwr_en" value="False" />
         <add key="rled_lowbat_en" value="False" />
         <add key="port_2led_resless_en" value="False" />