Index: format/app_mouse.format
===================================================================
--- /YC1308AF/branch/mouse/mouse_public/format/app_mouse.format	(revision 1654)
+++ /YC1308AF/branch/mouse/mouse_public/format/app_mouse.format	(working copy)
@@ -445,6 +445,8 @@
 1 mem_3212_dpi_2_new
 1 mem_3212_dpi_3_new
 1 mem_3212_dpi_4_new
+
+1 mem_24g_reconn_pairing_switch
 )
 
 
Index: output/eeprom.dat
===================================================================
--- /YC1308AF/branch/mouse/mouse_public/output/eeprom.dat	(revision 1654)
+++ /YC1308AF/branch/mouse/mouse_public/output/eeprom.dat	(working copy)
@@ -2,7 +2,7 @@
 02
 aa
 55
-62
+82
 17
 c2
 84
@@ -55,7 +55,7 @@
 c0
 66
 85
-88
+90
 c0
 67
 04
@@ -67,7 +67,7 @@
 c0
 68
 05
-a2
+aa
 c0
 69
 03
@@ -111,11 +111,11 @@
 c0
 42
 85
-7d
+85
 c0
 53
 05
-81
+89
 c0
 6e
 85
@@ -147,7 +147,7 @@
 c0
 76
 05
-72
+7a
 20
 20
 13
@@ -3723,7 +3723,7 @@
 20
 40
 05
-d2
+da
 d8
 40
 00
@@ -3983,7 +3983,7 @@
 20
 40
 05
-d5
+dd
 68
 48
 c9
@@ -4015,7 +4015,7 @@
 20
 40
 05
-d2
+da
 20
 40
 03
@@ -4043,7 +4043,7 @@
 20
 40
 05
-d5
+dd
 70
 4c
 20
@@ -5565,13 +5565,45 @@
 c8
 8f
 c0
+01
+05
+71
+c0
 02
 05
-70
+78
 20
 20
 25
 b1
+6f
+e0
+cc
+cf
+1f
+e0
+fe
+01
+1f
+e1
+7e
+03
+67
+e0
+cc
+cf
+c0
+00
+25
+7e
+c0
+01
+25
+6f
+20
+20
+22
+ef
 20
 20
 a5
@@ -5651,7 +5683,7 @@
 c2
 80
 85
-85
+8d
 20
 20
 16
@@ -5683,7 +5715,7 @@
 20
 40
 05
-98
+a0
 58
 00
 00
@@ -5707,7 +5739,7 @@
 20
 40
 05
-a0
+a8
 6f
 e0
 c8
@@ -5727,7 +5759,7 @@
 20
 40
 05
-9d
+a5
 20
 20
 45
@@ -5767,7 +5799,7 @@
 20
 40
 05
-a2
+aa
 20
 20
 41
@@ -5787,15 +5819,15 @@
 20
 40
 05
-a9
+b1
 20
 40
 05
-b8
+c0
 20
 40
 05
-c5
+cd
 20
 20
 41
@@ -5807,7 +5839,7 @@
 20
 40
 05
-d2
+da
 20
 40
 41
@@ -5827,7 +5859,7 @@
 20
 40
 05
-d2
+da
 20
 40
 41
@@ -5847,7 +5879,7 @@
 20
 40
 05
-d2
+da
 20
 40
 41
@@ -5891,7 +5923,7 @@
 c0
 7f
 85
-c1
+c9
 20
 20
 41
@@ -5903,7 +5935,7 @@
 20
 40
 05
-d5
+dd
 68
 48
 c9
@@ -5943,7 +5975,7 @@
 c0
 7f
 85
-ce
+d6
 20
 20
 41
@@ -5955,7 +5987,7 @@
 20
 40
 05
-d5
+dd
 68
 48
 c9
@@ -5988,8 +6020,8 @@
 20
 61
 2c
-96
-5d
+75
+36
 aa
 55
 40
@@ -6535,7 +6567,7 @@
 a8
 40
 19
-a3
+a4
 c8
 16
 08
