Index: output/flash.dat =================================================================== --- /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_D1123E/output/flash.dat (revision 3806) +++ /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_D1123E/output/flash.dat (working copy) @@ -183,7 +183,7 @@ 20 20 05 -23 +22 58 00 01 @@ -319,7 +319,7 @@ c0 71 85 -25 +24 c0 72 04 @@ -327,7 +327,7 @@ c0 73 05 -44 +43 c0 75 05 @@ -407,7 +407,7 @@ 20 40 04 -a7 +a6 24 60 80 @@ -419,7 +419,7 @@ 20 40 04 -a7 +a6 24 60 80 @@ -443,7 +443,7 @@ 20 40 04 -c7 +c6 20 20 03 @@ -2659,7 +2659,7 @@ 20 20 05 -25 +24 70 89 5b @@ -2747,7 +2747,7 @@ 20 40 04 -ab +aa da 20 47 @@ -3107,7 +3107,7 @@ 20 40 05 -1b +1a 68 00 c6 @@ -3135,7 +3135,7 @@ 20 20 05 -21 +20 ea 61 00 @@ -3167,7 +3167,7 @@ 20 40 05 -1b +1a 20 20 40 @@ -4475,19 +4475,15 @@ 20 40 04 -d5 +d4 20 40 05 -0a +09 20 40 04 -8e -20 -40 -05 -82 +8d 20 40 05 @@ -4499,7 +4495,7 @@ 20 40 04 -ab +aa 20 40 42 @@ -4511,27 +4507,27 @@ 20 40 04 -93 +92 20 40 04 -7a +79 20 40 04 -77 +76 20 40 04 -80 +7f 20 40 04 -86 +85 20 40 04 -6f +6e 20 40 42 @@ -4539,7 +4535,7 @@ 20 40 04 -72 +71 20 20 07 @@ -4563,7 +4559,7 @@ da 40 04 -75 +74 20 20 33 @@ -4595,7 +4591,7 @@ da 40 04 -7d +7c 20 20 33 @@ -4619,7 +4615,7 @@ da 40 04 -83 +82 20 20 33 @@ -4651,7 +4647,7 @@ da 40 04 -8b +8a 20 20 33 @@ -4675,7 +4671,7 @@ da 40 04 -91 +90 20 20 33 @@ -4695,7 +4691,7 @@ da 40 04 -96 +95 20 20 33 @@ -4715,7 +4711,7 @@ da 40 04 -9b +9a 20 20 33 @@ -4787,15 +4783,15 @@ 20 40 04 -a7 +a6 24 20 84 -b6 +b5 20 40 04 -98 +97 68 00 c6 @@ -4835,7 +4831,7 @@ 24 3a 04 -ce +cd 68 00 c6 @@ -4855,7 +4851,7 @@ 24 41 04 -c1 +c0 68 00 c6 @@ -4875,7 +4871,7 @@ 20 40 04 -c7 +c6 70 41 bd @@ -4991,7 +4987,7 @@ 20 40 04 -f5 +f4 20 40 69 @@ -5015,7 +5011,7 @@ 20 41 04 -f2 +f1 60 01 47 @@ -5027,7 +5023,7 @@ 20 40 04 -fd +fc 68 00 c2 @@ -5039,7 +5035,7 @@ c3 00 04 -ed +ec 70 4a ff @@ -5211,7 +5207,7 @@ 24 41 05 -19 +18 1f e6 7c @@ -5263,7 +5259,7 @@ c0 ff 85 -25 +24 68 00 c6 @@ -5283,7 +5279,7 @@ 20 42 85 -31 +30 68 00 c6 @@ -5295,15 +5291,15 @@ c0 02 05 -40 +3f c0 03 05 -36 +35 c0 2d 05 -36 +35 68 00 c7 @@ -5311,7 +5307,7 @@ c0 00 05 -33 +32 c0 01 bd @@ -5347,11 +5343,11 @@ c0 00 05 -3c +3b c0 01 85 -3e +3d 68 00 cb @@ -5371,7 +5367,7 @@ 20 20 05 -3a +39 68 00 cb @@ -5379,7 +5375,7 @@ 20 20 05 -3a +39 68 00 c7 @@ -5419,6 +5415,10 @@ 20 40 05 +82 +20 +40 +05 4f 20 40 @@ -5527,7 +5527,7 @@ 70 4b bb -02 +14 70 4b c1 @@ -7960,8 +7960,8 @@ 20 00 01 -01 -9e +b7 +13 aa 55 08 @@ -8469,7 +8469,7 @@ 00 bb 4b -02 +14 aa 55 01 @@ -8906,7 +8906,7 @@ 00 b4 4b -04 +05 00 aa 55 @@ -9057,7 +9057,7 @@ aa aa 55 -22 +35 20 ff 20 @@ -9971,7 +9971,7 @@ 20 5a 04 -d2 +d1 70 4b ba @@ -12199,7 +12199,7 @@ c2 85 04 -b6 +b5 20 20 41 @@ -12648,5 +12648,5 @@ 55 00 00 -15 -90 +85 +dd Index: output/program.lis =================================================================== --- /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_D1123E/output/program.lis (revision 3806) +++ /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_D1123E/output/program.lis (working copy) @@ -58,7 +58,7 @@ 0029 6000c71e store 1 ,mem_reconn_times 002a 6800c241 fetch 1 ,mem_power_on_flag 002b c3810000 rtnbit1 2 -002c 20200523 branch p_mouse_dpi_config_default +002c 20200522 branch p_mouse_dpi_config_default p_mouse_24g_transmit_by_interrupt_exit_count_max: 002d 58000177 setarg 375 @@ -96,9 +96,9 @@ 004b c0588087 beq patch16_1 ,p_lpm_check_wake_lock 004c c0590091 beq patch16_2 ,p_g24_dispatch 004d c0620298 beq patch18_4 ,p_device_init -004e c0718525 beq patch1c_3 ,p_mouse_seting_dpi +004e c0718524 beq patch1c_3 ,p_mouse_seting_dpi 004f c0720406 beq patch1c_4 ,p_mouse_wheel_check -0050 c0730544 beq patch1c_6 ,p_mouse_motion +0050 c0730543 beq patch1c_6 ,p_mouse_motion 0051 c07505cf beq patch1d_2 ,p_mouse_bb_event_discovery_btn 0052 c07585d4 beq patch1d_3 ,p_mouse_start_discovery 0053 c07605da beq patch1d_4 ,p_mouse_stop_discovery @@ -122,10 +122,10 @@ p_mouse_select_device_button_wakeup_check: 0063 704b6d00 jam 0 ,mem_mouse_select_device_button_wakeup_flag -0064 204004a7 call p_mouse_get_select_state +0064 204004a6 call p_mouse_get_select_state 0065 24608000 nrtn true 0066 20407ec1 call delay_10ms -0067 204004a7 call p_mouse_get_select_state +0067 204004a6 call p_mouse_get_select_state 0068 24608000 nrtn true 0069 704b6d01 jam 1 ,mem_mouse_select_device_button_wakeup_flag 006a 20600000 rtn @@ -133,7 +133,7 @@ p_mouse_switch_hwakeup_bypb: 006b 6800cb6d fetch 1 ,mem_mouse_select_device_button_wakeup_flag 006c 207a0000 rtn blank -006d 204004c7 call p_mouse_switch_device_flag +006d 204004c6 call p_mouse_switch_device_flag 006e 20200331 branch p_mouse_store_flash_device_info p_soft_reset_1: @@ -867,7 +867,7 @@ p_mouse_set_sdio_high: 0295 6800cb00 fetch 1 ,mem_mouse_init_sensor_reset_flag 0296 247a0000 nrtn blank -0297 20200525 branch p_mouse_seting_sensor_type +0297 20200524 branch p_mouse_seting_sensor_type p_device_init: 0298 70895b86 jam 0x86 ,0x895b @@ -897,7 +897,7 @@ p_mouse_check_reconn_target: 02ac 204002ba call p_mouse_tx_power_init -02ad 204004ab call p_mouse_select_device_by_button +02ad 204004aa call p_mouse_select_device_by_button 02ae da204721 arg mem_device1_type ,rega 02af 6800c720 fetch 1 ,mem_device_flag 02b0 6808c703 fetcht 1 ,mem_24g_device_number @@ -1019,7 +1019,7 @@ 0306 20206411 branch spi_ncs_disable p_mouse_init_p32xx_id2_judge: -0307 2040051b call p_mouse_sensor_poweron +0307 2040051a call p_mouse_sensor_poweron 0308 6800c6de fetch 1 ,mem_sensor_id2 0309 c02d030b beq p_mx8650 ,p_mouse_mx8650_init_param 030a 202040e1 branch mouse_init_p32xx_id2_judge + 1 @@ -1028,7 +1028,7 @@ 030b 7046e007 jam mx8650 ,mem_config_sensor_type 030c da604b6e arg mem_sensor_8650_init ,regc 030d 2040030f call p_sensor_wr_seq -030e 20200521 branch p_mouse_dpi_config +030e 20200520 branch p_mouse_dpi_config p_sensor_wr_seq: 030f ea610000 ifetch 2 ,regc @@ -1040,7 +1040,7 @@ 0315 2020030f branch p_sensor_wr_seq p_mouse_p3065_init_param: -0316 2040051b call p_mouse_sensor_poweron +0316 2040051a call p_mouse_sensor_poweron 0317 202040ea branch mouse_p3065_init_param p_spid_init_flash: @@ -1501,338 +1501,338 @@ 045c 20206405 branch sensor_write p_mouse_bb_event_timer: -045d 204004d5 call p_mouse_adc_read -045e 2040050a call p_mouse_low_voltage_led_timer -045f 2040048e call p_mouse_wheel_trigger_timer -0460 20400582 call p_mouse_z_quickly_roll_sampling_timer -0461 2040058c call p_mouse_z_roll_stop_timer -0462 20400593 call p_mouse_z_quickly_roll_timer -0463 204004ab call p_mouse_select_device_by_button -0464 20404234 call mouse_check_discovery_timeout_timer -0465 2040423a call mouse_check_no_data_timeout_timer -0466 20400493 call p_mouse_g24_stop_mode_timeout_timer -0467 2040047a call p_mouse_check_direct_timeout_timer -0468 20400477 call p_mouse_le_enable_att_list_timer -0469 20400480 call p_mouse_le_current_mult_update_timer -046a 20400486 call p_le_send_smp_security_request_timer -046b 2040046f call p_mouse_send_switch_req_timer -046c 20404231 call mouse_check_hid_handshake_timer -046d 20400472 call p_mouse_bt_check_sniff_req_timeout_timer -046e 20200708 branch p_mouse_multi_led_blink_timer +045d 204004d4 call p_mouse_adc_read +045e 20400509 call p_mouse_low_voltage_led_timer +045f 2040048d call p_mouse_wheel_trigger_timer +0460 2040058c call p_mouse_z_roll_stop_timer +0461 20400593 call p_mouse_z_quickly_roll_timer +0462 204004aa call p_mouse_select_device_by_button +0463 20404234 call mouse_check_discovery_timeout_timer +0464 2040423a call mouse_check_no_data_timeout_timer +0465 20400492 call p_mouse_g24_stop_mode_timeout_timer +0466 20400479 call p_mouse_check_direct_timeout_timer +0467 20400476 call p_mouse_le_enable_att_list_timer +0468 2040047f call p_mouse_le_current_mult_update_timer +0469 20400485 call p_le_send_smp_security_request_timer +046a 2040046e call p_mouse_send_switch_req_timer +046b 20404231 call mouse_check_hid_handshake_timer +046c 20400471 call p_mouse_bt_check_sniff_req_timeout_timer +046d 20200708 branch p_mouse_multi_led_blink_timer p_mouse_send_switch_req_timer: -046f da60480b arg mem_mouse_send_switch_req_timer ,regc -0470 da40637a arg host_create_conn_resend ,regb -0471 2020336d branch timer_single_step +046e da60480b arg mem_mouse_send_switch_req_timer ,regc +046f da40637a arg host_create_conn_resend ,regb +0470 2020336d branch timer_single_step p_mouse_bt_check_sniff_req_timeout_timer: -0472 da604b0b arg mem_mouse_bt_send_first_package_timer ,regc -0473 da400475 arg p_mouse_bt_send_first_package ,regb -0474 2020336d branch timer_single_step +0471 da604b0b arg mem_mouse_bt_send_first_package_timer ,regc +0472 da400474 arg p_mouse_bt_send_first_package ,regb +0473 2020336d branch timer_single_step p_mouse_bt_send_first_package: -0475 704b0c01 jam 1 ,mem_mouse_bt_send_first_package_flag -0476 20600000 rtn +0474 704b0c01 jam 1 ,mem_mouse_bt_send_first_package_flag +0475 20600000 rtn p_mouse_le_enable_att_list_timer: -0477 da6046c6 arg mem_le_start_encrypt_timer ,regc -0478 da403d60 arg mouse_le_write_enable ,regb -0479 2020336d branch timer_single_step +0476 da6046c6 arg mem_le_start_encrypt_timer ,regc +0477 da403d60 arg mouse_le_write_enable ,regb +0478 2020336d branch timer_single_step p_mouse_check_direct_timeout_timer: -047a da6046ae arg mem_mouse_direct_timer ,regc -047b da40047d arg p_mouse_check_direct_timeout ,regb -047c 20203374 branch timer_single_step_2b +0479 da6046ae arg mem_mouse_direct_timer ,regc +047a da40047c arg p_mouse_check_direct_timeout ,regb +047b 20203374 branch timer_single_step_2b p_mouse_check_direct_timeout: -047d 6800cb31 fetch 1 ,mem_mouse_multi_led_on_poweron2s_flag -047e 247a0000 nrtn blank -047f 20204266 branch mouse_check_direct_timeout +047c 6800cb31 fetch 1 ,mem_mouse_multi_led_on_poweron2s_flag +047d 247a0000 nrtn blank +047e 20204266 branch mouse_check_direct_timeout p_mouse_le_current_mult_update_timer: -0480 da604b68 arg mem_mouse_le_current_mult_timer ,regc -0481 da400483 arg p_mouse_le_current_mult_reinit ,regb -0482 2020336d branch timer_single_step +047f da604b68 arg mem_mouse_le_current_mult_timer ,regc +0480 da400482 arg p_mouse_le_current_mult_reinit ,regb +0481 2020336d branch timer_single_step p_mouse_le_current_mult_reinit: -0483 6800c7c7 fetch 1 ,mem_lpm_mult_init -0484 6000c172 store 1 ,mem_lpm_mult -0485 20600000 rtn +0482 6800c7c7 fetch 1 ,mem_lpm_mult_init +0483 6000c172 store 1 ,mem_lpm_mult +0484 20600000 rtn p_le_send_smp_security_request_timer: -0486 6800cb6a fetch 1 ,mem_mouse_le_bb_connected_flag -0487 207a0000 rtn blank -0488 da604b6b arg mem_mouse_send_secutiry_request_timer ,regc -0489 da40048b arg p_le_pairing_sm_start_check ,regb -048a 2020336d branch timer_single_step +0485 6800cb6a fetch 1 ,mem_mouse_le_bb_connected_flag +0486 207a0000 rtn blank +0487 da604b6b arg mem_mouse_send_secutiry_request_timer ,regc +0488 da40048a arg p_le_pairing_sm_start_check ,regb +0489 2020336d branch timer_single_step p_le_pairing_sm_start_check: -048b 6800cb6c fetch 1 ,mem_le_send_security_request_flag -048c 247a0000 nrtn blank -048d 20205bf5 branch le_pairing_sm_start +048a 6800cb6c fetch 1 ,mem_le_send_security_request_flag +048b 247a0000 nrtn blank +048c 20205bf5 branch le_pairing_sm_start p_mouse_wheel_trigger_timer: -048e da604809 arg mem_mouse_wheel_trigger_timer ,regc -048f da400491 arg p_mouse_wheel_trigger_disable ,regb -0490 2020336d branch timer_single_step +048d da604809 arg mem_mouse_wheel_trigger_timer ,regc +048e da400490 arg p_mouse_wheel_trigger_disable ,regb +048f 2020336d branch timer_single_step p_mouse_wheel_trigger_disable: -0491 70480800 jam 0 ,mem_mouse_wheel_trigger -0492 20600000 rtn +0490 70480800 jam 0 ,mem_mouse_wheel_trigger +0491 20600000 rtn p_mouse_g24_stop_mode_timeout_timer: -0493 da604d97 arg mem_24g_stop_g24_mode_timeout ,regc -0494 da400496 arg p_mouse_g24_stop_mode_timeout ,regb -0495 20203374 branch timer_single_step_2b +0492 da604d97 arg mem_24g_stop_g24_mode_timeout ,regc +0493 da400495 arg p_mouse_g24_stop_mode_timeout ,regb +0494 20203374 branch timer_single_step_2b p_mouse_g24_stop_mode_timeout: -0496 704d9601 jam 1 ,mem_24g_stop_g24_mode -0497 20600000 rtn +0495 704d9601 jam 1 ,mem_24g_stop_g24_mode +0496 20600000 rtn p_mouse_bt_discovery_timer: -0498 da604b47 arg mem_select_ui_button_count ,regc -0499 da40049b arg p_mouse_long_button_bt_discovery ,regb -049a 2020336d branch timer_single_step +0497 da604b47 arg mem_select_ui_button_count ,regc +0498 da40049a arg p_mouse_long_button_bt_discovery ,regb +0499 2020336d branch timer_single_step p_mouse_long_button_bt_discovery: -049b 704bba01 jam on ,mem_select_device_button_statue_bt_discovery -049c 6808c720 fetcht 1 ,mem_device_flag -049d 6800c703 fetch 1 ,mem_24g_device_number -049e 98467c00 isub temp ,null -049f 20628000 rtn zero -04a0 68014682 fetch 2 ,mem_ui_state_map -04a1 2feffe0b isolate1 ui_state_ble_adv ,pdata -04a2 2040c2d4 call mouse_stop_le_adv ,true -04a3 68014682 fetch 2 ,mem_ui_state_map -04a4 2feffe07 isolate1 ui_state_bt_reconnect ,pdata -04a5 2040c392 call mouse_cancel_reconnect ,true -04a6 202043b8 branch mouse_long_button_bt_discovry +049a 704bba01 jam on ,mem_select_device_button_statue_bt_discovery +049b 6808c720 fetcht 1 ,mem_device_flag +049c 6800c703 fetch 1 ,mem_24g_device_number +049d 98467c00 isub temp ,null +049e 20628000 rtn zero +049f 68014682 fetch 2 ,mem_ui_state_map +04a0 2feffe0b isolate1 ui_state_ble_adv ,pdata +04a1 2040c2d4 call mouse_stop_le_adv ,true +04a2 68014682 fetch 2 ,mem_ui_state_map +04a3 2feffe07 isolate1 ui_state_bt_reconnect ,pdata +04a4 2040c392 call mouse_cancel_reconnect ,true +04a5 202043b8 branch mouse_long_button_bt_discovry p_mouse_get_select_state: -04a7 6808c6ed fetcht 1 ,mem_config_select_device_button_gpio -04a8 204005c4 call p_gpio_set_input_pu -04a9 6808c6ed fetcht 1 ,mem_config_select_device_button_gpio -04aa 2020681d branch gpio_get_bit +04a6 6808c6ed fetcht 1 ,mem_config_select_device_button_gpio +04a7 204005c4 call p_gpio_set_input_pu +04a8 6808c6ed fetcht 1 ,mem_config_select_device_button_gpio +04a9 2020681d branch gpio_get_bit p_mouse_select_device_by_button: -04ab 204004a7 call p_mouse_get_select_state -04ac 242084b6 nbranch p_mouse_select_device_button_up ,true +04aa 204004a6 call p_mouse_get_select_state +04ab 242084b5 nbranch p_mouse_select_device_button_up ,true p_mouse_select_device_button_down: -04ad 20400498 call p_mouse_bt_discovery_timer -04ae 6800c6d9 fetch 1 ,mem_select_device_button_statue -04af c1000000 rtneq pb_button_state_down -04b0 7046d900 jam pb_button_state_down ,mem_select_device_button_statue -04b1 680146a8 fetch 2 ,mem_mouse_direct_timeout -04b2 600146ae store 2 ,mem_mouse_direct_timer -04b3 18000e03 force page_length_timer ,queue -04b4 680140b9 fetch 2 ,mem_page_to -04b5 20207f08 branch timer_init +04ac 20400497 call p_mouse_bt_discovery_timer +04ad 6800c6d9 fetch 1 ,mem_select_device_button_statue +04ae c1000000 rtneq pb_button_state_down +04af 7046d900 jam pb_button_state_down ,mem_select_device_button_statue +04b0 680146a8 fetch 2 ,mem_mouse_direct_timeout +04b1 600146ae store 2 ,mem_mouse_direct_timer +04b2 18000e03 force page_length_timer ,queue +04b3 680140b9 fetch 2 ,mem_page_to +04b4 20207f08 branch timer_init p_mouse_select_device_button_up: -04b6 6800cb6d fetch 1 ,mem_mouse_select_device_button_wakeup_flag -04b7 243a04ce nbranch p_mouse_select_button_wakeup_firstup ,blank -04b8 6800c6d9 fetch 1 ,mem_select_device_button_statue -04b9 c1008000 rtneq pb_button_state_up -04ba 6800cb47 fetch 1 ,mem_select_ui_button_count -04bb 1fe67c14 sub pdata ,20 ,null -04bc 244104c1 ncall p_mouse_ready_reconnection_by_button ,positive -04bd 6800c685 fetch 1 ,mem_ui_button_timeout -04be 6000cb47 store 1 ,mem_select_ui_button_count -04bf 7046d901 jam pb_button_state_up ,mem_select_device_button_statue -04c0 20600000 rtn +04b5 6800cb6d fetch 1 ,mem_mouse_select_device_button_wakeup_flag +04b6 243a04cd nbranch p_mouse_select_button_wakeup_firstup ,blank +04b7 6800c6d9 fetch 1 ,mem_select_device_button_statue +04b8 c1008000 rtneq pb_button_state_up +04b9 6800cb47 fetch 1 ,mem_select_ui_button_count +04ba 1fe67c14 sub pdata ,20 ,null +04bb 244104c0 ncall p_mouse_ready_reconnection_by_button ,positive +04bc 6800c685 fetch 1 ,mem_ui_button_timeout +04bd 6000cb47 store 1 ,mem_select_ui_button_count +04be 7046d901 jam pb_button_state_up ,mem_select_device_button_statue +04bf 20600000 rtn p_mouse_ready_reconnection_by_button: -04c1 204004c7 call p_mouse_switch_device_flag -04c2 7041bd00 jam 0 ,mem_link_key_exists -04c3 20400331 call p_mouse_store_flash_device_info -04c4 680246d3 fetch mouse_flag_len ,mem_mouse_flag -04c5 c1048000 rtneq mouse_bt_discovery_button_long_down_flag -04c6 2020437e branch mouse_set_reconnection +04c0 204004c6 call p_mouse_switch_device_flag +04c1 7041bd00 jam 0 ,mem_link_key_exists +04c2 20400331 call p_mouse_store_flash_device_info +04c3 680246d3 fetch mouse_flag_len ,mem_mouse_flag +04c4 c1048000 rtneq mouse_bt_discovery_button_long_down_flag +04c5 2020437e branch mouse_set_reconnection p_mouse_switch_device_flag: -04c7 6808c720 fetcht 1 ,mem_device_flag -04c8 18408401 increase 1 ,temp -04c9 6800c6d2 fetch 1 ,mem_device_number -04ca 98467c00 isub temp ,null -04cb 244143cc ncall mouse_select_device_count_clean ,positive -04cc 6008c720 storet 1 ,mem_device_flag -04cd 20600000 rtn +04c6 6808c720 fetcht 1 ,mem_device_flag +04c7 18408401 increase 1 ,temp +04c8 6800c6d2 fetch 1 ,mem_device_number +04c9 98467c00 isub temp ,null +04ca 244143cc ncall mouse_select_device_count_clean ,positive +04cb 6008c720 storet 1 ,mem_device_flag +04cc 20600000 rtn p_mouse_select_button_wakeup_firstup: -04ce 704b6d00 jam 0 ,mem_mouse_select_device_button_wakeup_flag -04cf 7046d901 jam pb_button_state_up ,mem_select_device_button_statue -04d0 704b2701 jam on ,mem_mouse_multi_led_blink_enable -04d1 20600000 rtn +04cd 704b6d00 jam 0 ,mem_mouse_select_device_button_wakeup_flag +04ce 7046d901 jam pb_button_state_up ,mem_select_device_button_statue +04cf 704b2701 jam on ,mem_mouse_multi_led_blink_enable +04d0 20600000 rtn p_mouse_le_bb_disconnected_led_blink_set: -04d2 704bb901 jam 1 ,mem_mouse_connected_state -04d3 704b2e0a jam 10 ,mem_mouse_multi_led_blink_count -04d4 20200742 branch p_mouse_dpi_multi_led_blink +04d1 704bb901 jam 1 ,mem_mouse_connected_state +04d2 704b2e0a jam 10 ,mem_mouse_multi_led_blink_count +04d3 20200742 branch p_mouse_dpi_multi_led_blink p_mouse_adc_read: -04d5 68014b2e fetch 2 ,mem_mouse_multi_led_blink_count -04d6 247a0000 nrtn blank -04d7 6800c6ce fetch 1 ,mem_adc_read_timer -04d8 1fe0fe01 increase 1 ,pdata -04d9 6000c6ce store 1 ,mem_adc_read_timer -04da 1fe67c0a sub pdata ,10 ,null -04db 20610000 rtn positive -04dc 204068a8 call adc_init_data -04dd 7046ce00 jam 0 ,mem_adc_read_timer -04de 204004f5 call p_adc_set_mode -04df 20406908 call vdd_calculate_by_mode -04e0 1feffe03 mul32 pdata ,3 ,pdata -04e1 d840000f arg 0x0f ,temp -04e2 98467e00 isub temp ,pdata -04e3 1fe67c64 sub pdata ,0x64 ,null -04e4 204104f2 call p_mouse_vdd_decrease ,positive -04e5 6001470f store 2 ,mem_mouse_vdd_now_vol -04e6 da204709 arg mem_mouse_vdd_calculate_set ,rega -04e7 204004fd call p_adc_bat_percent_lowpower_out -04e8 6800c231 fetch 1 ,mem_adc_power_flag -04e9 c280b40a bbit1 1 ,app_enter_hibernate -04ea c30004ed bbit0 0 ,p_mouse_adc_no_low_voltage -04eb 704aff01 jam 1 ,mem_mouse_adc_last_low_voltage_flag -04ec 202043e7 branch mouse_adc_low_voltage +04d4 68014b2e fetch 2 ,mem_mouse_multi_led_blink_count +04d5 247a0000 nrtn blank +04d6 6800c6ce fetch 1 ,mem_adc_read_timer +04d7 1fe0fe01 increase 1 ,pdata +04d8 6000c6ce store 1 ,mem_adc_read_timer +04d9 1fe67c0a sub pdata ,10 ,null +04da 20610000 rtn positive +04db 204068a8 call adc_init_data +04dc 7046ce00 jam 0 ,mem_adc_read_timer +04dd 204004f4 call p_adc_set_mode +04de 20406908 call vdd_calculate_by_mode +04df 1feffe03 mul32 pdata ,3 ,pdata +04e0 d840000f arg 0x0f ,temp +04e1 98467e00 isub temp ,pdata +04e2 1fe67c64 sub pdata ,0x64 ,null +04e3 204104f1 call p_mouse_vdd_decrease ,positive +04e4 6001470f store 2 ,mem_mouse_vdd_now_vol +04e5 da204709 arg mem_mouse_vdd_calculate_set ,rega +04e6 204004fc call p_adc_bat_percent_lowpower_out +04e7 6800c231 fetch 1 ,mem_adc_power_flag +04e8 c280b40a bbit1 1 ,app_enter_hibernate +04e9 c30004ec bbit0 0 ,p_mouse_adc_no_low_voltage +04ea 704aff01 jam 1 ,mem_mouse_adc_last_low_voltage_flag +04eb 202043e7 branch mouse_adc_low_voltage p_mouse_adc_no_low_voltage: -04ed 204043e9 call mouse_adc_no_low_voltage -04ee 6800caff fetch 1 ,mem_mouse_adc_last_low_voltage_flag -04ef 207a0000 rtn blank -04f0 704aff00 jam 0 ,mem_mouse_adc_last_low_voltage_flag -04f1 20200736 branch p_mouse_multi_led_off +04ec 204043e9 call mouse_adc_no_low_voltage +04ed 6800caff fetch 1 ,mem_mouse_adc_last_low_voltage_flag +04ee 207a0000 rtn blank +04ef 704aff00 jam 0 ,mem_mouse_adc_last_low_voltage_flag +04f0 20200736 branch p_mouse_multi_led_off p_mouse_vdd_decrease: -04f2 d8400005 arg 0x05 ,temp -04f3 98467e00 isub temp ,pdata -04f4 20600000 rtn +04f1 d8400005 arg 0x05 ,temp +04f2 98467e00 isub temp ,pdata +04f3 20600000 rtn p_adc_set_mode: p_adc_check_gpio: -04f5 68108078 hfetch 1 ,core_gpio_pu0 -04f6 793ffe05 set0 5 ,pdata -04f7 60108078 hstore 1 ,core_gpio_pu0 -04f8 204068f4 call adc_check_gpio -04f9 68108078 hfetch 1 ,core_gpio_pu0 -04fa 79207e05 set1 5 ,pdata -04fb 60108078 hstore 1 ,core_gpio_pu0 -04fc 20600000 rtn +04f4 68108078 hfetch 1 ,core_gpio_pu0 +04f5 793ffe05 set0 5 ,pdata +04f6 60108078 hstore 1 ,core_gpio_pu0 +04f7 204068f4 call adc_check_gpio +04f8 68108078 hfetch 1 ,core_gpio_pu0 +04f9 79207e05 set1 5 ,pdata +04fa 60108078 hstore 1 ,core_gpio_pu0 +04fb 20600000 rtn p_adc_bat_percent_lowpower_out: -04fd ea240000 ifetch 8 ,rega -04fe 60040a9a store 8 ,mem_pdatatemp -04ff 68090a9c fetcht 2 ,mem_pdatatemp + 2 -0500 68010aa0 fetch 2 ,mem_pdatatemp + 6 -0501 98467c00 isub temp ,null -0502 24216944 nbranch adc_set_no_power_flag ,positive -0503 68090a9e fetcht 2 ,mem_pdatatemp + 4 -0504 98467c00 isub temp ,null -0505 24216940 nbranch adc_set_low_power_flag ,positive +04fc ea240000 ifetch 8 ,rega +04fd 60040a9a store 8 ,mem_pdatatemp +04fe 68090a9c fetcht 2 ,mem_pdatatemp + 2 +04ff 68010aa0 fetch 2 ,mem_pdatatemp + 6 +0500 98467c00 isub temp ,null +0501 24216944 nbranch adc_set_no_power_flag ,positive +0502 68090a9e fetcht 2 ,mem_pdatatemp + 4 +0503 98467c00 isub temp ,null +0504 24216940 nbranch adc_set_low_power_flag ,positive p_adc_clear_low_power_flag: -0506 6800c231 fetch 1 ,mem_adc_power_flag -0507 793ffe00 set0 0 ,pdata -0508 6000c231 store 1 ,mem_adc_power_flag -0509 20600000 rtn +0505 6800c231 fetch 1 ,mem_adc_power_flag +0506 793ffe00 set0 0 ,pdata +0507 6000c231 store 1 ,mem_adc_power_flag +0508 20600000 rtn p_mouse_low_voltage_led_timer: -050a 680246d3 fetch mouse_flag_len ,mem_mouse_flag -050b c4020000 rtnbit0 mouse_low_voltage_flag -050c 68014682 fetch 2 ,mem_ui_state_map -050d c3858000 rtnbit1 ui_state_ble_adv -050e c3830000 rtnbit1 ui_state_bt_discovery -050f 68014b2e fetch 2 ,mem_mouse_multi_led_blink_count -0510 247a0000 nrtn blank -0511 6800c6cf fetch 1 ,mem_adc_low_volatage_led_timer_count -0512 1fe0fe01 pincrease 1 -0513 6000c6cf store 1 ,mem_adc_low_volatage_led_timer_count -0514 1fe67c1e sub pdata ,30 ,null -0515 24410519 ncall p_mouse_adc_low_volatage_led_timer_count_clean ,positive -0516 1fe67c0a sub pdata ,10 ,null -0517 20210728 branch p_mouse_multi_led_on ,positive -0518 20200736 branch p_mouse_multi_led_off +0509 680246d3 fetch mouse_flag_len ,mem_mouse_flag +050a c4020000 rtnbit0 mouse_low_voltage_flag +050b 68014682 fetch 2 ,mem_ui_state_map +050c c3858000 rtnbit1 ui_state_ble_adv +050d c3830000 rtnbit1 ui_state_bt_discovery +050e 68014b2e fetch 2 ,mem_mouse_multi_led_blink_count +050f 247a0000 nrtn blank +0510 6800c6cf fetch 1 ,mem_adc_low_volatage_led_timer_count +0511 1fe0fe01 pincrease 1 +0512 6000c6cf store 1 ,mem_adc_low_volatage_led_timer_count +0513 1fe67c1e sub pdata ,30 ,null +0514 24410518 ncall p_mouse_adc_low_volatage_led_timer_count_clean ,positive +0515 1fe67c0a sub pdata ,10 ,null +0516 20210728 branch p_mouse_multi_led_on ,positive +0517 20200736 branch p_mouse_multi_led_off p_mouse_adc_low_volatage_led_timer_count_clean: -0519 7046cf01 jam 1 ,mem_adc_low_volatage_led_timer_count -051a 20600000 rtn +0518 7046cf01 jam 1 ,mem_adc_low_volatage_led_timer_count +0519 20600000 rtn p_mouse_sensor_poweron: -051b 20400340 call p_mouse_spi_init -051c 58008006 setarg 0x8006 -051d 20406413 call twspi_write -051e 20002ee0 nop 12000 -051f da604b96 arg mem_sensor_poweron_init ,regc -0520 2040030f call p_sensor_wr_seq +051a 20400340 call p_mouse_spi_init +051b 58008006 setarg 0x8006 +051c 20406413 call twspi_write +051d 20002ee0 nop 12000 +051e da604b96 arg mem_sensor_poweron_init ,regc +051f 2040030f call p_sensor_wr_seq p_mouse_dpi_config: -0521 6800c77a fetch 1 ,mem_mouse_dpi -0522 c0ff8525 bne 0xff ,p_mouse_seting_dpi +0520 6800c77a fetch 1 ,mem_mouse_dpi +0521 c0ff8524 bne 0xff ,p_mouse_seting_dpi p_mouse_dpi_config_default: -0523 6800c6e1 fetch 1 ,mem_config_sensor_motion -0524 6000c77a store 1 ,mem_mouse_dpi +0522 6800c6e1 fetch 1 ,mem_config_sensor_motion +0523 6000c77a store 1 ,mem_mouse_dpi p_mouse_seting_dpi: p_mouse_seting_sensor_type: -0525 6800c77a fetch 1 ,mem_mouse_dpi -0526 1fe67c01 sub pdata ,mouse_dpi_level2 ,null -0527 20428531 call p_mouse_3205_dpi_recount ,zero -0528 6800c6e0 fetch 1 ,mem_config_sensor_type -0529 c002bdaa beq p3610 ,mouse_seting_3610_dpi -052a c0020540 beq p3212 ,p_mouse_seting_3212_dpi -052b c0030536 beq p3065_xy ,p_mouse_seting_3065xy_dpi -052c c02d0536 beq p_mx8650 ,p_mouse_seting_3065xy_dpi +0524 6800c77a fetch 1 ,mem_mouse_dpi +0525 1fe67c01 sub pdata ,mouse_dpi_level2 ,null +0526 20428530 call p_mouse_3205_dpi_recount ,zero +0527 6800c6e0 fetch 1 ,mem_config_sensor_type +0528 c002bdaa beq p3610 ,mouse_seting_3610_dpi +0529 c002053f beq p3212 ,p_mouse_seting_3212_dpi +052a c0030535 beq p3065_xy ,p_mouse_seting_3065xy_dpi +052b c02d0535 beq p_mx8650 ,p_mouse_seting_3065xy_dpi p_mouse_seting_3205_dpi: -052d 6800c77a fetch 1 ,mem_mouse_dpi -052e c0000533 beq mouse_dpi_level1 ,p_mouse_3205_set_cpi1 -052f c001bd8c beq mouse_dpi_level4 ,mouse_set_cpi3 -0530 20203d88 branch mouse_set_cpi2 +052c 6800c77a fetch 1 ,mem_mouse_dpi +052d c0000532 beq mouse_dpi_level1 ,p_mouse_3205_set_cpi1 +052e c001bd8c beq mouse_dpi_level4 ,mouse_set_cpi3 +052f 20203d88 branch mouse_set_cpi2 p_mouse_3205_dpi_recount: -0531 70477a02 jam mouse_dpi_level3 ,mem_mouse_dpi -0532 20600000 rtn +0530 70477a02 jam mouse_dpi_level3 ,mem_mouse_dpi +0531 20600000 rtn p_mouse_3205_set_cpi1: -0533 6800c77f fetch 1 ,mem_320x_dpi_1 -0534 1fe0ffff increase -1 ,pdata -0535 20203dbe branch mouse_p3205_dpi +0532 6800c77f fetch 1 ,mem_320x_dpi_1 +0533 1fe0ffff increase -1 ,pdata +0534 20203dbe branch mouse_p3205_dpi p_mouse_seting_3065xy_dpi: -0536 6800c77a fetch 1 ,mem_mouse_dpi -0537 c000053c beq mouse_dpi_level1 ,p_mouse_3065xy_set_cpi1 -0538 c001853e beq mouse_dpi_level4 ,p_mouse_3065xy_set_cpi4 +0535 6800c77a fetch 1 ,mem_mouse_dpi +0536 c000053b beq mouse_dpi_level1 ,p_mouse_3065xy_set_cpi1 +0537 c001853d beq mouse_dpi_level4 ,p_mouse_3065xy_set_cpi4 p_mouse_3065xy_set_cpi3: -0539 6800cb3c fetch 1 ,mem_3065xy_dpi_3 +0538 6800cb3c fetch 1 ,mem_3065xy_dpi_3 p_mouse_dpi_store: -053a 6000c6b5 store 1 ,mem_mouse_cpi_count -053b 20203dc1 branch mouse_p3205_dpi + 3 +0539 6000c6b5 store 1 ,mem_mouse_cpi_count +053a 20203dc1 branch mouse_p3205_dpi + 3 p_mouse_3065xy_set_cpi1: -053c 6800cb3a fetch 1 ,mem_3065xy_dpi_1 -053d 2020053a branch p_mouse_dpi_store +053b 6800cb3a fetch 1 ,mem_3065xy_dpi_1 +053c 20200539 branch p_mouse_dpi_store p_mouse_3065xy_set_cpi4: -053e 6800cb3d fetch 1 ,mem_3065xy_dpi_4 -053f 2020053a branch p_mouse_dpi_store +053d 6800cb3d fetch 1 ,mem_3065xy_dpi_4 +053e 20200539 branch p_mouse_dpi_store p_mouse_seting_3212_dpi: -0540 6800c77a fetch 1 ,mem_mouse_dpi -0541 c0003d9b beq mouse_dpi_level1 ,mouse_set_p3212_cpi2 -0542 c001bda1 beq mouse_dpi_level4 ,mouse_set_p3212_cpi4 -0543 20203d9f branch mouse_set_p3212_cpi3 +053f 6800c77a fetch 1 ,mem_mouse_dpi +0540 c0003d9b beq mouse_dpi_level1 ,mouse_set_p3212_cpi2 +0541 c001bda1 beq mouse_dpi_level4 ,mouse_set_p3212_cpi4 +0542 20203d9f branch mouse_set_p3212_cpi3 p_mouse_motion: -0544 78547c00 disable user -0545 58000000 setarg 0 -0546 6003469b store 6 ,mem_mouse_x -0547 20403fb5 call mouse_cheak_sensor_data -0548 20404079 call mouse_zwheel +0543 78547c00 disable user +0544 58000000 setarg 0 +0545 6003469b store 6 ,mem_mouse_x +0546 20403fb5 call mouse_cheak_sensor_data +0547 20404079 call mouse_zwheel +0548 20400582 call p_mouse_z_quickly_roll_sampling_timer 0549 2040054f call p_mouse_zwheel_quickly_roll_check 054a 2040056a call p_mouse_zwheel_quickly_roll_set 054b 2040407e call mouse_t_zwheel @@ -1868,7 +1868,7 @@ 0563 20600000 rtn p_mouse_z_quickly_parm_reset: -0564 704bbb02 jam 0x02 ,mem_mouse_z_quickly_roll_sampling_timer +0564 704bbb14 jam 0x14 ,mem_mouse_z_quickly_roll_sampling_timer 0565 704bc100 jam off ,mem_mouse_z_roll_stop_flag 0566 704bc200 jam 0x00 ,mem_mouse_z_quickly_roll_timer 0567 704bbe00 jam off ,mem_mouse_z_quickly_roll_flag @@ -35388,7 +35388,7 @@ z_mouse4_0_event_bb_disconn: 2000e 204041c1 call mouse_le_clean_connect_flag 2000f 68014208 fetch app_disc_rsn_size ,mem_app_disconn_reason -20010 c28504b6 bbit1 app_disc_pb_button ,p_mouse_select_device_button_up +20010 c28504b5 bbit1 app_disc_pb_button ,p_mouse_select_device_button_up 20011 202041f7 branch mouse4_0_event_bb_disconn + 2 z_mouse_event_light_state_pairing: @@ -35996,7 +35996,7 @@ z_mouse_le_bb_disconnected: b0022 6800cbba fetch 1 ,mem_select_device_button_statue_bt_discovery -b0023 205a04d2 call p_mouse_le_bb_disconnected_led_blink_set ,blank +b0023 205a04d1 call p_mouse_le_bb_disconnected_led_blink_set ,blank b0024 704bba00 jam off ,mem_select_device_button_statue_bt_discovery b0025 704b6a00 jam 0 ,mem_mouse_le_bb_connected_flag b0026 58000007 setarg le_interval_8_75ms Index: output/romcode.rom =================================================================== --- /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_D1123E/output/romcode.rom (revision 3806) +++ /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_D1123E/output/romcode.rom (working copy) @@ -24602,7 +24602,7 @@ 202042b0 204041c1 68014208 -c28504b6 +c28504b5 202041f7 c2828015 c2818015 @@ -25055,7 +25055,7 @@ c3828000 202033a7 6800cbba -205a04d2 +205a04d1 704bba00 704b6a00 58000007 @@ -25185,4 +25185,4 @@ 704b6b14 204003c1 202041c3 -00008a76 +00003bb6 Index: program/patch.prog =================================================================== --- /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_D1123E/program/patch.prog (revision 3806) +++ /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_D1123E/program/patch.prog (working copy) @@ -1915,7 +1915,6 @@ call p_mouse_low_voltage_led_timer endif call p_mouse_wheel_trigger_timer - call p_mouse_z_quickly_roll_sampling_timer call p_mouse_z_roll_stop_timer call p_mouse_z_quickly_roll_timer call p_mouse_select_device_by_button @@ -2332,6 +2331,7 @@ store 6,mem_mouse_x call mouse_cheak_sensor_data call mouse_zwheel + call p_mouse_z_quickly_roll_sampling_timer call p_mouse_zwheel_quickly_roll_check call p_mouse_zwheel_quickly_roll_set call mouse_t_zwheel @@ -2372,7 +2372,7 @@ rtn p_mouse_z_quickly_parm_reset: - jam 0x02,mem_mouse_z_quickly_roll_sampling_timer + jam 0x14,mem_mouse_z_quickly_roll_sampling_timer jam OFF,mem_mouse_z_roll_stop_flag jam 0x00,mem_mouse_z_quickly_roll_timer jam OFF,mem_mouse_z_quickly_roll_flag Index: sched/mouse.dat =================================================================== --- /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_D1123E/sched/mouse.dat (revision 3806) +++ /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_D1123E/sched/mouse.dat (working copy) @@ -136,7 +136,7 @@ mem_mouse_direct_timeout:2c 01#8s mem_mouse_no_data_timeout:78 ff #109min -mem_mouse_z_quickly_roll_sampling_timer:02 +mem_mouse_z_quickly_roll_sampling_timer:14 mem_flash_ncs_gpio:0a mem_spi_ncs_gpio:1e @@ -304,7 +304,7 @@ mem_24g_allpowerful_addr:0f 0f 0f 0f 0f 0f mem_24g_common_temp:00 00 00 00 00 00 00 00 00 00 mem_24g_enter_hibernate:80 4f 12 # 240ms dpi B4 B5 check easy -mem_firmware_version:04 00 +mem_firmware_version:05 00 mem_device_flag:01 mem_device1_type:34