Index: output/eeprom.dat =================================================================== --- /YC1308AC/branch/mouse_project/XZR/Standard_2.4G_First/output/eeprom.dat (revision 403) +++ /YC1308AC/branch/mouse_project/XZR/Standard_2.4G_First/output/eeprom.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -c6 +92 02 c2 84 @@ -51,11 +51,11 @@ c0 50 80 -93 +86 c0 60 00 -9d +90 20 20 13 @@ -403,7 +403,7 @@ 20 3a 00 -76 +71 67 e0 cb @@ -439,31 +439,11 @@ 20 40 00 -73 -20 -40 -40 -7c -20 -40 -44 -cc -20 -40 -44 -dc -20 -40 -44 -ff -20 -40 -00 -8b +6e 20 20 44 -c2 +bd da 60 4b @@ -471,7 +451,7 @@ da 40 00 -76 +71 20 20 31 @@ -527,11 +507,11 @@ 20 41 00 -85 +80 24 41 00 -89 +84 20 20 48 @@ -560,38 +540,6 @@ 60 00 00 -da -60 -4b -77 -da -40 -00 -8e -20 -20 -45 -06 -6f -e0 -ca -c1 -c0 -7f -c2 -f8 -6f -e0 -ca -b0 -24 -3a -47 -0e -20 -20 -3e -20 6f e0 c3 @@ -639,7 +587,7 @@ c0 02 00 -a0 +93 20 20 19 @@ -655,7 +603,7 @@ c0 05 00 -a4 +97 20 20 1c @@ -675,7 +623,7 @@ c2 81 80 -ac +9f 6f e1 44 @@ -703,17 +651,17 @@ 24 22 80 -a8 +9b 24 34 00 -a8 +9b 20 20 1e 10 -b0 -82 +4a +76 aa 55 40 @@ -1880,8 +1828,8 @@ 55 3d 58 -c0 -fe +8a +f2 ff ff ff @@ -8188,5 +8136,57 @@ ff ff ff -a6 -69 +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 +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +06 +f5 Index: output/program.lis =================================================================== --- /YC1308AC/branch/mouse_project/XZR/Standard_2.4G_First/output/program.lis (revision 403) +++ /YC1308AC/branch/mouse_project/XZR/Standard_2.4G_First/output/program.lis (working copy) @@ -13,8 +13,8 @@ 000a 2020137c branch loop pf_patch_ext: -000b c0508093 beq patch34_1 ,p_le_slave_match -000c c060009d beq patch38_0 ,p_le_parse_l2cap +000b c0508086 beq patch34_1 ,p_le_slave_match +000c c0600090 beq patch38_0 ,p_le_parse_l2cap 000d 2020137c branch loop p_soft_reset: @@ -131,7 +131,7 @@ 0060 6fe0cba7 fetch 1 ,mem_mouse_device_poweron_timer_count 0061 247a0000 nrtn blank 0062 6fe0cbc1 fetch 1 ,mem_mouse_dpi_led_delay_count_init -0063 203a0076 branch p_mouse_dpi_led_blink_init ,blank +0063 203a0071 branch p_mouse_dpi_led_blink_init ,blank 0064 67e0cba8 store 1 ,mem_mouse_dpi_led_delay_count 0065 20600000 rtn @@ -142,99 +142,82 @@ 0069 20402556 call g24_reconn_timeout_timer 006a 204047cd call mouse_24g_long_sleep_param_update_timer 006b 204048be call mouse_device_poweron_timer -006c 20400073 call p_mouse_dpi_led_blink_delay_timer -006d 2040407c call mouse_dpi_key_check_long_press -006e 204044cc call mouse_bt_discovery_check -006f 204044dc call mouse_commbination_key_process -0070 204044ff call mouse_check_discovery_timeout_timer -0071 2040008b call p_mouse_check_direct_timeout_timer -0072 202044c2 branch mouse_bb_event_timer + 13 +006c 2040006e call p_mouse_dpi_led_blink_delay_timer +006d 202044bd branch mouse_bb_event_timer + 8 p_mouse_dpi_led_blink_delay_timer: -0073 da604ba8 arg mem_mouse_dpi_led_delay_count ,regc -0074 da400076 arg p_mouse_dpi_led_blink_init ,regb -0075 2020318a branch timer_single_step +006e da604ba8 arg mem_mouse_dpi_led_delay_count ,regc +006f da400071 arg p_mouse_dpi_led_blink_init ,regb +0070 2020318a branch timer_single_step p_mouse_dpi_led_blink_init: -0076 6fe0c927 fetch 1 ,mem_config_sensor_type -0077 c001c8f2 beq p3212 ,mouse_dpi_led_blink_init -0078 c005c8f2 beq ka8g2 ,mouse_dpi_led_blink_init -0079 6fe0c923 fetch 1 ,mem_dpi_led_gpio -007a 67e0c92f store 1 ,mem_mouse_struct_led_gpio -007b 6fe14bc2 fetch 2 ,mem_mouse_dpi_led_blink_time -007c 67e14930 store 2 ,mem_mouse_on_time -007d 67e14932 store 2 ,mem_mouse_off_time -007e da200000 arg 0 ,rega -007f 6848c992 fetcht 1 ,mem_mouse_dpi -0080 18408402 increase 2 ,temp -0081 18467c03 sub temp ,3 ,null -0082 20410085 call p_mouse_dpi_led_blink_init_level_4 ,positive -0083 24410089 ncall p_mouse_dpi_led_blink_count_clean ,positive -0084 202048ff branch mouse_dpi_led_blink_init_end +0071 6fe0c927 fetch 1 ,mem_config_sensor_type +0072 c001c8f2 beq p3212 ,mouse_dpi_led_blink_init +0073 c005c8f2 beq ka8g2 ,mouse_dpi_led_blink_init +0074 6fe0c923 fetch 1 ,mem_dpi_led_gpio +0075 67e0c92f store 1 ,mem_mouse_struct_led_gpio +0076 6fe14bc2 fetch 2 ,mem_mouse_dpi_led_blink_time +0077 67e14930 store 2 ,mem_mouse_on_time +0078 67e14932 store 2 ,mem_mouse_off_time +0079 da200000 arg 0 ,rega +007a 6848c992 fetcht 1 ,mem_mouse_dpi +007b 18408402 increase 2 ,temp +007c 18467c03 sub temp ,3 ,null +007d 20410080 call p_mouse_dpi_led_blink_init_level_4 ,positive +007e 24410084 ncall p_mouse_dpi_led_blink_count_clean ,positive +007f 202048ff branch mouse_dpi_led_blink_init_end p_mouse_dpi_led_blink_init_level_4: -0085 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -0086 c40e0000 rtnbit0 mouse_enable_dpi_level_4 -0087 18408401 increase 1 ,temp -0088 20600000 rtn +0080 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +0081 c40e0000 rtnbit0 mouse_enable_dpi_level_4 +0082 18408401 increase 1 ,temp +0083 20600000 rtn p_mouse_dpi_led_blink_count_clean: -0089 184085fd increase -3 ,temp -008a 20600000 rtn - -p_mouse_check_direct_timeout_timer: -008b da604b77 arg mem_mouse_direct_timer ,regc -008c da40008e arg p_mouse_check_direct_timeout ,regb -008d 20204506 branch mouse_check_direct_timeout_timer + 2 - -p_mouse_check_direct_timeout: -008e 6fe0cac1 fetch 1 ,mem_mouse_bluetooth_fast_conn_flag -008f c07fc2f8 beq 0xff ,mouse_buletooth_fast_conn_end -0090 6fe0cab0 fetch 1 ,mem_reconn_times -0091 243a470e nbranch mouse_polling_device ,blank -0092 20203e20 branch mouse_app_enter_hibernate +0084 184085fd increase -3 ,temp +0085 20600000 rtn p_le_slave_match: -0093 6fe0c3dd fetch 1 ,mem_le_md_count -0094 1fe0fe01 pincrease 1 -0095 67e0c3dd store 1 ,mem_le_md_count -0096 c006165a beq le_md_max_count ,le_slave_cont -0097 2040191b call le_acknowledge -0098 2040196a call le_prepare_tx -0099 6fe082bd fetch 1 ,mem_le_tx_phy -009a 2040168b call le_enable_phy_by_pdata -009b 20401838 call le_transmit -009c 20201655 branch le_slave_match + 10 +0086 6fe0c3dd fetch 1 ,mem_le_md_count +0087 1fe0fe01 pincrease 1 +0088 67e0c3dd store 1 ,mem_le_md_count +0089 c006165a beq le_md_max_count ,le_slave_cont +008a 2040191b call le_acknowledge +008b 2040196a call le_prepare_tx +008c 6fe082bd fetch 1 ,mem_le_tx_phy +008d 2040168b call le_enable_phy_by_pdata +008e 20401838 call le_transmit +008f 20201655 branch le_slave_match + 10 p_le_parse_l2cap: -009d efe10006 ifetch 2 ,contr -009e c00200a0 beq le_l2cap_cid_att ,p_le_parse_att -009f 202019e4 branch le_parse_l2cap2 + 3 +0090 efe10006 ifetch 2 ,contr +0091 c0020093 beq le_l2cap_cid_att ,p_le_parse_att +0092 202019e4 branch le_parse_l2cap2 + 3 p_le_parse_att: -00a0 efe18006 ifetch 3 ,contr -00a1 67e1c436 store 3 ,mem_le_att_opcode -00a2 c00500a4 beq attop_read_request ,p_le_parse_att_read_request -00a3 20201cd3 branch le_parse_att + 2 +0093 efe18006 ifetch 3 ,contr +0094 67e1c436 store 3 ,mem_le_att_opcode +0095 c0050097 beq attop_read_request ,p_le_parse_att_read_request +0096 20201cd3 branch le_parse_att + 2 p_le_parse_att_read_request: -00a4 20401e8d call le_check_encrypt_state -00a5 68494437 fetcht 2 ,mem_le_att_handle -00a6 6fe0c3c0 fetch 1 ,mem_le_configuration -00a7 c28180ac bbit1 bit_ble_read_auth ,p_le_send_att_read_response_check_auth +0097 20401e8d call le_check_encrypt_state +0098 68494437 fetcht 2 ,mem_le_att_handle +0099 6fe0c3c0 fetch 1 ,mem_le_configuration +009a c281809f bbit1 bit_ble_read_auth ,p_le_send_att_read_response_check_auth p_le_send_att_read_response: -00a8 6fe14437 fetch 2 ,mem_le_att_handle -00a9 c0181ec8 beq 0x30 ,le_send_att_error_response_notfound -00aa 68494437 fetcht 2 ,mem_le_att_handle -00ab 20201deb branch le_send_att_read_response +009b 6fe14437 fetch 2 ,mem_le_att_handle +009c c0181ec8 beq 0x30 ,le_send_att_error_response_notfound +009d 68494437 fetcht 2 ,mem_le_att_handle +009e 20201deb branch le_send_att_read_response p_le_send_att_read_response_check_auth: -00ac 6fe143d1 fetch 2 ,mem_le_pairing_handle -00ad 98467c00 isub temp ,null -00ae 242280a8 nbranch p_le_send_att_read_response ,zero -00af 243400a8 nbranch p_le_send_att_read_response ,user -00b0 20201e10 branch le_send_att_read_response_error_insufficient_auth +009f 6fe143d1 fetch 2 ,mem_le_pairing_handle +00a0 98467c00 isub temp ,null +00a1 2422809b nbranch p_le_send_att_read_response ,zero +00a2 2434009b nbranch p_le_send_att_read_response ,user +00a3 20201e10 branch le_send_att_read_response_error_insufficient_auth org 0x800 start: Index: program/patch.prog =================================================================== --- /YC1308AC/branch/mouse_project/XZR/Standard_2.4G_First/program/patch.prog (revision 403) +++ /YC1308AC/branch/mouse_project/XZR/Standard_2.4G_First/program/patch.prog (working copy) @@ -159,15 +159,7 @@ //led call mouse_device_poweron_timer call p_mouse_dpi_led_blink_delay_timer - - call mouse_dpi_key_check_long_press - call mouse_bt_discovery_check - call mouse_commbination_key_process - call mouse_check_discovery_timeout_timer - //ble - call p_mouse_check_direct_timeout_timer - - branch mouse_bb_event_timer+13 + branch mouse_bb_event_timer+8 p_mouse_dpi_led_blink_delay_timer: arg mem_mouse_dpi_led_delay_count,regc @@ -201,19 +193,6 @@ increase -3,temp // 4-->1 5-->2 rtn ///////////////////////////////////////////////////////////////////////////////////////////////// -p_mouse_check_direct_timeout_timer: - arg mem_mouse_direct_timer,regc - arg p_mouse_check_direct_timeout,regb - branch mouse_check_direct_timeout_timer+2 - -p_mouse_check_direct_timeout: - fetch 1,mem_mouse_bluetooth_fast_conn_flag - beq 0xff,mouse_buletooth_fast_conn_end - fetch 1,mem_reconn_times - nbranch mouse_polling_device,blank - branch mouse_app_enter_hibernate - - p_le_slave_match: fetch 1,mem_le_md_count pincrease 1