@@ -7346,42 +7378,10 @@
 aa
 aa
 55
-57
+58
 94
-0c
-0f
-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
+97
+d5
 ff
 ff
 ff
@@ -8188,5 +8188,5 @@
 ff
 ff
 ff
-c0
-f0
+df
+7f
Index: output/memmap.format
===================================================================
--- /YC1308AF/branch/mouse/mouse_public/output/memmap.format	(revision 1654)
+++ /YC1308AF/branch/mouse/mouse_public/output/memmap.format	(working copy)
@@ -2316,6 +2316,7 @@
 0x4ccc mem_3212_dpi_2_new
 0x4ccd mem_3212_dpi_3_new
 0x4cce mem_3212_dpi_4_new
+0x4ccf mem_24g_reconn_pairing_switch
 0x48d4 mem_remote_car_hard_soft_switch
 0x48d5 mem_remote_car_queue_each_size
 0x48d6 mem_remote_car_queue_length
Index: output/program.lis
===================================================================
--- /YC1308AF/branch/mouse/mouse_public/output/program.lis	(revision 1654)
+++ /YC1308AF/branch/mouse/mouse_public/output/program.lis	(working copy)
@@ -12,10 +12,10 @@
 0009 c063038c beq patch18_6 ,p_mouse_app_enter_hibernate 
 000a c0640397 beq patch19_0 ,p_mouse_setgpio_hibernate 
 000b c06483c7 beq patch19_1 ,p_mouse_lpm_before_common 
-000c c0668588 beq patch19_5 ,p_mouse_motion 
+000c c0668590 beq patch19_5 ,p_mouse_motion 
 000d c067042d beq patch19_6 ,p_mouse_dpi_process 
 000e c0678460 beq patch19_7 ,p_mouse_seting_dpi 
-000f c06805a2 beq patch1a_0 ,p_mouse_check_key_gpio 
+000f c06805aa beq patch1a_0 ,p_mouse_check_key_gpio 
 0010 c0690369 beq patch1a_2 ,p_mouse_init_sunt 
 0011 c069837b beq patch1a_3 ,p_mouse_sensor_poweron 
 0012 c06a849d beq patch1a_5 ,p_mouse_priority_bb_event 
@@ -28,8 +28,8 @@
 
 pf_patch_ext:
 0019 c00f8094 beq patch23_7 ,p_twspi_reset 
-001a c042857d beq patch30_5 ,p_ui_timer_check 
-001b c0530581 beq patch34_6 ,p_le_enable_phy_by_pdata 
+001a c0428585 beq patch30_5 ,p_ui_timer_check 
+001b c0530589 beq patch34_6 ,p_le_enable_phy_by_pdata 
 001c c06e8509 beq patch3b_5 ,p_g24_dispatch 
 001d c06f0236 beq patch3b_6 ,p_g24_receive_packet 
 001e c07082b4 beq patch3c_1 ,p_g24_transmit 
@@ -37,7 +37,7 @@
 0020 c071853c beq patch3c_3 ,p_g24_pair_sm_common_next 
 0021 c0748546 beq patch3d_1 ,p_g24_reconn_dispatch 
 0022 c0750188 beq patch3d_2 ,p_g24_transmit_no_interrupt 
-0023 c0760572 beq patch3d_4 ,p_g24_lpm_wait 
+0023 c076057a beq patch3d_4 ,p_g24_lpm_wait 
 0024 2020137e branch loop 
 
 p_mouse_led_on:
@@ -1245,7 +1245,7 @@
 039e 6848c914 fetcht 1 ,mem_matrix_public_gpio 
 039f 204060e6 call gpio_clr_wake 
 03a0 6fe0c924 fetch 1 ,mem_mouse_sensor_sdio_gpio 
-03a1 204005d2 call p_mouse_gpio_config_output_high 
+03a1 204005da call p_mouse_gpio_config_output_high 
 03a2 d8400003 arg 3 ,temp 
 03a3 20403f96 call mouse_gpio_config_input_pu 
 03a4 20403e80 call mouse_lpm_before_common 
