Index: format/app_usb.format
===================================================================
--- /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_BR-CM892G/format/app_usb.format	(revision 1737)
+++ /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_BR-CM892G/format/app_usb.format	(working copy)
@@ -184,7 +184,9 @@
 
 (
 0x01 BIND_ACKPAYLOAD
+0x08 BIND_ACKPAYLOAD_LENGTH
 0x02 USER_ACKPAYLOAD
+0x1F USER_ACKPAYLOAD_LENGTH
 
 0xcf CMD_OTA
 0xc0 CMD_OTA_START
Index: output/flash.dat
===================================================================
--- /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_BR-CM892G/output/flash.dat	(revision 1752)
+++ /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_BR-CM892G/output/flash.dat	(working copy)
@@ -9711,10 +9711,6 @@
 37
 80
 26
-70
-4d
-82
-00
 20
 40
 01
@@ -9734,15 +9730,19 @@
 20
 22
 80
-17
+16
 68
 00
 cc
 2c
-20
-7a
+c1
+84
 00
 00
+70
+4d
+82
+00
 20
 40
 02
@@ -11447,5 +11447,5 @@
 55
 00
 00
-45
-a6
+f4
+05
Index: output/program.lis
===================================================================
--- /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_BR-CM892G/output/program.lis	(revision 1752)
+++ /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_BR-CM892G/output/program.lis	(working copy)
@@ -35552,16 +35552,16 @@
 7000c 2040019e  call p_g24_transmit_receive_ack
 7000d 242c0026  nbranch z_g24_pair_txdata_retry ,sync
 7000e 24378026  nbranch z_g24_pair_txdata_retry ,user3
-7000f 704d8200  jam 0 ,mem_24g_conn_sm
-70010 204001c4  call p_g24_ackpayload_parse
-70011 68024c56  fetch 4 ,mem_24g_addr
-70012 680a4d73  fetcht 4 ,mem_24g_allpowerful_addr
-70013 98467c00  isub temp ,null
-70014 20228017  branch z_g24_auto_pair_skip_rx_length ,zero
-70015 6800cc2c  fetch 1 ,mem_24g_rxdata_length
-70016 207a0000  rtn blank
+7000f 204001c4  call p_g24_ackpayload_parse
+70010 68024c56  fetch 4 ,mem_24g_addr
+70011 680a4d73  fetcht 4 ,mem_24g_allpowerful_addr
+70012 98467c00  isub temp ,null
+70013 20228016  branch z_g24_auto_pair_skip_rx_length ,zero
+70014 6800cc2c  fetch 1 ,mem_24g_rxdata_length
+70015 c1840000  rtnne bind_ackpayload_length
 
 z_g24_auto_pair_skip_rx_length:
+70016 704d8200  jam 0 ,mem_24g_conn_sm
 70017 204002c0  call p_mouse_tx_power_init
 70018 68024c56  fetch 4 ,mem_24g_addr
 70019 680a4c3a  fetcht 4 ,mem_24g_paring_addr
Index: output/romcode.rom
===================================================================
--- /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_BR-CM892G/output/romcode.rom	(revision 1752)
+++ /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_BR-CM892G/output/romcode.rom	(working copy)
@@ -24842,14 +24842,14 @@
 2040019e
 242c0026
 24378026
-704d8200
 204001c4
 68024c56
 680a4d73
 98467c00
-20228017
+20228016
 6800cc2c
-207a0000
+c1840000
+704d8200
 204002c0
 68024c56
 680a4c3a
@@ -25090,4 +25090,4 @@
 704b0c00
 20400303
 202041d9
-0000669c
+000092ae
Index: program/z.prog
===================================================================
--- /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_BR-CM892G/program/z.prog	(revision 1752)
+++ /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_BR-CM892G/program/z.prog	(working copy)
@@ -447,18 +447,18 @@
 	call p_g24_transmit_receive_ack
 	nbranch z_g24_pair_txdata_retry,sync
 	nbranch z_g24_pair_txdata_retry,user3
-//	fetch 1,mem_24g_conn_sm
-//	set0 STATE_24G_PAIR,pdata
-//	store 1,mem_24g_conn_sm
-	jam 0,mem_24g_conn_sm
 	call p_g24_ackpayload_parse
 	fetch 4,mem_24g_addr
 	fetcht 4,mem_24g_allpowerful_addr
 	isub temp,null
 	branch z_g24_auto_pair_skip_rx_length,zero
 	fetch 1,mem_24g_rxdata_length	//ack payload length
-	rtn blank
+	rtnne BIND_ACKPAYLOAD_LENGTH
 z_g24_auto_pair_skip_rx_length:
+//	fetch 1,mem_24g_conn_sm
+//	set0 STATE_24G_PAIR,pdata
+//	store 1,mem_24g_conn_sm
+	jam 0,mem_24g_conn_sm
 	call p_mouse_tx_power_init
 	fetch 4,mem_24g_addr
 	fetcht 4,mem_24g_paring_addr