Sfoglia il codice sorgente

解决一拖二连接两个手机时,一个通话,一个无业务,通话的断连再次连接不进入蓝牙通话的问题

caihoucong 3 mesi fa
parent
commit
b9e0568655

BIN
sdk_bt893x_v013_s8759_20241213/app/projects/earphone/Output/bin/app.bin


BIN
sdk_bt893x_v013_s8759_20241213/app/projects/earphone/Output/bin/app.dcf


BIN
sdk_bt893x_v013_s8759_20241213/app/projects/earphone/Output/bin/app.rv32


+ 69 - 69
sdk_bt893x_v013_s8759_20241213/app/projects/earphone/Output/bin/map.txt

@@ -10140,104 +10140,104 @@ LOAD Output\obj\projects\earphone\port\port_update.o
                 0x0000000010035b3a                func_bt_message_do
                 0x0000000010035f3c                func_bt_message
  .text.hfp_call_reject_hook
-                0x0000000010035f42      0x184 Output\obj\projects\earphone\message\msg_bt.o
+                0x0000000010035f42      0x1aa Output\obj\projects\earphone\message\msg_bt.o
                 0x0000000010035f42                hfp_call_reject_hook
  .text.func.btring.msg
-                0x00000000100360c6      0x240 Output\obj\projects\earphone\message\msg_bt.o
-                0x00000000100360c6                sfunc_bt_ring_message_do
-                0x0000000010036300                sfunc_bt_ring_message
+                0x00000000100360ec      0x240 Output\obj\projects\earphone\message\msg_bt.o
+                0x00000000100360ec                sfunc_bt_ring_message_do
+                0x0000000010036326                sfunc_bt_ring_message
  .text.sfunc_bt_call_message_do
-                0x0000000010036306      0x3c8 Output\obj\projects\earphone\message\msg_bt.o
-                0x0000000010036306                sfunc_bt_call_message_do
+                0x000000001003632c      0x3c8 Output\obj\projects\earphone\message\msg_bt.o
+                0x000000001003632c                sfunc_bt_call_message_do
  .text.sfunc_bt_call_message
-                0x00000000100366ce        0x8 Output\obj\projects\earphone\message\msg_bt.o
-                0x00000000100366ce                sfunc_bt_call_message
+                0x00000000100366f4        0x8 Output\obj\projects\earphone\message\msg_bt.o
+                0x00000000100366f4                sfunc_bt_call_message
  .text.func.usbdev.msg
-                0x00000000100366d6      0x1f8 Output\obj\projects\earphone\message\msg_usbdev.o
-                0x00000000100366d6                func_usbdev_message
+                0x00000000100366fc      0x1f8 Output\obj\projects\earphone\message\msg_usbdev.o
+                0x00000000100366fc                func_usbdev_message
  .text.bt_sco_aec_init
-                0x00000000100368ce      0x114 Output\obj\projects\earphone\plugin\bt_call.o
-                0x00000000100368ce                bt_sco_aec_init
+                0x00000000100368f4      0x114 Output\obj\projects\earphone\plugin\bt_call.o
+                0x00000000100368f4                bt_sco_aec_init
  .text.bt_sco_far_nr_init
-                0x00000000100369e2       0x6e Output\obj\projects\earphone\plugin\bt_call.o
-                0x00000000100369e2                bt_sco_far_nr_init
+                0x0000000010036a08       0x6e Output\obj\projects\earphone\plugin\bt_call.o
+                0x0000000010036a08                bt_sco_far_nr_init
  .text.bt_sco_nr_exit
-                0x0000000010036a50        0x4 Output\obj\projects\earphone\plugin\bt_call.o
-                0x0000000010036a50                bt_sco_nr_exit
+                0x0000000010036a76        0x4 Output\obj\projects\earphone\plugin\bt_call.o
+                0x0000000010036a76                bt_sco_nr_exit
  .text.bt_sco_sndp_dm_init
-                0x0000000010036a54       0xb6 Output\obj\projects\earphone\plugin\bt_call.o
-                0x0000000010036a54                bt_sco_sndp_dm_init
+                0x0000000010036a7a       0xb6 Output\obj\projects\earphone\plugin\bt_call.o
+                0x0000000010036a7a                bt_sco_sndp_dm_init
  .text.bt_sco_nr_init
-                0x0000000010036b0a       0x24 Output\obj\projects\earphone\plugin\bt_call.o
-                0x0000000010036b0a                bt_sco_nr_init
- *fill*         0x0000000010036b2e        0x2 
+                0x0000000010036b30       0x24 Output\obj\projects\earphone\plugin\bt_call.o
+                0x0000000010036b30                bt_sco_nr_init
+ *fill*         0x0000000010036b54        0x0 
  .text.sco.gain.tbl
-                0x0000000010036b30       0x82 Output\obj\projects\earphone\plugin\bt_call.o
-                0x0000000010036b30                mic_gain_tbl
+                0x0000000010036b54       0x82 Output\obj\projects\earphone\plugin\bt_call.o
+                0x0000000010036b54                mic_gain_tbl
  .text.multi_lang_init
-                0x0000000010036bb2        0x2 Output\obj\projects\earphone\plugin\multi_lang.o
-                0x0000000010036bb2                multi_lang_init
+                0x0000000010036bd6        0x2 Output\obj\projects\earphone\plugin\multi_lang.o
+                0x0000000010036bd6                multi_lang_init
  .text.plugin_init
-                0x0000000010036bb4       0x4e Output\obj\projects\earphone\plugin\plugin.o
-                0x0000000010036bb4                plugin_init
+                0x0000000010036bd8       0x4e Output\obj\projects\earphone\plugin\plugin.o
+                0x0000000010036bd8                plugin_init
  .text.plugin_var_init
-                0x0000000010036c02      0x14e Output\obj\projects\earphone\plugin\plugin.o
-                0x0000000010036c02                plugin_var_init
+                0x0000000010036c26      0x14e Output\obj\projects\earphone\plugin\plugin.o
+                0x0000000010036c26                plugin_var_init
  .text.get_wav_res_digvol
-                0x0000000010036d50       0x12 Output\obj\projects\earphone\plugin\plugin.o
-                0x0000000010036d50                get_wav_res_digvol
+                0x0000000010036d74       0x12 Output\obj\projects\earphone\plugin\plugin.o
+                0x0000000010036d74                get_wav_res_digvol
  .text.get_piano_digvol
-                0x0000000010036d62        0x4 Output\obj\projects\earphone\plugin\plugin.o
-                0x0000000010036d62                get_piano_digvol
+                0x0000000010036d86        0x4 Output\obj\projects\earphone\plugin\plugin.o
+                0x0000000010036d86                get_piano_digvol
  .text.plugin_lowbat_vol_reduce
-                0x0000000010036d66        0x2 Output\obj\projects\earphone\plugin\plugin.o
-                0x0000000010036d66                plugin_lowbat_vol_reduce
+                0x0000000010036d8a        0x2 Output\obj\projects\earphone\plugin\plugin.o
+                0x0000000010036d8a                plugin_lowbat_vol_reduce
  .text.plugin_music_eq
-                0x0000000010036d68       0x1a Output\obj\projects\earphone\plugin\plugin.o
-                0x0000000010036d68                plugin_music_eq
+                0x0000000010036d8c       0x1a Output\obj\projects\earphone\plugin\plugin.o
+                0x0000000010036d8c                plugin_music_eq
  .text.key.init
-                0x0000000010036d82       0xee Output\obj\projects\earphone\port\port_key.o
-                0x0000000010036d82                iokey_cfg_port_init
-                0x0000000010036da6                io_key_init
+                0x0000000010036da6       0xee Output\obj\projects\earphone\port\port_key.o
+                0x0000000010036da6                iokey_cfg_port_init
+                0x0000000010036dca                io_key_init
  .text.led_disp
-                0x0000000010036e70       0x20 Output\obj\projects\earphone\port\port_led.o
-                0x0000000010036e70                led_power_up
-                0x0000000010036e7a                led_power_down
-                0x0000000010036e84                led_idle
+                0x0000000010036e94       0x20 Output\obj\projects\earphone\port\port_led.o
+                0x0000000010036e94                led_power_up
+                0x0000000010036e9e                led_power_down
+                0x0000000010036ea8                led_idle
  .text.led_disp.bt
-                0x0000000010036e90       0x48 Output\obj\projects\earphone\port\port_led.o
-                0x0000000010036e90                led_bt_init
-                0x0000000010036e9a                led_bt_idle
-                0x0000000010036ea4                led_bt_reconnect
-                0x0000000010036eae                led_bt_connected
-                0x0000000010036eb8                led_bt_play
-                0x0000000010036ec2                led_bt_ring
-                0x0000000010036ecc                led_bt_call
-                0x0000000010036ed6                led_bt_scan
+                0x0000000010036eb4       0x48 Output\obj\projects\earphone\port\port_led.o
+                0x0000000010036eb4                led_bt_init
+                0x0000000010036ebe                led_bt_idle
+                0x0000000010036ec8                led_bt_reconnect
+                0x0000000010036ed2                led_bt_connected
+                0x0000000010036edc                led_bt_play
+                0x0000000010036ee6                led_bt_ring
+                0x0000000010036ef0                led_bt_call
+                0x0000000010036efa                led_bt_scan
  .text.led_disp.lowbat
-                0x0000000010036ed8       0x16 Output\obj\projects\earphone\port\port_led.o
-                0x0000000010036ed8                led_lowbat_do
-                0x0000000010036ee2                led_lowbat_follow_do
+                0x0000000010036efc       0x16 Output\obj\projects\earphone\port\port_led.o
+                0x0000000010036efc                led_lowbat_do
+                0x0000000010036f06                led_lowbat_follow_do
  .text.led_func_init
