Index: output/eeprom.dat =================================================================== --- /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/PB_3m_3ch_XH8004/output/eeprom.dat (revision 4791) +++ /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/PB_3m_3ch_XH8004/output/eeprom.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -ea +ee 19 c2 84 @@ -79,7 +79,7 @@ c0 67 86 -1c +1d c0 68 03 @@ -211,7 +211,7 @@ c0 76 86 -4c +4d 20 20 13 @@ -2151,7 +2151,7 @@ 20 40 06 -71 +72 20 40 27 @@ -3614,8 +3614,8 @@ 17 c0 2c -42 -20 +03 +8a 20 40 41 @@ -6059,7 +6059,7 @@ 20 40 05 -f4 +f5 68 48 cc @@ -6068,6 +6068,10 @@ 20 3f 56 +6f +e0 +cc +3b 20 40 05 @@ -6087,11 +6091,11 @@ 20 40 06 -0d +0e 20 40 05 -f8 +f9 68 48 cc @@ -6115,7 +6119,7 @@ 20 40 06 -03 +04 67 e0 cc @@ -6126,8 +6130,8 @@ 3e 20 3a -05 -ff +06 +00 6f e0 cc @@ -6191,11 +6195,11 @@ c0 03 86 -18 +19 c0 00 06 -1a +1b 20 60 00 @@ -6235,11 +6239,11 @@ c0 03 86 -18 +19 c0 00 06 -1a +1b 20 60 00 @@ -6283,7 +6287,7 @@ c2 9e 86 -28 +29 18 42 7e @@ -6315,7 +6319,7 @@ 24 3a 06 -45 +46 6f e4 4b @@ -6323,7 +6327,7 @@ c2 8e 06 -39 +3a 18 42 7e @@ -6335,11 +6339,11 @@ c0 00 06 -35 +36 c0 01 06 -33 +34 20 60 00 @@ -6351,7 +6355,7 @@ 20 20 06 -25 +26 58 00 00 @@ -6359,7 +6363,7 @@ 20 20 06 -25 +26 58 00 00 @@ -6367,7 +6371,7 @@ 20 20 06 -25 +26 58 00 00 @@ -6375,7 +6379,7 @@ 20 20 06 -25 +26 18 42 7e @@ -6387,15 +6391,15 @@ c0 00 06 -35 +36 c0 01 06 -37 +38 c0 01 86 -33 +34 20 60 00 @@ -6411,15 +6415,15 @@ c0 00 06 -37 +38 c0 00 86 -33 +34 c0 01 86 -31 +32 20 60 00 @@ -6431,7 +6435,7 @@ c2 8e 06 -3f +40 18 42 7e @@ -6443,11 +6447,11 @@ c0 00 06 -31 +32 c0 00 86 -33 +34 20 60 00 @@ -6487,7 +6491,7 @@ c5 13 06 -56 +57 6f e0 c8 @@ -6499,7 +6503,7 @@ 24 21 06 -70 +71 6f e0 c8 @@ -6511,7 +6515,7 @@ 24 21 06 -5e +5f 6f e0 c8 @@ -6519,7 +6523,7 @@ c0 00 06 -71 +72 20 60 00 @@ -6555,7 +6559,7 @@ c5 13 06 -67 +68 6f e0 c8 @@ -6587,7 +6591,7 @@ c0 01 06 -78 +79 c0 00 a7 @@ -6607,7 +6611,7 @@ c0 01 86 -77 +78 1f e0 fe @@ -6623,11 +6627,11 @@ c0 01 06 -78 +79 20 20 06 -78 +79 70 41 e8 @@ -6636,8 +6640,8 @@ 60 00 00 -29 -4e +6a +63 aa 55 40 @@ -7214,8 +7218,8 @@ a8 40 10 -a3 -c8 +23 +08 12 23 51 @@ -7405,7 +7409,7 @@ 00 a6 4d -01 +00 0b 42 54 @@ -8002,14 +8006,10 @@ aa aa 55 -4c -9f -fa -da -ff -ff -ff -ff +0b +9e +5c +43 ff ff ff @@ -8188,5 +8188,5 @@ ff ff ff -7f -40 +d3 +ec Index: output/program.lis =================================================================== --- /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/PB_3m_3ch_XH8004/output/program.lis (revision 4791) +++ /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/PB_3m_3ch_XH8004/output/program.lis (working copy) @@ -18,7 +18,7 @@ 000f c065027a beq patch19_2 ,p_mouse_lpm_before_common 0010 c06600f4 beq patch19_4 ,p_mouse_adc_read_start 0011 c0670528 beq patch19_6 ,p_mouse_motion -0012 c067861c beq patch19_7 ,p_mouse_dpi_process +0012 c067861d beq patch19_7 ,p_mouse_dpi_process 0013 c0680364 beq patch1a_0 ,p_mouse_seting_dpi 0014 c0688563 beq patch1a_1 ,p_mouse_check_key_gpio 0015 c0698380 beq patch1a_3 ,p_mouse_init_sunt @@ -53,7 +53,7 @@ 0030 c07501e2 beq patch3d_2 ,p_g24_transmit_no_interrupt 0031 c075820f beq patch3d_3 ,p_g24_transmit_hop_process 0032 c076051d beq patch3d_4 ,p_g24_lpm_wait -0033 c076864c beq patch3d_5 ,p_power_ctrl_start +0033 c076864d beq patch3d_5 ,p_power_ctrl_start 0034 2020137c branch loop p_soft_reset: @@ -704,7 +704,7 @@ 0215 684a488d fetcht 4 ,mem_24g_fast_conn_addr 0216 98467c00 isub temp ,null 0217 2022a2cb branch g24_ch ,zero -0218 20400671 call p_power_ctrl_txpower_incrs +0218 20400672 call p_power_ctrl_txpower_incrs 0219 20402724 call power_ctrl_pac_succ_decrs 021a 202022cb branch g24_ch @@ -1208,7 +1208,7 @@ 0383 204041b5 call mouse_read_sensor_id 0384 c018038c beq p32xx_id1 ,p_mouse_init_p32xx_id2_judge 0385 c018c217 beq p3065_id1 ,mouse_init_p3065 -0386 c02c4220 beq pka8g2_id1 ,mouse_ka8g2_id2_judge +0386 c02c038a beq pka8g2_id1 ,p_mouse_ka8g2_id2_judge 0387 204041b2 call mouse_twspi_reset 0388 20001af4 nop 6900 0389 20200383 branch p_mouse_init_sensor @@ -2091,219 +2091,220 @@ p_mouse_dpi_another_gpio_connect_gnd_check: 05e7 6fe0cc3b fetch 1 ,mem_dpi_another_button_gpio 05e8 20400596 call p_mouse_gpio_config_output_high -05e9 204005f4 call p_mouse_dpi_another_check +05e9 204005f5 call p_mouse_dpi_another_check 05ea 6848cc3b fetcht 1 ,mem_dpi_another_button_gpio 05eb 20203f56 branch mouse_gpio_config_input_pu p_mouse_dpi_another_gpio_connect_vin_check: -05ec 20400599 call p_mouse_gpio_config_output_low -05ed 704c3f00 jam mouse_dpi_another_key ,mem_mouse_key_temp_patch -05ee 6848cc3b fetcht 1 ,mem_dpi_another_button_gpio -05ef 6fe0cc3c fetch 1 ,mem_dpi_another_press_status -05f0 2040060d call p_mouse_check_key_connect_vin_new -05f1 204005f8 call p_mouse_dpi_another_state_check -05f2 6848cc3b fetcht 1 ,mem_dpi_another_button_gpio -05f3 20203f56 branch mouse_gpio_config_input_pu +05ec 6fe0cc3b fetch 1 ,mem_dpi_another_button_gpio +05ed 20400599 call p_mouse_gpio_config_output_low +05ee 704c3f00 jam mouse_dpi_another_key ,mem_mouse_key_temp_patch +05ef 6848cc3b fetcht 1 ,mem_dpi_another_button_gpio +05f0 6fe0cc3c fetch 1 ,mem_dpi_another_press_status +05f1 2040060e call p_mouse_check_key_connect_vin_new +05f2 204005f9 call p_mouse_dpi_another_state_check +05f3 6848cc3b fetcht 1 ,mem_dpi_another_button_gpio +05f4 20203f56 branch mouse_gpio_config_input_pu p_mouse_dpi_another_check: -05f4 704c3f00 jam mouse_dpi_another_key ,mem_mouse_key_temp_patch -05f5 6848cc3b fetcht 1 ,mem_dpi_another_button_gpio -05f6 6fe0cc3c fetch 1 ,mem_dpi_another_press_status -05f7 20400603 call p_mouse_check_key_connect_gnd_new +05f5 704c3f00 jam mouse_dpi_another_key ,mem_mouse_key_temp_patch +05f6 6848cc3b fetcht 1 ,mem_dpi_another_button_gpio +05f7 6fe0cc3c fetch 1 ,mem_dpi_another_press_status +05f8 20400604 call p_mouse_check_key_connect_gnd_new p_mouse_dpi_another_state_check: -05f8 67e0cc3c store 1 ,mem_dpi_another_press_status -05f9 6fe0cc3e fetch 1 ,mem_dpi_another_button_down_enable -05fa 203a05ff branch p_mouse_dpi_another_up ,blank +05f9 67e0cc3c store 1 ,mem_dpi_another_press_status +05fa 6fe0cc3e fetch 1 ,mem_dpi_another_button_down_enable +05fb 203a0600 branch p_mouse_dpi_another_up ,blank p_mouse_dpi_another_down: -05fb 6fe0cc3d fetch 1 ,mem_dpi_another_button_state -05fc c1008000 rtneq dpi_button_state_down -05fd 704c3d01 jam dpi_button_state_down ,mem_dpi_another_button_state -05fe 20204069 branch mouse_dpi_process +05fc 6fe0cc3d fetch 1 ,mem_dpi_another_button_state +05fd c1008000 rtneq dpi_button_state_down +05fe 704c3d01 jam dpi_button_state_down ,mem_dpi_another_button_state +05ff 20204069 branch mouse_dpi_process p_mouse_dpi_another_up: -05ff 6fe0cc3d fetch 1 ,mem_dpi_another_button_state -0600 c1000000 rtneq dpi_button_state_up -0601 704c3d00 jam dpi_button_state_up ,mem_dpi_another_button_state -0602 20600000 rtn +0600 6fe0cc3d fetch 1 ,mem_dpi_another_button_state +0601 c1000000 rtneq dpi_button_state_up +0602 704c3d00 jam dpi_button_state_up ,mem_dpi_another_button_state +0603 20600000 rtn p_mouse_check_key_connect_gnd_new: -0603 1fe3fe00 lshift pdata ,pdata -0604 1fe22400 copy pdata ,regb -0605 20406059 call gpio_get_bit -0606 7920a400 setflag true ,0 ,regb -0607 1a417e07 and regb ,0x07 ,pdata -0608 6848cc3f fetcht 1 ,mem_mouse_key_temp_patch -0609 18420e00 copy temp ,queue -060a c0038618 beq 0x07 ,p_mouse_key_press -060b c000061a beq 0x00 ,p_mouse_key_release -060c 20600000 rtn +0604 1fe3fe00 lshift pdata ,pdata +0605 1fe22400 copy pdata ,regb +0606 20406059 call gpio_get_bit +0607 7920a400 setflag true ,0 ,regb +0608 1a417e07 and regb ,0x07 ,pdata +0609 6848cc3f fetcht 1 ,mem_mouse_key_temp_patch +060a 18420e00 copy temp ,queue +060b c0038619 beq 0x07 ,p_mouse_key_press +060c c000061b beq 0x00 ,p_mouse_key_release +060d 20600000 rtn p_mouse_check_key_connect_vin_new: -060d 1fe3fe00 lshift pdata ,pdata -060e 1fe22400 copy pdata ,regb -060f 20403f54 call mouse_gpio_config_input_pd -0610 20406059 call gpio_get_bit -0611 7920a400 setflag true ,0 ,regb -0612 1a417e07 and regb ,0x07 ,pdata -0613 6848cc3f fetcht 1 ,mem_mouse_key_temp_patch -0614 18420e00 copy temp ,queue -0615 c0038618 beq 0x07 ,p_mouse_key_press -0616 c000061a beq 0x00 ,p_mouse_key_release -0617 20600000 rtn +060e 1fe3fe00 lshift pdata ,pdata +060f 1fe22400 copy pdata ,regb +0610 20403f54 call mouse_gpio_config_input_pd +0611 20406059 call gpio_get_bit +0612 7920a400 setflag true ,0 ,regb +0613 1a417e07 and regb ,0x07 ,pdata +0614 6848cc3f fetcht 1 ,mem_mouse_key_temp_patch +0615 18420e00 copy temp ,queue +0616 c0038619 beq 0x07 ,p_mouse_key_press +0617 c000061b beq 0x00 ,p_mouse_key_release +0618 20600000 rtn p_mouse_key_press: -0618 704c3e01 jam 1 ,mem_dpi_another_button_down_enable -0619 20600000 rtn +0619 704c3e01 jam 1 ,mem_dpi_another_button_down_enable +061a 20600000 rtn p_mouse_key_release: -061a 704c3e00 jam 0 ,mem_dpi_another_button_down_enable -061b 20600000 rtn +061b 704c3e00 jam 0 ,mem_dpi_another_button_down_enable +061c 20600000 rtn p_mouse_dpi_process: -061c 20404072 call mouse_dpi_ghost_check -061d 20740000 rtn user +061d 20404072 call mouse_dpi_ghost_check +061e 20740000 rtn user p_mouse_dpi_process_next: -061e 6fe0c992 fetch 1 ,mem_mouse_dpi -061f 1fe20400 copy pdata ,temp -0620 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -0621 c29e8628 bbit1 mouse_enable_double_dpi_key ,p_mouse_double_dpi_check -0622 18427e00 copy temp ,pdata -0623 1fe0fe01 increase 1 ,pdata -0624 1fe17e03 and pdata ,0x03 ,pdata +061f 6fe0c992 fetch 1 ,mem_mouse_dpi +0620 1fe20400 copy pdata ,temp +0621 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +0622 c29e8629 bbit1 mouse_enable_double_dpi_key ,p_mouse_double_dpi_check +0623 18427e00 copy temp ,pdata +0624 1fe0fe01 increase 1 ,pdata +0625 1fe17e03 and pdata ,0x03 ,pdata p_mouse_dpi_store: -0625 67e0c992 store 1 ,mem_mouse_dpi -0626 20400364 call p_mouse_seting_dpi -0627 20204643 branch mouse_store_eerpom_dpi +0626 67e0c992 store 1 ,mem_mouse_dpi +0627 20400364 call p_mouse_seting_dpi +0628 20204643 branch mouse_store_eerpom_dpi p_mouse_double_dpi_check: -0628 6fe0cc3e fetch 1 ,mem_dpi_another_button_down_enable -0629 243a0645 nbranch p_mouse_another_dpi_button_down ,blank +0629 6fe0cc3e fetch 1 ,mem_dpi_another_button_down_enable +062a 243a0646 nbranch p_mouse_another_dpi_button_down ,blank p_mouse_dpi_increase: -062a 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -062b c28e0639 bbit1 mouse_enable_dpi_level_4 ,p_mouse_dpi_increase_level_4 -062c 18427e00 copy temp ,pdata -062d c1008000 rtneq mouse_dpi_level2 +062b 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +062c c28e063a bbit1 mouse_enable_dpi_level_4 ,p_mouse_dpi_increase_level_4 +062d 18427e00 copy temp ,pdata +062e c1008000 rtneq mouse_dpi_level2 p_mouse_dpi_increase_level: -062e c0000635 beq mouse_dpi_level1 ,p_mouse_dpi_level_3 -062f c0010633 beq mouse_dpi_level3 ,p_mouse_dpi_level_2 -0630 20600000 rtn +062f c0000636 beq mouse_dpi_level1 ,p_mouse_dpi_level_3 +0630 c0010634 beq mouse_dpi_level3 ,p_mouse_dpi_level_2 +0631 20600000 rtn p_mouse_dpi_level_1: -0631 58000002 setarg 2 -0632 20200625 branch p_mouse_dpi_store +0632 58000002 setarg 2 +0633 20200626 branch p_mouse_dpi_store p_mouse_dpi_level_2: -0633 58000000 setarg 0 -0634 20200625 branch p_mouse_dpi_store +0634 58000000 setarg 0 +0635 20200626 branch p_mouse_dpi_store p_mouse_dpi_level_3: -0635 58000001 setarg 1 -0636 20200625 branch p_mouse_dpi_store +0636 58000001 setarg 1 +0637 20200626 branch p_mouse_dpi_store p_mouse_dpi_level_4: -0637 58000003 setarg 3 -0638 20200625 branch p_mouse_dpi_store +0638 58000003 setarg 3 +0639 20200626 branch p_mouse_dpi_store p_mouse_dpi_increase_level_4: -0639 18427e00 copy temp ,pdata -063a c1008000 rtneq mouse_dpi_level2 -063b c0000635 beq mouse_dpi_level1 ,p_mouse_dpi_level_3 -063c c0010637 beq mouse_dpi_level3 ,p_mouse_dpi_level_4 -063d c0018633 beq mouse_dpi_level4 ,p_mouse_dpi_level_2 -063e 20600000 rtn +063a 18427e00 copy temp ,pdata +063b c1008000 rtneq mouse_dpi_level2 +063c c0000636 beq mouse_dpi_level1 ,p_mouse_dpi_level_3 +063d c0010638 beq mouse_dpi_level3 ,p_mouse_dpi_level_4 +063e c0018634 beq mouse_dpi_level4 ,p_mouse_dpi_level_2 +063f 20600000 rtn p_mouse_dpi_decrease_level_4: -063f 18427e00 copy temp ,pdata -0640 c1010000 rtneq mouse_dpi_level3 -0641 c0000637 beq mouse_dpi_level1 ,p_mouse_dpi_level_4 -0642 c0008633 beq mouse_dpi_level2 ,p_mouse_dpi_level_2 -0643 c0018631 beq mouse_dpi_level4 ,p_mouse_dpi_level_1 -0644 20600000 rtn +0640 18427e00 copy temp ,pdata +0641 c1010000 rtneq mouse_dpi_level3 +0642 c0000638 beq mouse_dpi_level1 ,p_mouse_dpi_level_4 +0643 c0008634 beq mouse_dpi_level2 ,p_mouse_dpi_level_2 +0644 c0018632 beq mouse_dpi_level4 ,p_mouse_dpi_level_1 +0645 20600000 rtn p_mouse_another_dpi_button_down: p_mouse_dpi_decrease: -0645 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -0646 c28e063f bbit1 mouse_enable_dpi_level_4 ,p_mouse_dpi_decrease_level_4 -0647 18427e00 copy temp ,pdata -0648 c1010000 rtneq mouse_dpi_level3 +0646 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +0647 c28e0640 bbit1 mouse_enable_dpi_level_4 ,p_mouse_dpi_decrease_level_4 +0648 18427e00 copy temp ,pdata +0649 c1010000 rtneq mouse_dpi_level3 p_mouse_dpi_decrease_level: -0649 c0000631 beq mouse_dpi_level1 ,p_mouse_dpi_level_1 -064a c0008633 beq mouse_dpi_level2 ,p_mouse_dpi_level_2 -064b 20600000 rtn +064a c0000632 beq mouse_dpi_level1 ,p_mouse_dpi_level_1 +064b c0008634 beq mouse_dpi_level2 ,p_mouse_dpi_level_2 +064c 20600000 rtn p_power_ctrl_start: -064c 6fe1478c fetch 2 ,mem_ui_state_map -064d c3858000 rtnbit1 ui_state_ble_adv -064e c3838000 rtnbit1 ui_state_bt_reconnect -064f c3830000 rtnbit1 ui_state_bt_discovery -0650 6a214899 fetchr rega ,2 ,mem_rssi_signal_buf_ptr -0651 204025cb call rssi_average -0652 6048c8c7 storet 1 ,mem_rssi_avg_received -0653 6fe0c8cc fetch 1 ,mem_rssi_dis_max_24g -0654 c5130656 bmark1 mark_24g ,p_power_ctrl_start_next -0655 6fe0c8cf fetch 1 ,mem_rssi_dis_max_ble +064d 6fe1478c fetch 2 ,mem_ui_state_map +064e c3858000 rtnbit1 ui_state_ble_adv +064f c3838000 rtnbit1 ui_state_bt_reconnect +0650 c3830000 rtnbit1 ui_state_bt_discovery +0651 6a214899 fetchr rega ,2 ,mem_rssi_signal_buf_ptr +0652 204025cb call rssi_average +0653 6048c8c7 storet 1 ,mem_rssi_avg_received +0654 6fe0c8cc fetch 1 ,mem_rssi_dis_max_24g +0655 c5130657 bmark1 mark_24g ,p_power_ctrl_start_next +0656 6fe0c8cf fetch 1 ,mem_rssi_dis_max_ble p_power_ctrl_start_next: -0656 98467c00 isub temp ,null -0657 24210670 nbranch p_power_ctrl_txpower_incrs_force ,positive -0658 6fe0c8c9 fetch 1 ,mem_power_ctrl_pac_succ_cnt -0659 1fe67c02 sub pdata ,2 ,null -065a 2421065e nbranch p_power_ctrl_txpower_decrs_check ,positive -065b 6fe0c8c9 fetch 1 ,mem_power_ctrl_pac_succ_cnt -065c c0000671 beq 0 ,p_power_ctrl_txpower_incrs -065d 20600000 rtn +0657 98467c00 isub temp ,null +0658 24210671 nbranch p_power_ctrl_txpower_incrs_force ,positive +0659 6fe0c8c9 fetch 1 ,mem_power_ctrl_pac_succ_cnt +065a 1fe67c02 sub pdata ,2 ,null +065b 2421065f nbranch p_power_ctrl_txpower_decrs_check ,positive +065c 6fe0c8c9 fetch 1 ,mem_power_ctrl_pac_succ_cnt +065d c0000672 beq 0 ,p_power_ctrl_txpower_incrs +065e 20600000 rtn p_power_ctrl_txpower_decrs_check: -065e 6fe0c8c9 fetch 1 ,mem_power_ctrl_pac_succ_cnt -065f 6848c8ca fetcht 1 ,mem_power_ctrl_pac_succ_cnt_init -0660 98467c00 isub temp ,null -0661 24628000 nrtn zero -0662 7048c900 jam 0 ,mem_power_ctrl_pac_succ_cnt +065f 6fe0c8c9 fetch 1 ,mem_power_ctrl_pac_succ_cnt +0660 6848c8ca fetcht 1 ,mem_power_ctrl_pac_succ_cnt_init +0661 98467c00 isub temp ,null +0662 24628000 nrtn zero +0663 7048c900 jam 0 ,mem_power_ctrl_pac_succ_cnt p_power_ctrl_txpower_decrs: -0663 6848c8c7 fetcht 1 ,mem_rssi_avg_received -0664 6fe0c8cb fetch 1 ,mem_rssi_dis_min_24g -0665 c5130667 bmark1 mark_24g ,p_power_ctrl_txpower_decrs_next -0666 6fe0c8ce fetch 1 ,mem_rssi_dis_min_ble +0664 6848c8c7 fetcht 1 ,mem_rssi_avg_received +0665 6fe0c8cb fetch 1 ,mem_rssi_dis_min_24g +0666 c5130668 bmark1 mark_24g ,p_power_ctrl_txpower_decrs_next +0667 6fe0c8ce fetch 1 ,mem_rssi_dis_min_ble p_power_ctrl_txpower_decrs_next: -0667 98467c00 isub temp ,null -0668 24610000 nrtn positive -0669 6fe0c8c8 fetch 1 ,mem_power_ctrl_level -066a c000271b beq 0 ,power_ctrl_decrs_level0 -066b 1fe0ffff increase -1 ,pdata -066c 67e0c8c8 store 1 ,mem_power_ctrl_level -066d c0010678 beq 2 ,p_power_ctrl_decrs_level2 -066e c000a711 beq 1 ,power_ctrl_decrs_level1 -066f 2020271b branch power_ctrl_decrs_level0 +0668 98467c00 isub temp ,null +0669 24610000 nrtn positive +066a 6fe0c8c8 fetch 1 ,mem_power_ctrl_level +066b c000271b beq 0 ,power_ctrl_decrs_level0 +066c 1fe0ffff increase -1 ,pdata +066d 67e0c8c8 store 1 ,mem_power_ctrl_level +066e c0010679 beq 2 ,p_power_ctrl_decrs_level2 +066f c000a711 beq 1 ,power_ctrl_decrs_level1 +0670 2020271b branch power_ctrl_decrs_level0 p_power_ctrl_txpower_incrs_force: -0670 7048c900 jam 0 ,mem_power_ctrl_pac_succ_cnt +0671 7048c900 jam 0 ,mem_power_ctrl_pac_succ_cnt p_power_ctrl_txpower_incrs: -0671 6fe0c8c8 fetch 1 ,mem_power_ctrl_level -0672 c0018677 beq 3 ,p_power_ctrl_incrs_level3 -0673 1fe0fe01 increase 1 ,pdata -0674 67e0c8c8 store 1 ,mem_power_ctrl_level -0675 c000a711 beq 1 ,power_ctrl_incrs_level1 -0676 c0010678 beq 2 ,p_power_ctrl_incrs_level2 +0672 6fe0c8c8 fetch 1 ,mem_power_ctrl_level +0673 c0018678 beq 3 ,p_power_ctrl_incrs_level3 +0674 1fe0fe01 increase 1 ,pdata +0675 67e0c8c8 store 1 ,mem_power_ctrl_level +0676 c000a711 beq 1 ,power_ctrl_incrs_level1 +0677 c0010679 beq 2 ,p_power_ctrl_incrs_level2 p_power_ctrl_incrs_level3: -0677 20200678 branch p_power_ctrl_incrs_level2 +0678 20200679 branch p_power_ctrl_incrs_level2 p_power_ctrl_decrs_level2: p_power_ctrl_incrs_level2: -0678 7041e803 jam tx_power_3db ,mem_tx_power -0679 20600000 rtn +0679 7041e803 jam tx_power_3db ,mem_tx_power +067a 20600000 rtn org 0x3bc1 mouse_init: Index: program/patch.prog =================================================================== --- /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/PB_3m_3ch_XH8004/program/patch.prog (revision 4791) +++ /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/PB_3m_3ch_XH8004/program/patch.prog (working copy) @@ -1396,8 +1396,8 @@ call p_mouse_setting_dpi_4_level call p_mouse_dpi_led_blink_delay p_mouse_seting_sensor_type: -ifdef S201X_SENSOR fetch 1,mem_config_sensor_type +ifdef S201X_SENSOR beq S201X,p_mouse_seting_S201_dpi endif branch mouse_seting_sensor_type @@ -1447,7 +1447,7 @@ call mouse_read_sensor_id beq P32XX_ID1,p_mouse_init_p32xx_id2_judge beq P3065_ID1,mouse_init_p3065 - beq PKA8G2_ID1,mouse_ka8g2_id2_judge + beq PKA8G2_ID1,p_mouse_ka8g2_id2_judge call mouse_twspi_reset nop 6900 branch p_mouse_init_sensor @@ -2570,6 +2570,7 @@ branch mouse_gpio_config_input_pu p_mouse_dpi_another_gpio_connect_vin_check: + fetch 1,mem_dpi_another_button_gpio call p_mouse_gpio_config_output_low jam MOUSE_DPI_ANOTHER_KEY,mem_mouse_key_temp_patch fetcht 1,mem_dpi_another_button_gpio Index: sched/mouse.dat =================================================================== --- /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/PB_3m_3ch_XH8004/sched/mouse.dat (revision 4791) +++ /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/PB_3m_3ch_XH8004/sched/mouse.dat (working copy) @@ -262,7 +262,7 @@ mem_lpm_mult_init:20 mem_app_connection_options:06 -mem_lap:10 a3 c8 12 23 51 +mem_lap:10 23 08 12 23 51 mem_local_name_length: 'BT3.0 Mouse mem_sniff_param_interval: @@ -314,7 +314,7 @@ mem_le_name_patch_len: #max 18bytes 'BT5.2 Mouse -mem_mouse_le_name_modify_enable:01 #00 disable 01 enable +mem_mouse_le_name_modify_enable:00 #00 disable 01 enable mem_ble_device2_name: #max 18bytes 'BT5.2 Mouse