@@ -1332,7 +1332,7 @@
 
 p_mouse_3io6key_dpi_check:
 03e1 6fe0c913 fetch 1 ,mem_dpi_button_gpio 
-03e2 204005d5 call p_mouse_gpio_config_output_low 
+03e2 204005dd call p_mouse_gpio_config_output_low 
 03e3 6848c913 fetcht 1 ,mem_dpi_button_gpio 
 03e4 202041d5 branch mouse_3io6key_check 
 
@@ -1344,7 +1344,7 @@
 
 p_mouse_dpi_another_gpio_connect_gnd_check:
 03e9 6fe0cc1c fetch 1 ,mem_dpi_another_button_gpio 
-03ea 204005d2 call p_mouse_gpio_config_output_high 
+03ea 204005da call p_mouse_gpio_config_output_high 
 03eb 204003fe call p_mouse_dpi_another_check 
 03ec 6848cc1c fetcht 1 ,mem_dpi_another_button_gpio 
 03ed 20203f96 branch mouse_gpio_config_input_pu 
@@ -1353,7 +1353,7 @@
 03ee 6fe0cc1c fetch 1 ,mem_dpi_another_button_gpio 
 03ef 793ffe07 set0 gpio_active_bit ,pdata 
 03f0 67e0cc1c store 1 ,mem_dpi_another_button_gpio 
-03f1 204005d5 call p_mouse_gpio_config_output_low 
+03f1 204005dd call p_mouse_gpio_config_output_low 
 03f2 704c2000 jam mouse_dpi_another_key ,mem_mouse_key_temp_patch 
 03f3 6848cc1c fetcht 1 ,mem_dpi_another_button_gpio 
 03f4 6fe0cc1d fetch 1 ,mem_dpi_another_press_status 
@@ -1874,150 +1874,160 @@
 056b 67e1488d store 2 ,mem_24g_reconn_count 
 056c 2feffe09 isolate1 9 ,pdata 
 056d 6fe0c88f fetch 1 ,mem_24g_reconn_type 
-056e c0020570 beq pair_and_3_0_addr ,p_g24_reconn_pair_and_3_0 
-056f 202025b1 branch g24_reconn_device_fail + 7 
+056e c0010571 beq fast_conn_and_3_0_addr ,p_g24_reconn_fast_conn_and_3_0 
+056f c0020578 beq pair_and_3_0_addr ,p_g24_reconn_pair_and_3_0 
+0570 202025b1 branch g24_reconn_device_fail + 7 
+
+p_g24_reconn_fast_conn_and_3_0:
+0571 6fe0cccf fetch 1 ,mem_24g_reconn_pairing_switch 
+0572 1fe0fe01 increase 1 ,pdata 
+0573 1fe17e03 and_into 3 ,pdata 
+0574 67e0cccf store 1 ,mem_24g_reconn_pairing_switch 
+0575 c000257e beq 0 ,g24_reconn_device_3_0_addr 
+0576 c001256f beq 2 ,g24_reconn_fast_conn 
+0577 202022ef branch g24_pair_init_param 
 
 p_g24_reconn_pair_and_3_0:
-0570 2020a57e branch g24_reconn_device_3_0_addr ,true 
-0571 202022ef branch g24_pair_init_param 
+0578 2020a57e branch g24_reconn_device_3_0_addr ,true 
+0579 202022ef branch g24_pair_init_param 
 
 p_g24_lpm_wait:
-0572 6fe0cbbb fetch 1 ,mem_24g_device_led_status 
-0573 243a7ec7 nbranch disable_user ,blank 
-0574 78347c00 enable user 
-0575 20401436 call lpo_calibration 
-0576 6fe1c174 fetch 3 ,mem_clks_per_lpo 
-0577 203a7ec7 branch disable_user ,blank 
-0578 6fe0c099 fetch 1 ,mem_lpm_mode 
-0579 203a7ec7 branch disable_user ,blank 
-057a 6fe0c8c1 fetch 1 ,mem_24g_transmit_by_interrupt 
-057b c000fec7 beq g24_tx_timer_int_enable ,disable_user 
-057c 20600000 rtn 
+057a 6fe0cbbb fetch 1 ,mem_24g_device_led_status 
+057b 243a7ec7 nbranch disable_user ,blank 
+057c 78347c00 enable user 
+057d 20401436 call lpo_calibration 
+057e 6fe1c174 fetch 3 ,mem_clks_per_lpo 
+057f 203a7ec7 branch disable_user ,blank 
+0580 6fe0c099 fetch 1 ,mem_lpm_mode 
+0581 203a7ec7 branch disable_user ,blank 
+0582 6fe0c8c1 fetch 1 ,mem_24g_transmit_by_interrupt 
+0583 c000fec7 beq g24_tx_timer_int_enable ,disable_user 
+0584 20600000 rtn 
 
 p_ui_timer_check:
-057d 6fe0cbf4 fetch 1 ,mem_power_on_flag 
-057e 245a78cc ncall ui_timer_init ,blank 
-057f 704bf400 jam 0 ,mem_power_on_flag 
-0580 202078bc branch ui_timer_check + 1 
+0585 6fe0cbf4 fetch 1 ,mem_power_on_flag 
+0586 245a78cc ncall ui_timer_init ,blank 
+0587 704bf400 jam 0 ,mem_power_on_flag 
+0588 202078bc branch ui_timer_check + 1 
 
 p_le_enable_phy_by_pdata:
-0581 18427e00 copy temp ,pdata 
-0582 c2801651 bbit1 bit_le_1m_phy ,le_enable 
-0583 c2808585 bbit1 bit_le_2m_phy ,p_le_enable_2m 
-0584 2020163c branch le_enable_phy_by_pdata + 5 
+0589 18427e00 copy temp ,pdata 
+058a c2801651 bbit1 bit_le_1m_phy ,le_enable 
+058b c280858d bbit1 bit_le_2m_phy ,p_le_enable_2m 
+058c 2020163c branch le_enable_phy_by_pdata + 5 
 
 p_le_enable_2m:
-0585 20401640 call le_enable_2m 
-0586 708a6d89 jam 0x89 ,core_rx_bq_cfg0 
-0587 20600000 rtn 
+058d 20401640 call le_enable_2m 
+058e 708a6d89 jam 0x89 ,core_rx_bq_cfg0 
+058f 20600000 rtn 
 
 p_mouse_motion:
-0588 78547c00 disable user 
-0589 58000000 setarg 0 
-058a 67e348d5 store 6 ,mem_mouse_x 
-058b 20400598 call p_mouse_check_sensor_data 
-058c 58000089 setarg 0x0089 
-058d 20405d5e call twspi_write 
-058e 20400381 call p_mouse_dpi_config 
-058f 20403fbe call mouse_zwheel 
-0590 20403fc3 call mouse_t_zwheel 
-0591 204005a0 call p_mouse_key 
-0592 6fe0c8d4 fetch 1 ,mem_mouse_key 
-0593 1fe17e1f and_into 0x1f ,pdata 
-0594 67e0c8d4 store 1 ,mem_mouse_key 
-0595 24344766 nbranch mouse_drawing_optima_init ,user 
-0596 2040059d call p_mouse_drawing_optima 
-0597 20204584 branch mouse_no_data_timer_init 
+0590 78547c00 disable user 
+0591 58000000 setarg 0 
+0592 67e348d5 store 6 ,mem_mouse_x 
+0593 204005a0 call p_mouse_check_sensor_data 
+0594 58000089 setarg 0x0089 
+0595 20405d5e call twspi_write 
+0596 20400381 call p_mouse_dpi_config 
+0597 20403fbe call mouse_zwheel 
+0598 20403fc3 call mouse_t_zwheel 
+0599 204005a8 call p_mouse_key 
+059a 6fe0c8d4 fetch 1 ,mem_mouse_key 
+059b 1fe17e1f and_into 0x1f ,pdata 
+059c 67e0c8d4 store 1 ,mem_mouse_key 
+059d 24344766 nbranch mouse_drawing_optima_init ,user 
+059e 204005a5 call p_mouse_drawing_optima 
+059f 20204584 branch mouse_no_data_timer_init 
 
 p_mouse_check_sensor_data:
-0598 6fe0c4ae fetch 1 ,mem_spi_write_flash_sm 
-0599 c1800000 rtnne flash_sm_no_buys 
-059a 6fe0c92c fetch 1 ,mem_config_sensor_type 
-059b c00642b0 beq ka5857 ,mouse_p3212_sensor_motion 
-059c 20204283 branch mouse_check_sensor_data + 3 
+05a0 6fe0c4ae fetch 1 ,mem_spi_write_flash_sm 
+05a1 c1800000 rtnne flash_sm_no_buys 
+05a2 6fe0c92c fetch 1 ,mem_config_sensor_type 
+05a3 c00642b0 beq ka5857 ,mouse_p3212_sensor_motion 
+05a4 20204283 branch mouse_check_sensor_data + 3 
 
 p_mouse_drawing_optima:
-059d 6fe0c92c fetch 1 ,mem_config_sensor_type 
-059e c1018000 rtneq p3212 
-059f 20204758 branch mouse_drawing_optima 
+05a5 6fe0c92c fetch 1 ,mem_config_sensor_type 
+05a6 c1018000 rtneq p3212 
+05a7 20204758 branch mouse_drawing_optima 
 
 p_mouse_key:
-05a0 204005a2 call p_mouse_check_key_gpio 
-05a1 2020411d branch mouse_key + 1 
+05a8 204005aa call p_mouse_check_key_gpio 
+05a9 2020411d branch mouse_key + 1 
 
 p_mouse_check_key_gpio:
-05a2 6fe0cbf2 fetch 1 ,mem_sensor_shutdown_flag 
-05a3 245a4161 ncall mouse_check_key_gpio_once ,blank 
-05a4 da200000 arg 0 ,rega 
-05a5 204005a9 call p_mouse_check_lkey_gpio 
-05a6 204005b8 call p_mouse_check_bkkey_gpio 
-05a7 204005c5 call p_mouse_check_fwkey_gpio 
-05a8 2020415e branch mouse_check_key_gpio_next 
+05aa 6fe0cbf2 fetch 1 ,mem_sensor_shutdown_flag 
+05ab 245a4161 ncall mouse_check_key_gpio_once ,blank 
+05ac da200000 arg 0 ,rega 
+05ad 204005b1 call p_mouse_check_lkey_gpio 
+05ae 204005c0 call p_mouse_check_bkkey_gpio 
+05af 204005cd call p_mouse_check_fwkey_gpio 
+05b0 2020415e branch mouse_check_key_gpio_next 
 
 p_mouse_check_lkey_gpio:
-05a9 6fe0c91c fetch 1 ,mem_lbutton_gpio 
-05aa 204005d2 call p_mouse_gpio_config_output_high 
-05ab 20404164 call mouse_check_lkey_gpio 
-05ac 6848c91c fetcht 1 ,mem_lbutton_gpio 
-05ad 20403f96 call mouse_gpio_config_input_pu 
+05b1 6fe0c91c fetch 1 ,mem_lbutton_gpio 
+05b2 204005da call p_mouse_gpio_config_output_high 
+05b3 20404164 call mouse_check_lkey_gpio 
+05b4 6848c91c fetcht 1 ,mem_lbutton_gpio 
+05b5 20403f96 call mouse_gpio_config_input_pu 
 
 p_mouse_check_rkey_gpio:
-05ae 6fe0c91d fetch 1 ,mem_rbutton_gpio 
-05af 204005d2 call p_mouse_gpio_config_output_high 
-05b0 2040416a call mouse_check_rkey_gpio 
-05b1 6848c91d fetcht 1 ,mem_rbutton_gpio 
-05b2 20403f96 call mouse_gpio_config_input_pu 
+05b6 6fe0c91d fetch 1 ,mem_rbutton_gpio 
+05b7 204005da call p_mouse_gpio_config_output_high 
+05b8 2040416a call mouse_check_rkey_gpio 
+05b9 6848c91d fetcht 1 ,mem_rbutton_gpio 
+05ba 20403f96 call mouse_gpio_config_input_pu 
 
 p_mouse_check_mkey_gpio:
-05b3 6fe0c91e fetch 1 ,mem_mbutton_gpio 
-05b4 204005d2 call p_mouse_gpio_config_output_high 
-05b5 20404170 call mouse_check_mkey_gpio 
-05b6 6848c91e fetcht 1 ,mem_mbutton_gpio 
-05b7 20203f96 branch mouse_gpio_config_input_pu 
+05bb 6fe0c91e fetch 1 ,mem_mbutton_gpio 
+05bc 204005da call p_mouse_gpio_config_output_high 
+05bd 20404170 call mouse_check_mkey_gpio 
+05be 6848c91e fetcht 1 ,mem_mbutton_gpio 
+05bf 20203f96 branch mouse_gpio_config_input_pu 
 
 p_mouse_check_bkkey_gpio:
-05b8 6fe0c911 fetch 1 ,mem_bk_button_gpio 
-05b9 c17f8000 rtneq gpio_disable 
-05ba 704ba703 jam mouse_bk_key ,mem_mouse_key_temp 
-05bb 6fe0cba2 fetch 1 ,mem_mouse_bkkey_press_status 
-05bc 1fe22600 copy pdata ,regc 
-05bd 6848c911 fetcht 1 ,mem_bk_button_gpio 
-05be 6fe0c914 fetch 1 ,mem_matrix_public_gpio 
-05bf c07f85c1 beq gpio_disable ,p_mouse_3io6key_bk_check 
-05c0 2020417e branch mouse_check_bkkey_gpio_next 
+05c0 6fe0c911 fetch 1 ,mem_bk_button_gpio 
+05c1 c17f8000 rtneq gpio_disable 
+05c2 704ba703 jam mouse_bk_key ,mem_mouse_key_temp 
+05c3 6fe0cba2 fetch 1 ,mem_mouse_bkkey_press_status 
+05c4 1fe22600 copy pdata ,regc 
+05c5 6848c911 fetcht 1 ,mem_bk_button_gpio 
+05c6 6fe0c914 fetch 1 ,mem_matrix_public_gpio 
+05c7 c07f85c9 beq gpio_disable ,p_mouse_3io6key_bk_check 
+05c8 2020417e branch mouse_check_bkkey_gpio_next 
 
 p_mouse_3io6key_bk_check:
-05c1 6fe0c911 fetch 1 ,mem_bk_button_gpio 
-05c2 204005d5 call p_mouse_gpio_config_output_low 
-05c3 6848c911 fetcht 1 ,mem_bk_button_gpio 
-05c4 2020418b branch mouse_3io6key_bk_check 
+05c9 6fe0c911 fetch 1 ,mem_bk_button_gpio 
+05ca 204005dd call p_mouse_gpio_config_output_low 
+05cb 6848c911 fetcht 1 ,mem_bk_button_gpio 
+05cc 2020418b branch mouse_3io6key_bk_check 
 
 p_mouse_check_fwkey_gpio:
-05c5 6fe0c912 fetch 1 ,mem_fw_button_gpio 
-05c6 c17f8000 rtneq gpio_disable 
-05c7 704ba704 jam mouse_fw_key ,mem_mouse_key_temp 
-05c8 6fe0cba3 fetch 1 ,mem_mouse_fwkey_press_status 
-05c9 1fe22600 copy pdata ,regc 
-05ca 6848c912 fetcht 1 ,mem_fw_button_gpio 
-05cb 6fe0c914 fetch 1 ,mem_matrix_public_gpio 
-05cc c07f85ce beq gpio_disable ,p_mouse_3io6key_fw_check 
-05cd 20204197 branch mouse_check_fwkey_gpio_next 
+05cd 6fe0c912 fetch 1 ,mem_fw_button_gpio 
+05ce c17f8000 rtneq gpio_disable 
+05cf 704ba704 jam mouse_fw_key ,mem_mouse_key_temp 
+05d0 6fe0cba3 fetch 1 ,mem_mouse_fwkey_press_status 
+05d1 1fe22600 copy pdata ,regc 
+05d2 6848c912 fetcht 1 ,mem_fw_button_gpio 
+05d3 6fe0c914 fetch 1 ,mem_matrix_public_gpio 
+05d4 c07f85d6 beq gpio_disable ,p_mouse_3io6key_fw_check 
+05d5 20204197 branch mouse_check_fwkey_gpio_next 
 
 p_mouse_3io6key_fw_check:
-05ce 6fe0c912 fetch 1 ,mem_fw_button_gpio 
-05cf 204005d5 call p_mouse_gpio_config_output_low 
-05d0 6848c912 fetcht 1 ,mem_fw_button_gpio 
-05d1 202041a4 branch mouse_3io6key_fw_check 
+05d6 6fe0c912 fetch 1 ,mem_fw_button_gpio 
+05d7 204005dd call p_mouse_gpio_config_output_low 
+05d8 6848c912 fetcht 1 ,mem_fw_button_gpio 
+05d9 202041a4 branch mouse_3io6key_fw_check 
 
 p_mouse_gpio_config_output_high:
-05d2 c17f8000 rtneq gpio_disable 
-05d3 d840003f arg gpcfg_output_high ,temp 
-05d4 2020612c branch gpio_config_function_int 
+05da c17f8000 rtneq gpio_disable 
+05db d840003f arg gpcfg_output_high ,temp 
+05dc 2020612c branch gpio_config_function_int 
 
 p_mouse_gpio_config_output_low:
-05d5 c17f8000 rtneq gpio_disable 
-05d6 d840003e arg gpcfg_output_low ,temp 
-05d7 2020612c branch gpio_config_function_int 
+05dd c17f8000 rtneq gpio_disable 
+05de d840003e arg gpcfg_output_low ,temp 
+05df 2020612c branch gpio_config_function_int 
               org 0x800
 
 start:
Index: program/patch.prog
===================================================================
--- /YC1308AF/branch/mouse/mouse_public/program/patch.prog	(revision 1654)
+++ /YC1308AF/branch/mouse/mouse_public/program/patch.prog	(working copy)
@@ -2145,9 +2145,19 @@
 	store 2,mem_24g_reconn_count
 	isolate1 9,pdata	
 	fetch 1,mem_24g_reconn_type
+	beq FAST_CONN_AND_3_0_ADDR,p_g24_reconn_fast_conn_and_3_0
 	beq PAIR_AND_3_0_ADDR,p_g24_reconn_pair_and_3_0
 	branch g24_reconn_device_fail+7
 
+p_g24_reconn_fast_conn_and_3_0:
+	fetch 1,mem_24g_reconn_pairing_switch
+	increase 1,pdata
+	and_into 3,pdata
+	store 1,mem_24g_reconn_pairing_switch
+	beq 0,g24_reconn_device_3_0_addr
+	beq 2,g24_reconn_fast_conn
+	branch g24_pair_init_param
+	
 p_g24_reconn_pair_and_3_0:
 	branch g24_reconn_device_3_0_addr,true
 	branch g24_pair_init_param
Index: sched/mouse.dat
===================================================================
--- /YC1308AF/branch/mouse/mouse_public/sched/mouse.dat	(revision 1654)
+++ /YC1308AF/branch/mouse/mouse_public/sched/mouse.dat	(working copy)
@@ -232,7 +232,7 @@
 mem_lpm_mult_init:20
 
 mem_app_connection_options:06
-mem_lap:19 a3 c8 16 08 53
+mem_lap:19 a4 c8 16 08 53
 mem_local_name_length:
 'BT3.0 Mouse
 mem_sniff_param_interval:
