Index: output/eeprom.dat =================================================================== --- /YC1308AC/branch/mouse_project/AiTanSi_Project/bt/PB_3mode3ch_pb&connect_gan/output/eeprom.dat (revision 2939) +++ /YC1308AC/branch/mouse_project/AiTanSi_Project/bt/PB_3mode3ch_pb&connect_gan/output/eeprom.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -0e +2a 16 c2 84 @@ -195,7 +195,7 @@ c0 76 85 -7b +82 20 20 13 @@ -5588,10 +5588,38 @@ 20 41 95 +6f +e0 +c9 +38 +c0 +00 +04 +62 +6f +e4 +4b +ab +c3 +83 +00 +00 +d8 +e0 +00 +06 +20 +40 +46 +f0 20 +40 +31 +73 20 -44 -d4 +20 +45 +4e 6f e0 c9 @@ -5648,8 +5676,8 @@ 20 26 f6 -ba -97 +b0 +a5 aa 55 40 @@ -5803,17 +5831,22 @@ 00 41 4c -29 +2b aa 55 -06 +03 00 fe 48 b0 04 -58 +64 +aa +55 +02 +00 02 +49 58 02 aa @@ -5924,7 +5957,7 @@ 48 4c 05 -02 +05 05 aa 55 @@ -7010,49 +7043,16 @@ 02 40 00 -6f +90 1b 55 aa aa 55 -ec -a1 -fd -4b -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff +65 +a3 +cb +b4 ff ff ff @@ -8188,5 +8188,5 @@ ff ff ff -dc -83 +21 +5f Index: output/program.lis =================================================================== --- /YC1308AC/branch/mouse_project/AiTanSi_Project/bt/PB_3mode3ch_pb&connect_gan/output/program.lis (revision 2922) +++ /YC1308AC/branch/mouse_project/AiTanSi_Project/bt/PB_3mode3ch_pb&connect_gan/output/program.lis (working copy) @@ -49,7 +49,7 @@ 002c c07482e6 beq patch3d_1 ,p_g24_reconn_dispatch 002d c07501cb beq patch3d_2 ,p_g24_transmit_no_interrupt 002e c07604db beq patch3d_4 ,p_g24_lpm_wait -002f c076857b beq patch3d_5 ,p_power_ctrl_start +002f c0768582 beq patch3d_5 ,p_power_ctrl_start 0030 2020137c branch loop p_soft_reset: @@ -1910,27 +1910,36 @@ 0573 20204195 branch mouse_3io6key_check p_mouse_dpi_process: -0574 202044d4 branch mouse_long_button_bt_discovery + +p_mouse_long_button_bt_discovery: +0574 6fe0c938 fetch 1 ,mem_device_flag +0575 c0000462 beq mode_24g_device ,p_mouse_24g_start_pair +0576 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +0577 c3830000 rtnbit1 mouse_bt_discovery_button_long_down_flag +0578 d8e00006 arg mouse_bt_discovery_button_long_down_flag ,queue +0579 204046f0 call mouse_enable_function_flag +057a 20403173 call app_evt_button_long_pressed +057b 2020454e branch mouse_bb_event_discovery_btn p_mouse_dpi_process_next: -0575 6fe0c992 fetch 1 ,mem_mouse_dpi -0576 1fe0fe01 increase 1 ,pdata -0577 1fe17e03 and pdata ,0x03 ,pdata +057c 6fe0c992 fetch 1 ,mem_mouse_dpi +057d 1fe0fe01 increase 1 ,pdata +057e 1fe17e03 and pdata ,0x03 ,pdata p_mouse_dpi_store: -0578 67e0c992 store 1 ,mem_mouse_dpi -0579 20400327 call p_mouse_seting_dpi -057a 20204643 branch mouse_store_eerpom_dpi +057f 67e0c992 store 1 ,mem_mouse_dpi +0580 20400327 call p_mouse_seting_dpi +0581 20204643 branch mouse_store_eerpom_dpi p_power_ctrl_start: -057b 6fe1478c fetch 2 ,mem_ui_state_map -057c c3858000 rtnbit1 ui_state_ble_adv -057d c3838000 rtnbit1 ui_state_bt_reconnect -057e c3830000 rtnbit1 ui_state_bt_discovery -057f 6a214899 fetchr rega ,2 ,mem_rssi_signal_buf_ptr -0580 204025cb call rssi_average -0581 6048c8c7 storet 1 ,mem_rssi_avg_received -0582 202026f6 branch power_ctrl_rssi_avg_compare +0582 6fe1478c fetch 2 ,mem_ui_state_map +0583 c3858000 rtnbit1 ui_state_ble_adv +0584 c3838000 rtnbit1 ui_state_bt_reconnect +0585 c3830000 rtnbit1 ui_state_bt_discovery +0586 6a214899 fetchr rega ,2 ,mem_rssi_signal_buf_ptr +0587 204025cb call rssi_average +0588 6048c8c7 storet 1 ,mem_rssi_avg_received +0589 202026f6 branch power_ctrl_rssi_avg_compare org 0x3bc1 mouse_init: Index: program/patch.prog =================================================================== --- /YC1308AC/branch/mouse_project/AiTanSi_Project/bt/PB_3mode3ch_pb&connect_gan/program/patch.prog (revision 2922) +++ /YC1308AC/branch/mouse_project/AiTanSi_Project/bt/PB_3mode3ch_pb&connect_gan/program/patch.prog (working copy) @@ -2512,7 +2512,15 @@ endif p_mouse_dpi_process: - branch mouse_long_button_bt_discovery +p_mouse_long_button_bt_discovery: + fetch 1,mem_device_flag + beq MODE_24G_DEVICE,p_mouse_24g_start_pair + fetch MOUSE_FLAG_LEN,mem_mouse_flag + rtnbit1 MOUSE_BT_DISCOVERY_BUTTON_LONG_DOWN_FLAG + arg MOUSE_BT_DISCOVERY_BUTTON_LONG_DOWN_FLAG,queue + call mouse_enable_function_flag + call app_evt_button_long_pressed + branch mouse_bb_event_discovery_btn /* fetch 1,mem_mouse_dpi_led_blink_enable rtn blank Index: sched/mouse.dat =================================================================== --- /YC1308AC/branch/mouse_project/AiTanSi_Project/bt/PB_3mode3ch_pb&connect_gan/sched/mouse.dat (revision 2939) +++ /YC1308AC/branch/mouse_project/AiTanSi_Project/bt/PB_3mode3ch_pb&connect_gan/sched/mouse.dat (working copy) @@ -105,10 +105,10 @@ #bit5 MOUSE_ENABLE_LOW_FOR_LED #bit6 MOUSE_ENABLE_DPI_FOR_LED #bit7 MOUSE_ENABLE_DPI_LOW_FOR_LED -29 +2b mem_mouse_discovery_timeout:b0 04 #2min -mem_mouse_24g_pair_timeout_init:58 02 #1min 24g reconn timer&pair timer +mem_mouse_24g_pair_timeout_init:64 #10s 24g reconn timer&pair timer mem_mouse_direct_timeout:58 02 #1min mem_mouse_24g_reconn_timeout_init:58 02 #1min @@ -159,7 +159,7 @@ #time parm mem_mouse_multi_led_powon_timer_init:20 #2s mem_mouse_multi_24gled_blink_timer_init:05 #24gled blink time 500ms on,500ms off -mem_mouse_multi_le_discovery_blink_timer_init:02 #le discovery blink time 500ms on,500ms off +mem_mouse_multi_le_discovery_blink_timer_init:05 #le discovery blink time 500ms on,500ms off mem_mouse_multi_le_reconn_blink_timer_init:05 #le reconn blink time 500ms on,500ms off mem_mouse_low_led_blink_timer:14 #low blink time 1000ms on,1000ms off mem_mouse_dpi_led_blink_timer_init:02 #dpi blink time 200ms on,200ms off