解决时钟的操作和添加三击play进入DUT模式

sdk_560x_01x_s2256_20241227/app/platform/functions/func.c

@@ -168,11 +168,20 @@ void func_process(void)
 AT(.text.func.msg)
 void func_message(u16 msg)
 {
+#if HLW_UI
+    if(msg != 0)
+    {
+        printf("msg 0x%x\n", msg);
+    }
+#endif // HLW_UI
+
     switch (msg) {
         case KL_NEXT_VOL_UP:
         case KH_NEXT_VOL_UP:
+#if !HLW_UI
         case KL_VOL_UP:
         case KH_VOL_UP:
+#endif // HLW_UI
             sys_cb.maxvol_fade = 1;
         case KU_VOL_UP_NEXT:
         case KU_VOL_UP:
@@ -213,8 +222,10 @@ void func_message(u16 msg)
         case KH_PREV_VOL_DOWN:
         case KU_VOL_DOWN_PREV:
         case KU_VOL_DOWN:
+#if !HLW_UI
         case KL_VOL_DOWN:
         case KH_VOL_DOWN:
+#endif // HLW_UI
             if(bsp_bt_hid_vol_change(HID_KEY_VOL_DOWN)){
                 printf("HID vol down\n");
             }else{

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

@@ -14,7 +14,7 @@
         <add key="ampabd_io_sel" value="0" />
         <add key="earphone_det_iosel" value="0" />
         <add key="sys_sleep_time" value="0" />
-        <add key="sys_off_time" value="0" />
+        <add key="sys_off_time" value="300" />
         <add key="lowpower_warning_en" value="True" />
         <add key="lpwr_warning_vbat" value="3.4V" />
         <add key="lpwr_off_vbat" value="3.1V" />
@@ -25,7 +25,7 @@
         <add key="osc_both_cap" value="0PF" />
         <add key="osci_cap" value="31" />
         <add key="osco_cap" value="31" />
-        <add key="eq_dgb_spp_en" value="False" />
+        <add key="eq_dgb_spp_en" value="True" />
         <add key="eq_dgb_uart_en" value="False" />
         <add key="eq_uart_sel" value="0" />
         <add key="vddbt_capless_en" value="True" />
@@ -45,8 +45,8 @@
         <add key="charge_constant_curr" value="12" />
         <add key="charge_trickle_curr" value="2" />
         <add key="charge_full_bled" value="3" />
-        <add key="bt_name" value="BT-BOX_560X" />
-        <add key="bt_addr_mode" value="随机地址" />
+        <add key="bt_name" value="ikF-FM听力蓝牙耳机" />
+        <add key="bt_addr_mode" value="保持地址" />
         <add key="bt_addr" value="41:42:00:00:00:01" />
         <add key="bt_addr_start" value="41:42:00:00:00:00" />
         <add key="bt_addr_step" value="00:00:00:00:00:01" />
@@ -58,14 +58,14 @@
         <add key="rf_mix_cap" value="8" />
         <add key="rf_pa_nbias" value="4" />
         <add key="bt_rf_txpwr_recon" value="0" />
-        <add key="bt_2acl_en" value="False" />
+        <add key="bt_2acl_en" value="True" />
         <add key="bt_a2dp_en" value="True" />
         <add key="bt_a2dp_vol_ctrl_en" value="True" />
         <add key="bt_sco_en" value="True" />
         <add key="bt_hfp_private_en" value="False" />
-        <add key="bt_hfp_ring_number_en" value="True" />
-        <add key="bt_hfp_play_ios_ring_en" value="False" />
-        <add key="bt_spp_en" value="False" />
+        <add key="bt_hfp_ring_number_en" value="False" />
+        <add key="bt_hfp_play_ios_ring_en" value="True" />
+        <add key="bt_spp_en" value="True" />
         <add key="bt_hid_en" value="False" />
         <add key="bt_hid_menu_en" value="True" />
         <add key="bt_hid_discon_default_en" value="False" />
@@ -237,6 +237,6 @@
         <add key="fmrx_d_val" value="3000" />
         <add key="fmrx_cs_filter_fixed" value="True" />
         <add key="fmrx_cs_filter_sel" value="1" />
-        <add key="fmrx_audio_ch" value="0" />
+        <add key="fmrx_audio_ch" value="1" />
     </appSettings>
 </configuration>

sdk_560x_01x_s2256_20241227/app/projects/standard/app.depend

@@ -902,7 +902,7 @@
 
 1725420956 d:\bluetrum\project\y_yinwo\td009\code\20250418\sdk_560x_01x_s2256_20241227\app\projects\standard\xcfg.h
 
-1745218024 d:\bluetrum\project\y_yinwo\td009\code\20250418\sdk_560x_01x_s2256_20241227\app\projects\standard\config.h
+1745227909 d:\bluetrum\project\y_yinwo\td009\code\20250418\sdk_560x_01x_s2256_20241227\app\projects\standard\config.h
 	"config_define.h"
 	"config_extra.h"
 
@@ -1342,7 +1342,7 @@
 1724765767 source:d:\bluetrum\project\y_yinwo\td009\code\20250418\sdk_560x_01x_s2256_20241227\app\platform\bsp\bsp_uart.c
 	"include.h"
 
-1732194636 source:d:\bluetrum\project\y_yinwo\td009\code\20250418\sdk_560x_01x_s2256_20241227\app\platform\functions\func.c
+1745222860 source:d:\bluetrum\project\y_yinwo\td009\code\20250418\sdk_560x_01x_s2256_20241227\app\platform\functions\func.c
 	"include.h"
 
 1732083165 source:d:\bluetrum\project\y_yinwo\td009\code\20250418\sdk_560x_01x_s2256_20241227\app\platform\functions\func_aux.c
@@ -1537,7 +1537,7 @@
 	"include.h"
 	"func.h"
 
-1617675127 source:d:\bluetrum\project\y_yinwo\td009\code\20250418\sdk_560x_01x_s2256_20241227\app\projects\standard\display\display_bt.c
+1745227770 source:d:\bluetrum\project\y_yinwo\td009\code\20250418\sdk_560x_01x_s2256_20241227\app\projects\standard\display\display_bt.c
 	"include.h"
 	"func.h"
 	"func_bt.h"
@@ -1587,7 +1587,7 @@
 	"func.h"
 	"func_usbdev.h"
 
-1745220159 source:d:\bluetrum\project\y_yinwo\td009\code\20250418\sdk_560x_01x_s2256_20241227\app\projects\standard\display\ledseg\display_ledseg.c
+1745227889 source:d:\bluetrum\project\y_yinwo\td009\code\20250418\sdk_560x_01x_s2256_20241227\app\projects\standard\display\ledseg\display_ledseg.c
 	"include.h"
 	"ledseg/display_ledseg.h"
 
@@ -1599,12 +1599,12 @@
 	"func.h"
 	"bsp_karaok.h"
 
-1745056007 source:d:\bluetrum\project\y_yinwo\td009\code\20250418\sdk_560x_01x_s2256_20241227\app\projects\standard\message\msg_bt.c
+1745227645 source:d:\bluetrum\project\y_yinwo\td009\code\20250418\sdk_560x_01x_s2256_20241227\app\projects\standard\message\msg_bt.c
 	"include.h"
 	"func.h"
 	"func_bt.h"
 
-1710210864 source:d:\bluetrum\project\y_yinwo\td009\code\20250418\sdk_560x_01x_s2256_20241227\app\projects\standard\message\msg_clock.c
+1745225891 source:d:\bluetrum\project\y_yinwo\td009\code\20250418\sdk_560x_01x_s2256_20241227\app\projects\standard\message\msg_clock.c
 	"include.h"
 	"func.h"
 	"func_clock.h"
@@ -1615,7 +1615,7 @@
 	"func_music.h"
 	"func_exspiflash_music.h"
 
-1619342318 source:d:\bluetrum\project\y_yinwo\td009\code\20250418\sdk_560x_01x_s2256_20241227\app\projects\standard\message\msg_fmrx.c
+1745223836 source:d:\bluetrum\project\y_yinwo\td009\code\20250418\sdk_560x_01x_s2256_20241227\app\projects\standard\message\msg_fmrx.c
 	"include.h"
 	"func.h"
 	"func_fmrx.h"

sdk_560x_01x_s2256_20241227/app/projects/standard/config.h

@@ -16,7 +16,7 @@
 #define FUNC_FMRX_EN                    1   //是否打开FM功能
 #define FUNC_BT_EN                      1   //是否打开蓝牙功能
 #define FUNC_BTHID_EN                   0   //是否打开独立自拍器模式
-#define FUNC_BT_DUT_EN                  0   //是否打开蓝牙的独立DUT测试模式
+#define FUNC_BT_DUT_EN                  1   //是否打开蓝牙的独立DUT测试模式
 #define FUNC_BT_FCC_EN                  0   //是否打开蓝牙的独立FCC测试模式
 #define FUNC_AUX_EN                     0   //是否打开AUX功能
 #define FUNC_USBDEV_EN                  0   //是否打开USB DEVICE功能
@@ -39,7 +39,7 @@
 #define EXT_32K_EN                      0                       //是否使用外部32.768K晶振,否则内部32K OSC。
 #define PWR_RC_32K_EN                   0                       //软关机时RTC是否省晶振，使用RC 32K
 #define SYS_ADJ_DIGVOL_EN               0                       //系统是否调数字音量
-#define GUI_SELECT                      GUI_LEDSEG_7P7S //GUI_LEDSEG_7P7S//GUI_NO//GUI_LEDSEG_7P7S         //GUI Display Select
+#define GUI_SELECT                      GUI_LEDSEG_7P7S//GUI_NO//GUI_LEDSEG_7P7S         //GUI Display Select
 #define UART0_PRINTF_SEL                PRINTF_NONE //PRINTF_NONE              //PRINTF_PB3, PRINTF_PA7 选择UART打印信息输出IO，或关闭打印信息输出
 #define UART0_CLK_SEL_X26M              1                       //打印用的UART0时钟源选则X26M,系统时钟大于13M时才支持串口1.5M打印输出
 #define BT_POWER_OPTIMIZE               0                       //蓝牙电源优化,芯片供电纹波比较大时,蓝牙播放音乐可能卡顿,打开此选项优化蓝牙播放音乐的卡顿

sdk_560x_01x_s2256_20241227/app/projects/standard/display/ledseg/display_ledseg.c

@@ -187,9 +187,22 @@ void ledseg_disp_bt(void)
     } else
 #endif // FUNC_BTHID_EN
     {
+#if HLW_UI
+        if(func_cb.sta == FUNC_BT_DUT)
+        {
+            ledseg_buf[1] = T_LEDSEG_D;
+            ledseg_buf[2] = T_LEDSEG_U;
+            ledseg_buf[3] = T_LEDSEG_T;
+        }
+        else
+        {
+            ledseg_buf[1] = T_LEDSEG_B;
+            ledseg_buf[2] = T_LEDSEG_T;
+        }
+#else
         ledseg_buf[1] = T_LEDSEG_B;
         ledseg_buf[2] = T_LEDSEG_T;
-
+#endif // HLW_UI
         //ledseg_buf[0] = T_LEDSEG_8;
         //ledseg_buf[1] = T_LEDSEG_8;
         //ledseg_buf[2] = T_LEDSEG_8;
@@ -233,7 +246,11 @@ void ledseg_disp_rtctime(void)
     ledseg_buf[2] = ledseg_num_table[rtc_tm.tm_min / 10];
     ledseg_buf[3] = ledseg_num_table[rtc_tm.tm_min % 10];
     if (rtc_tm.tm_sec % 2) {
+#if HLW_UI
+        ledseg_buf[4] |= ICON_MP3;
+#else
         ledseg_buf[4] |= ICON_DDOT;
+#endif // HLW_UI
     }
 #endif // FUNC_CLOCK_EN
 }
@@ -243,7 +260,11 @@ void ledseg_disp_time_set(void)
 {
 #if FUNC_CLOCK_EN
     ledseg_disp_rtctime();
+#if HLW_UI
+    ledseg_buf[4] |= ICON_MP3;
+#else
     ledseg_buf[4] |= ICON_DDOT;
+#endif // HLW_UI
     if (box_cb.flicker.sta == 0) {
         if (box_cb.flicker.pos == 1) {              //分钟闪烁
             ledseg_buf[2] = 0x00;

sdk_560x_01x_s2256_20241227/app/projects/standard/message/msg_bt.c

@@ -56,7 +56,7 @@ void gipo_a_3_test(void)
 AT(.text.func.bt.msg)
 void func_bt_message(u16 msg)
 {
-    static u8 display_flag = false;
+    //static u8 display_flag = false;
 #if BT_HID_SIMPLE_KEYBOARD
     if (simple_keyboard_message(msg)) {
         return;
@@ -83,6 +83,7 @@ void func_bt_message(u16 msg)
         gipo_a_3_test();
         gipo_a_4_test();
 #else
+/*
         if(display_flag)
         {
             display_flag = false;
@@ -93,11 +94,39 @@ void func_bt_message(u16 msg)
             display_flag = true;
             gui_box_show_vol();
         }
+*/
+#if HLW_UI
+        if(bt_get_siri_status())
+        {
+            break;
+        }
+#endif // HLW_UI
+
         bt_music_play_pause();
         f_bt.pp_2_unmute = sys_cb.mute;
 #endif
         break;
 
+#if HLW_UI
+    case KU_POWER:
+        if(func_cb.sta == FUNC_BT)
+        {
+#if FUNC_FMRX_EN
+            func_cb.sta = FUNC_FMRX;
+#endif // FUNC_FMRX_EN
+        }
+        break;
+
+    case KTH_PLAY:
+        if(func_cb.sta == FUNC_BT)
+        {
+#if FUNC_BT_DUT_EN
+            func_cb.sta = FUNC_BT_DUT;
+#endif // FUNC_BT_DUT_EN
+        }
+        break;
+#endif // HLW_UI
+
     case KU_PREV_VOL_DOWN:
     case KL_VOL_DOWN_PREV:
     case KU_PREV:
@@ -112,18 +141,26 @@ void func_bt_message(u16 msg)
         sys_cb.key2unmute_cnt = 15 * sys_cb.mute;
         break;
     case KL_PREV:
+#if !HLW_UI
         bt_music_rewind();
+#endif // HLW_UI
         break;
     case KLU_PREV:
+#if !HLW_UI
         bsp_clr_mute_sta();
         bt_music_rewind_end();
+#endif // HLW_UI
         break;
     case KL_NEXT:
+#if !HLW_UI
         bt_music_fast_forward();
+#endif // HLW_UI
         break;
     case KLU_NEXT:
+#if !HLW_UI
         bsp_clr_mute_sta();
         bt_music_fast_forward_end();
+#endif // HLW_UI
         break;
 //    case KL_PLAY:
 //        bsp_clr_mute_sta();
@@ -136,6 +173,12 @@ void func_bt_message(u16 msg)
     case KD_PLAY_POWER:
     case KD_PLAY_MODE:
         bsp_clr_mute_sta();
+#if HLW_UI
+        if(bt_get_status() >= BT_STA_CONNECTED)
+        {
+            bt_hfp_siri_switch();
+        }
+#else
         if (bt_get_status() >= BT_STA_CONNECTED) {
             bt_call_redial_last_number();           //回拨电话
 #if WARNING_BT_CALLOUT
@@ -152,6 +195,7 @@ void func_bt_message(u16 msg)
         } else {
             func_bt_switch_voice_lang();            //切换提示音语言
         }
+#endif // HLW_UI
         break;
 
 #if BT_MAP_EN

sdk_560x_01x_s2256_20241227/app/projects/standard/message/msg_clock.c

@@ -3,7 +3,7 @@
 #include "func_clock.h"
 
 #if !LED_MATRIX_HUART_TX
-#define huart_tx_clock() 
+#define huart_tx_clock()
 #endif
 
 #if FUNC_CLOCK_EN
@@ -11,6 +11,110 @@ AT(.text.func.clock.msg)
 void func_clock_message(u16 msg)
 {
     switch (msg) {
+#if HLW_UI
+        case KU_POWER:
+            if(func_cb.sta == FUNC_CLOCK)
+            {
+                func_cb.sta = FUNC_BT;
+            }
+            break;
+
+        case KL_VOL_UP:
+            if ((tm_cb.setting)&&(tm_cb.index == 2))  //如果正在调整小时，长按就退出并且设置当前调整时间
+            {
+                tm_cb.setting = 0;
+                tm_cb.index = 0;
+                rtc_tm.tm_sec = 0;
+                RTCCNT = rtc_tm_to_time(&rtc_tm);
+                huart_tx_clock();
+            }
+            else    //否则进入时间调整界面
+            {
+                tm_cb.setting = 1;
+                tm_cb.index = 2;
+                tm_cb.cnt = 0;
+                gui_box_flicker_set(5, 0xff, tm_cb.index);        //flicker freq 100ms*5
+                rtc_time_to_tm(RTCCNT, &rtc_tm);
+                huart_tx_clock();
+            }
+            break;
+
+        case KL_VOL_DOWN:
+            if ((tm_cb.setting)&&(tm_cb.index == 1))  //如果正在调整分钟，长按就退出并且设置当前调整时间
+            {
+                tm_cb.setting = 0;
+                tm_cb.index = 0;
+                rtc_tm.tm_sec = 0;
+                RTCCNT = rtc_tm_to_time(&rtc_tm);
+                huart_tx_clock();
+            }
+            else    //否则进入时间调整界面
+            {
+                tm_cb.setting = 1;
+                tm_cb.index = 1;
+                tm_cb.cnt = 0;
+                gui_box_flicker_set(5, 0xff, tm_cb.index);        //flicker freq 100ms*5
+                rtc_time_to_tm(RTCCNT, &rtc_tm);
+                huart_tx_clock();
+            }
+            break;
+
+        case KU_VOL_UP:
+            if (tm_cb.setting)
+            {
+                tm_cb.cnt = 0;
+                if (tm_cb.index == 1)
+                {
+                    rtc_tm.tm_min++;
+                    if (rtc_tm.tm_min > 59)
+                    {
+                        rtc_tm.tm_min = 0;
+                    }
+                    huart_tx_clock();
+                }
+                else if (tm_cb.index == 2)
+                {
+                    rtc_tm.tm_hour++;
+                    if (rtc_tm.tm_hour > 23)
+                    {
+                        rtc_tm.tm_hour = 0;
+                    }
+                    huart_tx_clock();
+                }
+            }
+            break;
+
+        case KU_VOL_DOWN:
+            if (tm_cb.setting)
+            {
+                tm_cb.cnt = 0;
+                if (tm_cb.index == 1)
+                {
+                    if (rtc_tm.tm_min > 0)
+                    {
+                        rtc_tm.tm_min--;
+                    }
+                    else
+                    {
+                        rtc_tm.tm_min = 59;
+                    }
+                    huart_tx_clock();
+                }
+                else if (tm_cb.index == 2)
+                {
+                    if (rtc_tm.tm_hour > 0)
+                    {
+                        rtc_tm.tm_hour--;
+                    }
+                    else
+                    {
+                        rtc_tm.tm_hour = 23;
+                    }
+                    huart_tx_clock();
+                }
+            }
+            break;
+#else
         case KU_PLAY:
         case KU_PLAY_HSF:
         case KU_PLAY_POWER:
@@ -92,6 +196,7 @@ void func_clock_message(u16 msg)
                 }
             }
             break;
+#endif // HLW_UI
 
         case MSG_SYS_500MS:
             if(tm_cb.setting) {

sdk_560x_01x_s2256_20241227/app/projects/standard/message/msg_fmrx.c

@@ -16,6 +16,15 @@ void func_fmrx_message(u16 msg)
             }
             break;
 
+#if HLW_UI
+        case KU_POWER:
+            if(func_cb.sta == FUNC_FMRX)
+            {
+                func_cb.sta = FUNC_CLOCK;
+            }
+            break;
+#endif // HLW_UI
+
         case KL_PLAY:
         case KU_PLAY_POWER:
         case KU_PLAY_MODE: