Index: output/eeprom.dat =================================================================== --- /YC1308AC/branch/mouse_project/XZR/PBSwitch_3mode_3ch_YCJ-9801/output/eeprom.dat (revision 1275) +++ /YC1308AC/branch/mouse_project/XZR/PBSwitch_3mode_3ch_YCJ-9801/output/eeprom.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -ba +be 0d c2 84 @@ -71,7 +71,7 @@ c0 6a 83 -5e +5f c0 6b 01 @@ -99,7 +99,7 @@ c0 70 03 -57 +58 c0 74 02 @@ -3343,7 +3343,7 @@ 20 40 03 -50 +51 60 48 c9 @@ -3359,7 +3359,7 @@ 20 40 03 -4a +4b 20 40 46 @@ -3369,6 +3369,10 @@ c5 01 20 +40 +45 +76 +20 20 45 4a @@ -3379,7 +3383,7 @@ c2 83 83 -4d +4e 20 20 43 @@ -3447,7 +3451,7 @@ 24 42 83 -50 +51 20 20 47 @@ -3467,15 +3471,15 @@ c0 00 83 -65 +66 c0 01 03 -67 +68 c0 01 83 -69 +6a 20 60 00 @@ -3487,7 +3491,7 @@ 20 20 03 -6a +6b 6f e3 49 @@ -3495,7 +3499,7 @@ 20 20 03 -6a +6b 6f e3 49 @@ -3516,8 +3520,8 @@ 20 3d 59 -58 -7d +ca +97 aa 55 40 @@ -3664,7 +3668,7 @@ 19 1a 00 -07 +06 02 82 2d @@ -3784,7 +3788,7 @@ 00 b3 4b -03 +02 03 aa 55 @@ -4722,12 +4726,8 @@ 01 4c 32 -11 -31 -ff -ff -ff -ff +38 +43 ff ff ff @@ -8188,5 +8188,5 @@ ff ff ff -85 -52 +c2 +0d Index: output/program.lis =================================================================== --- /YC1308AC/branch/mouse_project/XZR/PBSwitch_3mode_3ch_YCJ-9801/output/program.lis (revision 1275) +++ /YC1308AC/branch/mouse_project/XZR/PBSwitch_3mode_3ch_YCJ-9801/output/program.lis (working copy) @@ -16,14 +16,14 @@ 000d c067033a beq patch19_6 ,p_mouse_motion 000e c0678277 beq patch19_7 ,p_mouse_dpi_process 000f c06801c3 beq patch1a_0 ,p_mouse_seting_dpi -0010 c06a835e beq patch1a_5 ,p_mouse_buletooth_fast_conn_end +0010 c06a835f beq patch1a_5 ,p_mouse_buletooth_fast_conn_end 0011 c06b014f beq patch1a_6 ,p_mouse_priority_bb_event 0012 c06c81d2 beq patch1b_1 ,p_mouse_bb_event_timer 0013 c06d02bd beq patch1b_2 ,p_mouse_start_discovery 0014 c06d82c6 beq patch1b_3 ,p_mouse_stop_discovery 0015 c06e02d0 beq patch1b_4 ,p_mouse_store_remote_bdaddr 0016 c06f8340 beq patch1b_7 ,p_mouse_ready_reconnection_by_button -0017 c0700357 beq patch1c_0 ,p_mouse_polling_device +0017 c0700358 beq patch1c_0 ,p_mouse_polling_device 0018 c07402e5 beq patch1d_0 ,p_hid_rx_process 0019 2020137c branch loop @@ -1116,68 +1116,69 @@ p_mouse_ready_reconnection_by_button: 0340 6fe0cbb4 fetch 1 ,mem_device_number 0341 c1008000 rtneq 1 -0342 20400350 call p_mouse_select_device_number +0342 20400351 call p_mouse_select_device_number 0343 6048c938 storet 1 ,mem_device_flag 0344 7041ca00 jam 0 ,mem_link_key_exists 0345 204046da call mouse_select_device_enable -0346 2040034a call p_mouse_stop_bluetooth_mode +0346 2040034b call p_mouse_stop_bluetooth_mode 0347 204046dc call mouse_select_device_disable 0348 704ac501 jam 1 ,mem_mouse_need_soft_reset -0349 2020454a branch mouse_store_device_info_check +0349 20404576 call mouse_stop_discovery +034a 2020454a branch mouse_store_device_info_check p_mouse_stop_bluetooth_mode: -034a 6fe1478c fetch 2 ,mem_ui_state_map -034b c283834d bbit1 ui_state_bt_reconnect ,p_mouse_cancel_reconnect -034c 20204318 branch mouse_stop_bluetooth_mode + 2 +034b 6fe1478c fetch 2 ,mem_ui_state_map +034c c283834e bbit1 ui_state_bt_reconnect ,p_mouse_cancel_reconnect +034d 20204318 branch mouse_stop_bluetooth_mode + 2 p_mouse_cancel_reconnect: -034d 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -034e c3948000 rtnbit1 mouse_enable_select_device_by_pb_button -034f 20204322 branch mouse_cancel_reconnect +034e 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +034f c3948000 rtnbit1 mouse_enable_select_device_by_pb_button +0350 20204322 branch mouse_cancel_reconnect p_mouse_select_device_number: -0350 6848c938 fetcht 1 ,mem_device_flag -0351 18408401 increase 1 ,temp -0352 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -0353 c288c6c9 bbit1 mouse_enable_24g ,mouse_select_device_number_24g -0354 18467c03 sub temp ,3 ,null -0355 244146d0 ncall mouse_select_device_count_clean_bt ,positive -0356 20600000 rtn +0351 6848c938 fetcht 1 ,mem_device_flag +0352 18408401 increase 1 ,temp +0353 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +0354 c288c6c9 bbit1 mouse_enable_24g ,mouse_select_device_number_24g +0355 18467c03 sub temp ,3 ,null +0356 244146d0 ncall mouse_select_device_count_clean_bt ,positive +0357 20600000 rtn p_mouse_polling_device: -0357 6fe0cab0 fetch 1 ,mem_reconn_times -0358 1fe0ffff increase -1 ,pdata -0359 67e0cab0 store 1 ,mem_reconn_times -035a 6848c938 fetcht 1 ,mem_device_flag -035b 18467c01 sub temp ,1 ,null -035c 24428350 ncall p_mouse_select_device_number ,zero -035d 20204715 branch mouse_polling_device_next +0358 6fe0cab0 fetch 1 ,mem_reconn_times +0359 1fe0ffff increase -1 ,pdata +035a 67e0cab0 store 1 ,mem_reconn_times +035b 6848c938 fetcht 1 ,mem_device_flag +035c 18467c01 sub temp ,1 ,null +035d 24428351 ncall p_mouse_select_device_number ,zero +035e 20204715 branch mouse_polling_device_next p_mouse_buletooth_fast_conn_end: -035e 204045bd call mouse_select_reconn_device -035f 20404314 call mouse_bluetooth_fast_conn_disable -0360 6fe0c938 fetch 1 ,mem_device_flag -0361 c0008365 beq mode_bt_device1 ,p_mouse_device1_check_auto_discover -0362 c0010367 beq mode_bt_device2 ,p_mouse_device2_check_auto_discover -0363 c0018369 beq mode_bt_device3 ,p_mouse_device3_check_auto_discover -0364 20600000 rtn +035f 204045bd call mouse_select_reconn_device +0360 20404314 call mouse_bluetooth_fast_conn_disable +0361 6fe0c938 fetch 1 ,mem_device_flag +0362 c0008366 beq mode_bt_device1 ,p_mouse_device1_check_auto_discover +0363 c0010368 beq mode_bt_device2 ,p_mouse_device2_check_auto_discover +0364 c001836a beq mode_bt_device3 ,p_mouse_device3_check_auto_discover +0365 20600000 rtn p_mouse_device1_check_auto_discover: -0365 6fe3493a fetch 6 ,mem_device1_addr -0366 2020036a branch p_mouse_device_check_auto_discover +0366 6fe3493a fetch 6 ,mem_device1_addr +0367 2020036b branch p_mouse_device_check_auto_discover p_mouse_device2_check_auto_discover: -0367 6fe34957 fetch 6 ,mem_device2_addr -0368 2020036a branch p_mouse_device_check_auto_discover +0368 6fe34957 fetch 6 ,mem_device2_addr +0369 2020036b branch p_mouse_device_check_auto_discover p_mouse_device3_check_auto_discover: -0369 6fe34974 fetch 6 ,mem_device3_addr +036a 6fe34974 fetch 6 ,mem_device3_addr p_mouse_device_check_auto_discover: -036a 684b4bf2 fetcht 6 ,mem_mouse_compare_addr_ff_new -036b 98467c00 isub temp ,null -036c 2022c553 branch mouse_start_discovery ,zero -036d 20203d59 branch mouse_start_reconnect_device +036b 684b4bf2 fetcht 6 ,mem_mouse_compare_addr_ff_new +036c 98467c00 isub temp ,null +036d 2022c553 branch mouse_start_discovery ,zero +036e 20203d59 branch mouse_start_reconnect_device org 0x800 start: Index: program/patch.prog =================================================================== --- /YC1308AC/branch/mouse_project/XZR/PBSwitch_3mode_3ch_YCJ-9801/program/patch.prog (revision 1275) +++ /YC1308AC/branch/mouse_project/XZR/PBSwitch_3mode_3ch_YCJ-9801/program/patch.prog (working copy) @@ -1208,6 +1208,7 @@ call p_mouse_stop_bluetooth_mode call mouse_select_device_disable jam 1,mem_mouse_need_soft_reset + call mouse_stop_discovery branch mouse_store_device_info_check p_mouse_stop_bluetooth_mode: Index: sched/mouse.dat =================================================================== --- /YC1308AC/branch/mouse_project/XZR/PBSwitch_3mode_3ch_YCJ-9801/sched/mouse.dat (revision 1275) +++ /YC1308AC/branch/mouse_project/XZR/PBSwitch_3mode_3ch_YCJ-9801/sched/mouse.dat (working copy) @@ -64,7 +64,7 @@ #bit5 MOUSE_ENABLE_DPI_FOR_4_LED #bit6 MOUSE_ENABLE_BT2_FOR_4_LED #bit7 MOUSE_ENABLE_LOW_V_FOR_4_LED -07 +06 #mouse flag byte6 #bit0 MOUSE_ENABLE_SELECT_DEVICE_BY_DPI_BUTTON @@ -159,7 +159,7 @@ mem_lpm_mode:01 -mem_mouse_bluetooth_type:03 #03 bt3.0+ble #02 ble #01 bt3.0 +mem_mouse_bluetooth_type:02 #03 bt3.0+ble #02 ble #01 bt3.0 mem_device_number:03 #max device number value:01,02,03 mem_device_flag: