Index: format/g24.format =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/CQ05_PB/format/g24.format (revision 1481) +++ /branch/mouse_project/YJX_Project/YJX_1066/CQ05_PB/format/g24.format (working copy) @@ -126,7 +126,7 @@ 1 mem_24g_transmit_by_interrupt 2 mem_24g_transmit_by_interrupt_exit_count 2 mem_24g_transmit_by_interrupt_exit_count_init - +4 mem_24g_allpowerful_addr 1 mem_24g_stop_g24_mode 2 mem_24g_stop_g24_mode_timeout Index: output/flash.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/CQ05_PB/output/flash.dat (revision 1481) +++ /branch/mouse_project/YJX_Project/YJX_1066/CQ05_PB/output/flash.dat (working copy) @@ -631,7 +631,7 @@ 68 00 cd -44 +48 c2 80 80 @@ -658,7 +658,7 @@ cf 70 4d -43 +47 0a 20 40 @@ -871,14 +871,14 @@ 68 00 cd -42 +46 c1 82 00 00 70 4d -42 +46 00 20 40 @@ -1067,7 +1067,7 @@ 60 01 cd -40 +44 20 60 00 @@ -1075,7 +1075,7 @@ 68 00 cd -43 +47 24 7a 00 @@ -1091,7 +1091,7 @@ 68 00 cd -42 +46 1f e0 fe @@ -1099,7 +1099,7 @@ 60 00 cd -42 +46 20 40 01 @@ -1111,7 +1111,7 @@ 68 00 cd -42 +46 c0 82 01 @@ -1119,7 +1119,7 @@ 68 00 cd -41 +45 1f e0 fe @@ -1127,7 +1127,7 @@ 60 00 cd -41 +45 c0 04 01 @@ -1138,12 +1138,12 @@ 00 70 4d -41 +45 00 68 00 cd -40 +44 c3 80 00 @@ -1155,7 +1155,7 @@ 60 00 cd -40 +44 58 00 07 @@ -1178,16 +1178,16 @@ 08 70 4d -41 +45 00 70 4d -42 +46 04 68 00 cd -40 +44 c4 00 00 @@ -1199,7 +1199,7 @@ 60 00 cd -40 +44 20 40 3f @@ -2098,7 +2098,7 @@ 26 70 4d -44 +48 00 20 40 @@ -4627,7 +4627,7 @@ da 60 4d -43 +47 da 40 00 @@ -4639,7 +4639,7 @@ da 60 4d -3c +40 da 40 04 @@ -4650,7 +4650,7 @@ 74 70 4d -3b +3f 01 20 60 @@ -8156,8 +8156,8 @@ 20 07 f1 -dd -dc +78 +ef aa 55 08 @@ -8989,6 +8989,16 @@ 05 aa 55 +04 +00 +3b +4d +0f +0f +0f +0f +aa +55 0a 00 9e @@ -9111,7 +9121,7 @@ 00 4f 4b -a2 +ac 2f 00 ff @@ -10402,7 +10412,7 @@ 68 00 cd -3b +3f c0 00 ad @@ -10450,28 +10460,36 @@ 24 2c 00 -24 +26 24 37 80 -24 -68 -00 -cd -44 -79 -3f -fe -01 -60 +26 +70 +4d +48 00 -cd -44 20 40 01 e5 68 +02 +4c +1e +68 +0a +4d +3b +98 +46 +7c +00 +20 +22 +80 +17 +68 00 cb f4 @@ -10514,7 +10532,7 @@ 20 42 80 -22 +24 70 4b 40 @@ -10558,11 +10576,11 @@ c0 00 00 -2b +2d c0 01 00 -35 +37 20 20 01 @@ -10582,7 +10600,7 @@ 68 00 cd -3e +42 60 00 cc @@ -10590,11 +10608,11 @@ 20 40 00 -33 +35 60 08 cd -3e +42 20 60 00 @@ -10611,22 +10629,18 @@ 41 de 20 -58 -00 -0f -0f +68 +02 +4d +3b 60 -01 +02 4c 1e -e0 -a1 -00 -00 68 00 cd -3f +43 60 00 cc @@ -10634,11 +10648,11 @@ 20 40 00 -33 +35 60 08 cd -3f +43 20 60 00 @@ -10647,10 +10661,6 @@ 00 00 00 -00 -00 -00 -00 20 20 00 @@ -10750,7 +10760,7 @@ 60 01 cd -3b +3f 20 60 00 @@ -10758,7 +10768,7 @@ 68 00 cd -3b +3f c0 00 ad @@ -10782,7 +10792,7 @@ 68 00 cd -44 +48 79 3f fe @@ -10790,7 +10800,7 @@ 60 00 cd -44 +48 70 4b 40 @@ -10942,7 +10952,7 @@ 68 00 cd -44 +48 79 20 7e @@ -10950,7 +10960,7 @@ 60 00 cd -44 +48 20 40 01 @@ -11006,7 +11016,7 @@ 68 00 cd -44 +48 79 20 7e @@ -11014,7 +11024,7 @@ 60 00 cd -44 +48 58 00 07 @@ -11022,10 +11032,10 @@ 60 01 4d -3c +40 70 4d -3b +3f 00 20 60 @@ -12191,5 +12201,5 @@ 55 00 00 -fb -e2 +2f +71 Index: output/memmap.format =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/CQ05_PB/output/memmap.format (revision 1481) +++ /branch/mouse_project/YJX_Project/YJX_1066/CQ05_PB/output/memmap.format (working copy) @@ -1941,12 +1941,13 @@ 0x4d36 mem_24g_transmit_by_interrupt 0x4d37 mem_24g_transmit_by_interrupt_exit_count 0x4d39 mem_24g_transmit_by_interrupt_exit_count_init -0x4d3b mem_24g_stop_g24_mode -0x4d3c mem_24g_stop_g24_mode_timeout -0x4d3e mem_24g_pair_current_ch_num -0x4d3f mem_24g_powerful_current_ch_num -0x4d40 mem_24g_search_dongle_action -0x4d41 mem_24g_search_dongle_count -0x4d42 mem_24g_search_dongle_ch -0x4d43 mem_24g_search_dongle_delay_count -0x4d44 mem_24g_conn_sm +0x4d3b mem_24g_allpowerful_addr +0x4d3f mem_24g_stop_g24_mode +0x4d40 mem_24g_stop_g24_mode_timeout +0x4d42 mem_24g_pair_current_ch_num +0x4d43 mem_24g_powerful_current_ch_num +0x4d44 mem_24g_search_dongle_action +0x4d45 mem_24g_search_dongle_count +0x4d46 mem_24g_search_dongle_ch +0x4d47 mem_24g_search_dongle_delay_count +0x4d48 mem_24g_conn_sm Index: output/program.lis =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/CQ05_PB/output/program.lis (revision 1481) +++ /branch/mouse_project/YJX_Project/YJX_1066/CQ05_PB/output/program.lis (working copy) @@ -188,7 +188,7 @@ p_g24_dispatch: 009b c6930000 rtnmark0 mark_24g -009c 6800cd44 fetch 1 ,mem_24g_conn_sm +009c 6800cd48 fetch 1 ,mem_24g_conn_sm 009d c28080b0 bbit1 state_24g_pair ,p_g24_pair_dispatch 009e c28100b2 bbit1 state_24g_reconn ,p_g24_reconn_dispatch 009f 6800cd36 fetch 1 ,mem_24g_transmit_by_interrupt @@ -197,7 +197,7 @@ p_g24_transmit_process: 00a1 2040017c call p_g24_txdata_prep 00a2 243400cf nbranch p_g24_nodata_transmit ,user -00a3 704d430a jam 10 ,mem_24g_search_dongle_delay_count +00a3 704d470a jam 10 ,mem_24g_search_dongle_delay_count 00a4 20400157 call p_g24_rf_sta_check p_g24_transmit_start: @@ -272,9 +272,9 @@ 00d5 6800cd36 fetch 1 ,mem_24g_transmit_by_interrupt 00d6 c1008000 rtneq g24_tx_timer_int_enable 00d7 2040010b call p_g24_search_dongle -00d8 6800cd42 fetch 1 ,mem_24g_search_dongle_ch +00d8 6800cd46 fetch 1 ,mem_24g_search_dongle_ch 00d9 c1820000 rtnne g24_ch_number -00da 704d4200 jam 0 ,mem_24g_search_dongle_ch +00da 704d4600 jam 0 ,mem_24g_search_dongle_ch p_g24_long_sleep: 00db 204000e1 call p_g24_lpm_wait @@ -335,35 +335,35 @@ p_g24_search_dongle_init: 0108 58000000 setarg 0 -0109 6001cd40 store 3 ,mem_24g_search_dongle_action +0109 6001cd44 store 3 ,mem_24g_search_dongle_action 010a 20600000 rtn p_g24_search_dongle: -010b 6800cd43 fetch 1 ,mem_24g_search_dongle_delay_count +010b 6800cd47 fetch 1 ,mem_24g_search_dongle_delay_count 010c 247a0000 nrtn blank 010d 6800cc22 fetch 1 ,mem_24g_abort_pac 010e 207a0000 rtn blank p_g24_search_dongle_loop: -010f 6800cd42 fetch 1 ,mem_24g_search_dongle_ch +010f 6800cd46 fetch 1 ,mem_24g_search_dongle_ch 0110 1fe0fe01 increase 1 ,pdata -0111 6000cd42 store 1 ,mem_24g_search_dongle_ch +0111 6000cd46 store 1 ,mem_24g_search_dongle_ch 0112 2040016a call p_g24_ch 0113 204000fa call p_g24_send_abort_packet1 -0114 6800cd42 fetch 1 ,mem_24g_search_dongle_ch +0114 6800cd46 fetch 1 ,mem_24g_search_dongle_ch 0115 c082010f bne g24_ch_number ,p_g24_search_dongle_loop -0116 6800cd41 fetch 1 ,mem_24g_search_dongle_count +0116 6800cd45 fetch 1 ,mem_24g_search_dongle_count 0117 1fe0fe01 increase 1 ,pdata -0118 6000cd41 store 1 ,mem_24g_search_dongle_count +0118 6000cd45 store 1 ,mem_24g_search_dongle_count 0119 c004011b beq g24_ch_poll_count ,p_g24_search_dongle_check 011a 20600000 rtn p_g24_search_dongle_check: -011b 704d4100 jam 0 ,mem_24g_search_dongle_count -011c 6800cd40 fetch 1 ,mem_24g_search_dongle_action +011b 704d4500 jam 0 ,mem_24g_search_dongle_count +011c 6800cd44 fetch 1 ,mem_24g_search_dongle_action 011d c3800000 rtnbit1 g24_disconn_state 011e 79207e00 set1 g24_disconn_state ,pdata -011f 6000cd40 store 1 ,mem_24g_search_dongle_action +011f 6000cd44 store 1 ,mem_24g_search_dongle_action 0120 58000708 setarg g24_disconn_nodata_timer 0121 600146b0 store 2 ,mem_mouse_no_data_timer 0122 2020044d branch p_mouse_sensor_powerdown @@ -371,12 +371,12 @@ p_g24_search_dongle_success: 0123 6800cc22 fetch 1 ,mem_24g_abort_pac 0124 203a0108 branch p_g24_search_dongle_init ,blank -0125 704d4100 jam 0 ,mem_24g_search_dongle_count -0126 704d4204 jam g24_ch_number ,mem_24g_search_dongle_ch -0127 6800cd40 fetch 1 ,mem_24g_search_dongle_action +0125 704d4500 jam 0 ,mem_24g_search_dongle_count +0126 704d4604 jam g24_ch_number ,mem_24g_search_dongle_ch +0127 6800cd44 fetch 1 ,mem_24g_search_dongle_action 0128 c4000000 rtnbit0 g24_disconn_state 0129 793ffe00 set0 g24_disconn_state ,pdata -012a 6000cd40 store 1 ,mem_24g_search_dongle_action +012a 6000cd44 store 1 ,mem_24g_search_dongle_action 012b 20403f8d call mouse_no_data_timer_init 012c 202003f8 branch p_mouse_init_sensor_reset @@ -695,7 +695,7 @@ p_g24_check_51cmd_stop_24g: 020a 793f8026 set0 mark_24g ,mark -020b 704d4400 jam state_24g_stop ,mem_24g_conn_sm +020b 704d4800 jam state_24g_stop ,mem_24g_conn_sm 020c 204053ce call le_disable p_mouse_disable_g24_pairing_flag: @@ -1553,17 +1553,17 @@ 0482 2020035c branch p_mouse_fast_conn_init p_mouse_g24_search_dongle_delay_timer: -0483 da604d43 arg mem_24g_search_dongle_delay_count ,regc +0483 da604d47 arg mem_24g_search_dongle_delay_count ,regc 0484 da400000 arg 0 ,regb 0485 2020336d branch timer_single_step p_mouse_g24_stop_mode_timeout_timer: -0486 da604d3c arg mem_24g_stop_g24_mode_timeout ,regc +0486 da604d40 arg mem_24g_stop_g24_mode_timeout ,regc 0487 da400489 arg p_mouse_g24_stop_mode_timeout ,regb 0488 20203374 branch timer_single_step_2b p_mouse_g24_stop_mode_timeout: -0489 704d3b01 jam 1 ,mem_24g_stop_g24_mode +0489 704d3f01 jam 1 ,mem_24g_stop_g24_mode 048a 20600000 rtn p_mouse_select_device: @@ -35693,9 +35693,9 @@ 50005 2040000e call z_g24_factory_check 50006 20340208 branch p_g24_auto_pair_start ,user 50007 79200026 set1 mark_24g ,mark -50008 6800cd44 fetch 1 ,mem_24g_conn_sm +50008 6800cd48 fetch 1 ,mem_24g_conn_sm 50009 79207e02 set1 state_24g_reconn ,pdata -5000a 6000cd44 store 1 ,mem_24g_conn_sm +5000a 6000cd48 store 1 ,mem_24g_conn_sm 5000b 204001f1 call p_g24_syncword_crc8 5000c 2040016a call p_g24_ch 5000d 2020001b branch z_g24_auto_pair_timeout_init @@ -35715,14 +35715,14 @@ z_g24_auto_pair_start: 50017 79200026 set1 mark_24g ,mark -50018 6800cd44 fetch 1 ,mem_24g_conn_sm +50018 6800cd48 fetch 1 ,mem_24g_conn_sm 50019 79207e01 set1 state_24g_pair ,pdata -5001a 6000cd44 store 1 ,mem_24g_conn_sm +5001a 6000cd48 store 1 ,mem_24g_conn_sm z_g24_auto_pair_timeout_init: 5001b 58000708 setarg g24_disconn_nodata_timer -5001c 60014d3c store 2 ,mem_24g_stop_g24_mode_timeout -5001d 704d3b00 jam 0 ,mem_24g_stop_g24_mode +5001c 60014d40 store 2 ,mem_24g_stop_g24_mode_timeout +5001d 704d3f00 jam 0 ,mem_24g_stop_g24_mode 5001e 20600000 rtn z_mouse_24g_pairing_button: @@ -35773,19 +35773,19 @@ z_g24_auto_pair_timeout_clear: 60017 58000000 setarg 0 -60018 6001cd3b store 3 ,mem_24g_stop_g24_mode +60018 6001cd3f store 3 ,mem_24g_stop_g24_mode 60019 20600000 rtn z_g24_reconn_dispatch: -6001a 6800cd3b fetch 1 ,mem_24g_stop_g24_mode +6001a 6800cd3f fetch 1 ,mem_24g_stop_g24_mode 6001b c000add4 beq 1 ,g24_stop_24g_mode 6001c 20400029 call z_g24_tx_attemp_data_prep 6001d 204001bb call p_g24_transmit_receive_ack 6001e 242c016a nbranch p_g24_ch ,sync 6001f 2437816a nbranch p_g24_ch ,user3 -60020 6800cd44 fetch 1 ,mem_24g_conn_sm +60020 6800cd48 fetch 1 ,mem_24g_conn_sm 60021 793ffe02 set0 state_24g_reconn ,pdata -60022 6000cd44 store 1 ,mem_24g_conn_sm +60022 6000cd48 store 1 ,mem_24g_conn_sm z_g24_tx_attemp_dongle_succ: 60023 704b4000 jam 0 ,mem_mouse_long_mult_flag @@ -35812,7 +35812,7 @@ z_entrance6: z_g24_pair_dispatch: -70001 6800cd3b fetch 1 ,mem_24g_stop_g24_mode +70001 6800cd3f fetch 1 ,mem_24g_stop_g24_mode 70002 c000add4 beq 1 ,g24_stop_24g_mode 70003 70119eff jam 0xff ,mem_24g_common_temp 70004 6800cbf7 fetch 1 ,mem_24g_data_type @@ -35824,67 +35824,70 @@ 7000a 2040020f call p_g24_put_data_in_buff 7000b 20400221 call p_g24_transmit_prep 7000c 204001bb call p_g24_transmit_receive_ack -7000d 242c0024 nbranch z_g24_pair_txdata_retry ,sync -7000e 24378024 nbranch z_g24_pair_txdata_retry ,user3 -7000f 6800cd44 fetch 1 ,mem_24g_conn_sm -70010 793ffe01 set0 state_24g_pair ,pdata -70011 6000cd44 store 1 ,mem_24g_conn_sm -70012 204001e5 call p_g24_ackpayload_parse -70013 6800cbf4 fetch 1 ,mem_24g_rxdata_length -70014 207a0000 rtn blank -70015 204002e2 call p_mouse_tx_power_init -70016 68024c1e fetch 4 ,mem_24g_addr -70017 680a4c02 fetcht 4 ,mem_24g_paring_addr -70018 98467c00 isub temp ,null -70019 202281fe branch p_g24_start_pairing_sm1 ,zero -7001a 68024c1e fetch 4 ,mem_24g_addr -7001b 680a4c2d fetcht 4 ,mem_24g_device_addr -7001c 98467c00 isub temp ,null -7001d 20428022 call z7_g24_store_dongle_addr ,zero -7001e 704b4000 jam 0 ,mem_mouse_long_mult_flag -7001f 20402f20 call g24_app_tx_attempt_success -70020 204001b3 call p_g24_txbuf_clear -70021 20200385 branch p_g24_transmit_by_interrupt_enable +7000d 242c0026 nbranch z_g24_pair_txdata_retry ,sync +7000e 24378026 nbranch z_g24_pair_txdata_retry ,user3 +7000f 704d4800 jam 0 ,mem_24g_conn_sm +70010 204001e5 call p_g24_ackpayload_parse +70011 68024c1e fetch 4 ,mem_24g_addr +70012 680a4d3b fetcht 4 ,mem_24g_allpowerful_addr +70013 98467c00 isub temp ,null +70014 20228017 branch z_g24_auto_pair_skip_rx_length ,zero +70015 6800cbf4 fetch 1 ,mem_24g_rxdata_length +70016 207a0000 rtn blank + +z_g24_auto_pair_skip_rx_length: +70017 204002e2 call p_mouse_tx_power_init +70018 68024c1e fetch 4 ,mem_24g_addr +70019 680a4c02 fetcht 4 ,mem_24g_paring_addr +7001a 98467c00 isub temp ,null +7001b 202281fe branch p_g24_start_pairing_sm1 ,zero +7001c 68024c1e fetch 4 ,mem_24g_addr +7001d 680a4c2d fetcht 4 ,mem_24g_device_addr +7001e 98467c00 isub temp ,null +7001f 20428024 call z7_g24_store_dongle_addr ,zero +70020 704b4000 jam 0 ,mem_mouse_long_mult_flag +70021 20402f20 call g24_app_tx_attempt_success +70022 204001b3 call p_g24_txbuf_clear +70023 20200385 branch p_g24_transmit_by_interrupt_enable z7_g24_store_dongle_addr: -70022 68024bd6 fetch 4 ,mem_24g_rxpayload + 2 -70023 202001f0 branch p_g24_update_addr_and_synccrc8 +70024 68024bd6 fetch 4 ,mem_24g_rxpayload + 2 +70025 202001f0 branch p_g24_update_addr_and_synccrc8 z_g24_pair_txdata_retry: z_g24_pair_txdata_switch: -70024 6800cd34 fetch 1 ,mem_24g_auto_paring_switch -70025 1fe0fe01 increase 1 ,pdata -70026 1fe17e03 and_into 3 ,pdata -70027 6000cd34 store 1 ,mem_24g_auto_paring_switch -70028 c000002b beq 0 ,z_g24_auto_pair_first_attemp -70029 c0010035 beq 2 ,z_g24_auto_pair_all_powerful -7002a 202001ec branch p_g24_pair_init +70026 6800cd34 fetch 1 ,mem_24g_auto_paring_switch +70027 1fe0fe01 increase 1 ,pdata +70028 1fe17e03 and_into 3 ,pdata +70029 6000cd34 store 1 ,mem_24g_auto_paring_switch +7002a c000002d beq 0 ,z_g24_auto_pair_first_attemp +7002b c0010037 beq 2 ,z_g24_auto_pair_all_powerful +7002c 202001ec branch p_g24_pair_init z_g24_auto_pair_first_attemp: -7002b 204002e2 call p_mouse_tx_power_init -7002c 68024c2d fetch 4 ,mem_24g_device_addr -7002d 60024c1e store 4 ,mem_24g_addr -7002e 6800cd3e fetch 1 ,mem_24g_pair_current_ch_num -7002f 6000cc01 store 1 ,mem_24g_current_ch_number -70030 20400033 call z_g24_ch_syncword_crc8_init -70031 6008cd3e storet 1 ,mem_24g_pair_current_ch_num -70032 20600000 rtn +7002d 204002e2 call p_mouse_tx_power_init +7002e 68024c2d fetch 4 ,mem_24g_device_addr +7002f 60024c1e store 4 ,mem_24g_addr +70030 6800cd42 fetch 1 ,mem_24g_pair_current_ch_num +70031 6000cc01 store 1 ,mem_24g_current_ch_number +70032 20400035 call z_g24_ch_syncword_crc8_init +70033 6008cd42 storet 1 ,mem_24g_pair_current_ch_num +70034 20600000 rtn z_g24_ch_syncword_crc8_init: -70033 204001f1 call p_g24_syncword_crc8 -70034 2020016a branch p_g24_ch +70035 204001f1 call p_g24_syncword_crc8 +70036 2020016a branch p_g24_ch z_g24_auto_pair_all_powerful: -70035 7041de20 jam tx_power_pair ,mem_tx_power -70036 58000f0f setarg 0x0f0f -70037 60014c1e store 2 ,mem_24g_addr -70038 e0a10000 istore 2 ,contw -70039 6800cd3f fetch 1 ,mem_24g_powerful_current_ch_num -7003a 6000cc01 store 1 ,mem_24g_current_ch_number -7003b 20400033 call z_g24_ch_syncword_crc8_init -7003c 6008cd3f storet 1 ,mem_24g_powerful_current_ch_num -7003d 20600000 rtn +70037 7041de20 jam tx_power_pair ,mem_tx_power +70038 68024d3b fetch 4 ,mem_24g_allpowerful_addr +70039 60024c1e store 4 ,mem_24g_addr +7003a 6800cd43 fetch 1 ,mem_24g_powerful_current_ch_num +7003b 6000cc01 store 1 ,mem_24g_current_ch_number +7003c 20400035 call z_g24_ch_syncword_crc8_init +7003d 6008cd43 storet 1 ,mem_24g_powerful_current_ch_num +7003e 20600000 rtn org 0x80001 z_entrance7: Index: output/romcode.rom =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/CQ05_PB/output/romcode.rom (revision 1481) +++ /branch/mouse_project/YJX_Project/YJX_1066/CQ05_PB/output/romcode.rom (working copy) @@ -24757,9 +24757,9 @@ 2040000e 20340208 79200026 -6800cd44 +6800cd48 79207e02 -6000cd44 +6000cd48 204001f1 2040016a 2020001b @@ -24773,12 +24773,12 @@ c2000012 20600000 79200026 -6800cd44 +6800cd48 79207e01 -6000cd44 +6000cd48 58000708 -60014d3c -704d3b00 +60014d40 +704d3f00 20600000 680246d3 c4088000 @@ -24816,17 +24816,17 @@ 20404366 20200317 58000000 -6001cd3b +6001cd3f 20600000 -6800cd3b +6800cd3f c000add4 20400029 204001bb 242c016a 2437816a -6800cd44 +6800cd48 793ffe02 -6000cd44 +6000cd48 704b4000 20402f20 204001b3 @@ -24842,7 +24842,7 @@ da20119e 2040020f 20200221 -6800cd3b +6800cd3f c000add4 70119eff 6800cbf7 @@ -24854,12 +24854,14 @@ 2040020f 20400221 204001bb -242c0024 -24378024 -6800cd44 -793ffe01 -6000cd44 +242c0026 +24378026 +704d4800 204001e5 +68024c1e +680a4d3b +98467c00 +20228017 6800cbf4 207a0000 204002e2 @@ -24870,7 +24872,7 @@ 68024c1e 680a4c2d 98467c00 -20428022 +20428024 704b4000 20402f20 204001b3 @@ -24881,27 +24883,26 @@ 1fe0fe01 1fe17e03 6000cd34 -c000002b -c0010035 +c000002d +c0010037 202001ec 204002e2 68024c2d 60024c1e -6800cd3e +6800cd42 6000cc01 -20400033 -6008cd3e +20400035 +6008cd42 20600000 204001f1 2020016a 7041de20 -58000f0f -60014c1e -e0a10000 -6800cd3f +68024d3b +60024c1e +6800cd43 6000cc01 -20400033 -6008cd3f +20400035 +6008cd43 20600000 c0380003 20600000 @@ -25108,4 +25109,4 @@ 704b0100 704b0a00 202041d9 -00009474 +0000ed8b Index: program/z.prog =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/CQ05_PB/program/z.prog (revision 1481) +++ /branch/mouse_project/YJX_Project/YJX_1066/CQ05_PB/program/z.prog (working copy) @@ -419,12 +419,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 +// 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 1,mem_24g_rxdata_length //ack payload length + 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 +z_g24_auto_pair_skip_rx_length: call p_mouse_tx_power_init fetch 4,mem_24g_addr fetcht 4,mem_24g_paring_addr @@ -469,9 +475,8 @@ z_g24_auto_pair_all_powerful: jam TX_POWER_PAIR,mem_tx_power - setarg 0x0f0f - store 2,mem_24g_addr - istore 2,contw + fetch 4,mem_24g_allpowerful_addr + store 4,mem_24g_addr fetch 1,mem_24g_powerful_current_ch_num store 1,mem_24g_current_ch_number call z_g24_ch_syncword_crc8_init @@ -704,9 +709,6 @@ call mouse_devce_led_off call mouse_before_hibernate_wheel_gpio_set call p_mouse_setgpio_hibernate -// fetch 1,mem_device_flag -// sub pdata,MODE_24G_DEVICE,null -// call p_mouse_select_device_button_gpio_set_suspend,zero call p_flash_deep_power_down hfetch 1,core_gpio_sel1 Index: sched/mouse.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/CQ05_PB/sched/mouse.dat (revision 1481) +++ /branch/mouse_project/YJX_Project/YJX_1066/CQ05_PB/sched/mouse.dat (working copy) @@ -259,6 +259,7 @@ mem_24g_ch_map4:11 23 31 4d mem_24g_pairing_sm:ff mem_24g_paring_addr:20 15 10 05 +mem_24g_allpowerful_addr:0f 0f 0f 0f mem_24g_common_temp:00 00 00 00 00 00 00 00 00 00 mem_24g_enter_hibernate:80 ee 36