-                0x0000000010036eee       0xe6 Output\obj\projects\earphone\port\port_led.o
-                0x0000000010036eee                led_func_init
+                0x0000000010036f12       0xe6 Output\obj\projects\earphone\port\port_led.o
+                0x0000000010036f12                led_func_init
  .text.led_get_cfg_port
-                0x0000000010036fd4       0x32 Output\obj\projects\earphone\port\port_led.o
-                0x0000000010036fd4                led_get_cfg_port
- .text.sdcard   0x0000000010037006        0x4 Output\obj\projects\earphone\port\port_sd.o
-                0x0000000010037006                sd_gpio_init
-                0x0000000010037008                sd1_gpio_init
+                0x0000000010036ff8       0x32 Output\obj\projects\earphone\port\port_led.o
+                0x0000000010036ff8                led_get_cfg_port
+ .text.sdcard   0x000000001003702a        0x4 Output\obj\projects\earphone\port\port_sd.o
+                0x000000001003702a                sd_gpio_init
+                0x000000001003702c                sd1_gpio_init
  .text.sdadc0_anlog_init
-                0x000000001003700a       0x98 ..\..\libs\bt8930\libplatform.a(audio.o)
+                0x000000001003702e       0x98 ..\..\libs\bt8930\libplatform.a(audio.o)
  .text.sdadc1_anlog_init
-                0x00000000100370a2       0x98 ..\..\libs\bt8930\libplatform.a(audio.o)
+                0x00000000100370c6       0x98 ..\..\libs\bt8930\libplatform.a(audio.o)
  .text.sdadc2_anlog_init
-                0x000000001003713a       0x98 ..\..\libs\bt8930\libplatform.a(audio.o)
+                0x000000001003715e       0x98 ..\..\libs\bt8930\libplatform.a(audio.o)
  .text.sdadc3_anlog_init
-                0x00000000100371d2       0x98 ..\..\libs\bt8930\libplatform.a(audio.o)
+                0x00000000100371f6       0x98 ..\..\libs\bt8930\libplatform.a(audio.o)
  .text.sdadc4_anlog_init
-                0x000000001003726a       0x98 ..\..\libs\bt8930\libplatform.a(audio.o)
- *fill*         0x0000000010037302       0xfe 
+                0x000000001003728e       0x98 ..\..\libs\bt8930\libplatform.a(audio.o)
+ *fill*         0x0000000010037326       0xda 
  .text.dac_clk_source_sel
                 0x0000000010037400       0xfa ..\..\libs\bt8930\libplatform.a(audio.o)
                 0x0000000010037400                dac_clk_source_sel

BIN
sdk_bt893x_v013_s8759_20241213/app/projects/earphone/Output/obj/modules/bluetooth/app/app_onemore/onemore_app.o


BIN
sdk_bt893x_v013_s8759_20241213/app/projects/earphone/Output/obj/projects/earphone/message/msg_bt.o


+ 2 - 2
sdk_bt893x_v013_s8759_20241213/app/projects/earphone/app.depend

@@ -28122,7 +28122,7 @@
 	"include.h"
 	"app.h"
 
-1744018361 source:d:\bluetrum\project\a_ansheng\hq32\code\20250416\sdk_bt893x_v013_s8759_20241213\app\modules\bluetooth\app\app_onemore\onemore_app.c
+1744773957 source:d:\bluetrum\project\a_ansheng\hq32\code\20250416\sdk_bt893x_v013_s8759_20241213\app\modules\bluetooth\app\app_onemore\onemore_app.c
 	"include.h"
 	"onemore_app.h"
 	"hlw_func.h"
@@ -28611,7 +28611,7 @@
 	"include.h"
 	"api.h"
 
-1744768886 source:d:\bluetrum\project\a_ansheng\hq32\code\20250416\sdk_bt893x_v013_s8759_20241213\app\modules\bluetooth\bt\bt.c
+1744771609 source:d:\bluetrum\project\a_ansheng\hq32\code\20250416\sdk_bt893x_v013_s8759_20241213\app\modules\bluetooth\bt\bt.c
 	"include.h"
 	"api.h"
 

+ 6 - 0
sdk_bt893x_v013_s8759_20241213/app/projects/earphone/message/msg_bt.c

@@ -431,6 +431,12 @@ bool hfp_call_reject_hook(bool reject)
             }
         }
 
+        if((btstack_get_call_indicate_for_index(hfp_index) == BT_CALL_ACTIVE)
+          &&(btstack_get_call_indicate_for_index(!hfp_index) == BT_CALL_IDLE))
+            {
+                reject = false;
+            }
+
         if((btstack_get_call_indicate_for_index(ring_index) == BT_CALL_INCOMING)
         &&(btstack_get_call_indicate_for_index(!ring_index) == BT_CALL_INCOMING))
         {