Index: output/flash.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/PBSwitch_3mode_2ch_LTM-V59/output/flash.dat (revision 3661) +++ /branch/mouse_project/YJX_Project/YJX_1059/PBSwitch_3mode_2ch_LTM-V59/output/flash.dat (working copy) @@ -179,7 +179,7 @@ 20 20 04 -a4 +a5 58 00 01 @@ -339,11 +339,11 @@ c0 71 84 -a6 +a7 c0 73 04 -cc +cd c0 75 05 @@ -2551,7 +2551,7 @@ 20 20 04 -a6 +a7 70 89 5b @@ -2615,7 +2615,7 @@ 20 40 04 -72 +73 70 01 6d @@ -2623,7 +2623,7 @@ 20 40 04 -2e +2f 20 20 7d @@ -2759,7 +2759,7 @@ 20 40 04 -9c +9d 68 00 c6 @@ -2827,7 +2827,7 @@ 20 40 04 -9c +9d 20 20 40 @@ -4035,11 +4035,11 @@ 20 40 04 -42 +43 20 40 04 -2c +2d 20 40 02 @@ -4127,15 +4127,15 @@ 20 40 04 -15 +16 20 40 04 -53 +54 20 40 04 -79 +7a 20 40 42 @@ -4147,31 +4147,31 @@ 20 40 04 -58 +59 20 40 04 -5f +60 20 40 04 -3e +3f 20 40 04 -3b +3c 20 40 04 -45 +46 20 40 04 -4b +4c 20 40 04 -33 +34 20 40 42 @@ -4179,7 +4179,11 @@ 20 40 04 -36 +37 +20 +40 +06 +b4 20 20 06 @@ -4199,7 +4203,7 @@ da 40 04 -1a +1b 20 20 33 @@ -4227,7 +4231,7 @@ c0 00 04 -2e +2f 68 03 4b @@ -4239,7 +4243,7 @@ 20 40 04 -24 +25 20 20 7d @@ -4255,7 +4259,7 @@ 20 40 04 -2c +2d d8 c0 4b @@ -4323,7 +4327,7 @@ da 40 04 -39 +3a 20 20 33 @@ -4355,7 +4359,7 @@ da 40 04 -41 +42 20 20 33 @@ -4363,7 +4367,7 @@ 20 40 04 -6b +6c d8 e0 00 @@ -4383,7 +4387,7 @@ da 40 04 -48 +49 20 20 33 @@ -4399,7 +4403,7 @@ 20 20 04 -5d +5e 68 00 cb @@ -4415,7 +4419,7 @@ da 40 04 -50 +51 20 20 33 @@ -4439,7 +4443,7 @@ da 40 04 -56 +57 20 20 33 @@ -4459,7 +4463,7 @@ da 40 04 -5b +5c 20 20 33 @@ -4487,7 +4491,7 @@ da 40 04 -62 +63 20 20 33 @@ -4507,7 +4511,7 @@ da 40 04 -67 +68 20 20 33 @@ -4527,11 +4531,11 @@ 24 3a 04 -72 +73 20 40 04 -24 +25 68 01 46 @@ -4587,11 +4591,11 @@ 20 40 04 -75 +76 20 20 84 -85 +86 20 40 04 @@ -4599,7 +4603,7 @@ 20 40 04 -64 +65 68 00 c6 @@ -4655,7 +4659,7 @@ 24 41 04 -8f +90 68 00 c6 @@ -4675,7 +4679,7 @@ 20 40 04 -95 +96 70 41 bd @@ -4755,7 +4759,7 @@ c0 ff 84 -a6 +a7 68 00 c6 @@ -4771,7 +4775,7 @@ c0 02 04 -c4 +c5 68 00 c7 @@ -4779,15 +4783,15 @@ c0 00 04 -b3 +b4 c0 01 04 -b7 +b8 c0 01 84 -b1 +b2 68 00 c6 @@ -4795,7 +4799,7 @@ c0 03 04 -bb +bc 68 00 c7 @@ -4815,7 +4819,7 @@ 20 20 04 -b3 +b4 68 00 c6 @@ -4823,7 +4827,7 @@ c0 03 04 -be +bf 68 00 c7 @@ -4831,7 +4835,7 @@ 20 20 04 -af +b0 68 00 c6 @@ -4839,7 +4843,7 @@ c0 03 04 -c1 +c2 68 00 c7 @@ -4847,7 +4851,7 @@ 20 20 04 -af +b0 68 00 c7 @@ -4859,7 +4863,7 @@ 20 20 04 -af +b0 68 00 c7 @@ -4871,7 +4875,7 @@ 20 20 04 -af +b0 68 00 c7 @@ -4883,7 +4887,7 @@ 20 20 04 -af +b0 68 00 c7 @@ -4943,7 +4947,7 @@ 24 34 04 -d6 +d7 20 40 07 @@ -4951,7 +4955,7 @@ 20 40 04 -d9 +da 20 20 3f @@ -4994,10 +4998,6 @@ 01 70 4b -27 -01 -70 -4b 2a 00 70 @@ -6836,14 +6836,6 @@ 60 00 00 -68 -00 -cb -f5 -24 -5a -06 -b6 20 40 06 @@ -6877,6 +6869,14 @@ 00 00 68 +00 +cb +f5 +20 +7a +00 +00 +68 08 cb f6 @@ -8176,8 +8176,8 @@ 20 07 f6 -71 -fc +a4 +08 aa 55 08 @@ -9169,7 +9169,7 @@ 00 e0 4b -01 +02 00 aa 55 @@ -11195,7 +11195,7 @@ 20 40 04 -2c +2d 20 40 43 @@ -11247,7 +11247,7 @@ 20 40 04 -24 +25 20 20 7d @@ -11931,7 +11931,7 @@ 20 40 04 -2c +2d 20 40 34 @@ -11943,7 +11943,7 @@ 20 40 04 -28 +29 20 20 7d @@ -12211,7 +12211,7 @@ c2 85 04 -85 +86 20 20 41 @@ -12531,7 +12531,7 @@ 20 40 04 -24 +25 20 20 7d @@ -12660,5 +12660,5 @@ 55 00 00 -5c -32 +d5 +d9 Index: output/program.lis =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/PBSwitch_3mode_2ch_LTM-V59/output/program.lis (revision 3661) +++ /branch/mouse_project/YJX_Project/YJX_1059/PBSwitch_3mode_2ch_LTM-V59/output/program.lis (working copy) @@ -55,7 +55,7 @@ 0028 6000c71e store 1 ,mem_reconn_times 0029 6800c241 fetch 1 ,mem_power_on_flag 002a c3810000 rtnbit1 2 -002b 202004a4 branch p_mouse_dpi_config_default +002b 202004a5 branch p_mouse_dpi_config_default p_mouse_24g_transmit_by_interrupt_exit_count_max: 002c 58000177 setarg 375 @@ -99,8 +99,8 @@ 0050 c0588083 beq patch16_1 ,p_lpm_check_wake_lock 0051 c059008d beq patch16_2 ,p_g24_dispatch 0052 c062027d beq patch18_4 ,p_device_init -0053 c07184a6 beq patch1c_3 ,p_mouse_seting_dpi -0054 c07304cc beq patch1c_6 ,p_mouse_motion +0053 c07184a7 beq patch1c_3 ,p_mouse_seting_dpi +0054 c07304cd beq patch1c_6 ,p_mouse_motion 0055 c0750524 beq patch1d_2 ,p_mouse_bb_event_discovery_btn 0056 c0758527 beq patch1d_3 ,p_mouse_start_discovery 0057 c0760529 beq patch1d_4 ,p_mouse_stop_discovery @@ -834,7 +834,7 @@ p_mouse_set_sdio_high: 027a 6800cb00 fetch 1 ,mem_mouse_init_sensor_reset_flag 027b 207a0000 rtn blank -027c 202004a6 branch p_mouse_seting_sensor_type +027c 202004a7 branch p_mouse_seting_sensor_type p_device_init: 027d 70895b86 jam 0x86 ,0x895b @@ -856,9 +856,9 @@ 0289 c0198293 beq rec_3_mode ,p_mouse3_0_check_reconn_target 028a c01a0298 beq rec_4_mode ,p_mouse4_0_check_reconn_target 028b 204006cc call p_mouse_discovery_multi_led_blink -028c 20400472 call p_mouse_fast_conn_adv_switch_timer_reinit +028c 20400473 call p_mouse_fast_conn_adv_switch_timer_reinit 028d 70016d06 jam 6 ,mem_connection_options -028e 2040042e call p_mouse_check_fast_conn_adv_start +028e 2040042f call p_mouse_check_fast_conn_adv_start 028f 20207ddd branch check_51cmd_start_discovery p_mouse_tx_power_init: @@ -916,7 +916,7 @@ 02af 202002aa branch p_mouse_init_sensor p_mouse_init_p32xx_id2_judge: -02b0 2040049c call p_mouse_sensor_poweron +02b0 2040049d call p_mouse_sensor_poweron 02b1 6800c6de fetch 1 ,mem_sensor_id2 02b2 c06882b7 beq p3205_tj3t_id2 ,p_mouse_3205_3t_init_param 02b3 c00102b5 beq p3212_id2 ,p_mouse_3212_init_param @@ -941,7 +941,7 @@ 02c0 202002ba branch p_sensor_wr_seq p_mouse_p3065_init_param: -02c1 2040049c call p_mouse_sensor_poweron +02c1 2040049d call p_mouse_sensor_poweron 02c2 202040ea branch mouse_p3065_init_param p_mouse_setting_config: @@ -1347,8 +1347,8 @@ 03ec 58000000 setarg 0 03ed 6001cbeb store 3 ,mem_le_switch_adv_flag 03ee 70480b00 jam 0 ,mem_mouse_send_switch_req_timer -03ef 20400442 call p_mouse_bt_discovery_button_up_init -03f0 2040042c call p_mouse_store_eeprom_enable +03ef 20400443 call p_mouse_bt_discovery_button_up_init +03f0 2040042d call p_mouse_store_eeprom_enable 03f1 204002a7 call p_mouse_init_sensor_reset 03f2 202042ca branch mouse_stop_discovery @@ -1390,340 +1390,340 @@ 0405 20206413 branch twspi_write p_mouse_bb_event_timer: -0406 20400415 call p_mouse_le_switch_adv_timer -0407 20400453 call p_mouse_wheel_trigger_timer -0408 20400479 call p_mouse_select_device_by_button +0406 20400416 call p_mouse_le_switch_adv_timer +0407 20400454 call p_mouse_wheel_trigger_timer +0408 2040047a call p_mouse_select_device_by_button 0409 20404234 call mouse_check_discovery_timeout_timer 040a 2040423a call mouse_check_no_data_timeout_timer -040b 20400458 call p_mouse_g24_long_sleep_param_update_timer -040c 2040045f call p_mouse_g24_stop_mode_timeout_timer -040d 2040043e call p_mouse_check_direct_timeout_timer -040e 2040043b call p_mouse_le_enable_att_list_timer -040f 20400445 call p_mouse_le_current_mult_update_timer -0410 2040044b call p_le_send_smp_security_request_timer -0411 20400433 call p_mouse_send_switch_req_timer +040b 20400459 call p_mouse_g24_long_sleep_param_update_timer +040c 20400460 call p_mouse_g24_stop_mode_timeout_timer +040d 2040043f call p_mouse_check_direct_timeout_timer +040e 2040043c call p_mouse_le_enable_att_list_timer +040f 20400446 call p_mouse_le_current_mult_update_timer +0410 2040044c call p_le_send_smp_security_request_timer +0411 20400434 call p_mouse_send_switch_req_timer 0412 20404231 call mouse_check_hid_handshake_timer -0413 20400436 call p_mouse_bt_check_sniff_req_timeout_timer -0414 202006a6 branch p_mouse_multi_led_blink_timer +0413 20400437 call p_mouse_bt_check_sniff_req_timeout_timer +0414 204006b4 call p_mouse_logo_led_on_timer +0415 202006a6 branch p_mouse_multi_led_blink_timer p_mouse_le_switch_adv_timer: -0415 6800cbeb fetch 1 ,mem_le_switch_adv_flag -0416 207a0000 rtn blank -0417 da604bec arg mem_le_switch_adv_timer ,regc -0418 da40041a arg p_mouse_le_switch_adv ,regb -0419 2020336d branch timer_single_step +0416 6800cbeb fetch 1 ,mem_le_switch_adv_flag +0417 207a0000 rtn blank +0418 da604bec arg mem_le_switch_adv_timer ,regc +0419 da40041b arg p_mouse_le_switch_adv ,regb +041a 2020336d branch timer_single_step p_mouse_le_switch_adv: -041a 704bec01 jam 1 ,mem_le_switch_adv_timer -041b 6800cbed fetch 1 ,mem_le_switch_adv_count -041c 1fe0fe01 increase 1 ,pdata -041d 1fe17e01 and_into 1 ,pdata -041e 6000cbed store 1 ,mem_le_switch_adv_count -041f c000042e beq 0 ,p_mouse_check_fast_conn_adv_start1 +041b 704bec01 jam 1 ,mem_le_switch_adv_timer +041c 6800cbed fetch 1 ,mem_le_switch_adv_count +041d 1fe0fe01 increase 1 ,pdata +041e 1fe17e01 and_into 1 ,pdata +041f 6000cbed store 1 ,mem_le_switch_adv_count +0420 c000042f beq 0 ,p_mouse_check_fast_conn_adv_start1 p_check_51cmd_adv: -0420 68034be5 fetch 6 ,mem_le_normal_lap -0421 600344a0 store 6 ,mem_le_lap -0422 20400424 call p_mouse_le_adv_data_update -0423 20207df4 branch check_51cmd_adv +0421 68034be5 fetch 6 ,mem_le_normal_lap +0422 600344a0 store 6 ,mem_le_lap +0423 20400425 call p_mouse_le_adv_data_update +0424 20207df4 branch check_51cmd_adv p_mouse_le_adv_data_update: -0424 70436f1f jam 0x1f ,mem_le_adv_data_len -0425 70438f1f jam 0x1f ,mem_le_scan_data_len -0426 2040042c call p_mouse_store_eeprom_enable -0427 d8c04b12 arg mem_le_adv_swift_pair ,contr +0425 70436f1f jam 0x1f ,mem_le_adv_data_len +0426 70438f1f jam 0x1f ,mem_le_scan_data_len +0427 2040042d call p_mouse_store_eeprom_enable +0428 d8c04b12 arg mem_le_adv_swift_pair ,contr p_le_adv_data_update: -0428 d8a0437b arg mem_le_adv_data + 11 ,contw -0429 df200013 arg 19 ,loopcnt -042a 20407f01 call memcpy -042b 202057b8 branch le_modified_name_adv +0429 d8a0437b arg mem_le_adv_data + 11 ,contw +042a df200013 arg 19 ,loopcnt +042b 20407f01 call memcpy +042c 202057b8 branch le_modified_name_adv p_mouse_store_eeprom_enable: -042c d8e00007 arg mouse_store_eeprom_flag ,queue -042d 202043ce branch mouse_enable_function_flag +042d d8e00007 arg mouse_store_eeprom_flag ,queue +042e 202043ce branch mouse_enable_function_flag p_mouse_check_fast_conn_adv_start: p_mouse_check_fast_conn_adv_start1: -042e 70436f00 jam 0 ,mem_le_adv_data_len -042f 70438f00 jam 0 ,mem_le_scan_data_len -0430 d8e00007 arg mouse_store_eeprom_flag ,queue -0431 204043d2 call mouse_disable_function_flag -0432 2020029f branch p_mouse_fast_conn_init +042f 70436f00 jam 0 ,mem_le_adv_data_len +0430 70438f00 jam 0 ,mem_le_scan_data_len +0431 d8e00007 arg mouse_store_eeprom_flag ,queue +0432 204043d2 call mouse_disable_function_flag +0433 2020029f branch p_mouse_fast_conn_init p_mouse_send_switch_req_timer: -0433 da60480b arg mem_mouse_send_switch_req_timer ,regc -0434 da40637a arg host_create_conn_resend ,regb -0435 2020336d branch timer_single_step +0434 da60480b arg mem_mouse_send_switch_req_timer ,regc +0435 da40637a arg host_create_conn_resend ,regb +0436 2020336d branch timer_single_step p_mouse_bt_check_sniff_req_timeout_timer: -0436 da604b0b arg mem_mouse_bt_send_first_package_timer ,regc -0437 da400439 arg p_mouse_bt_send_first_package ,regb -0438 2020336d branch timer_single_step +0437 da604b0b arg mem_mouse_bt_send_first_package_timer ,regc +0438 da40043a arg p_mouse_bt_send_first_package ,regb +0439 2020336d branch timer_single_step p_mouse_bt_send_first_package: -0439 704b0c01 jam 1 ,mem_mouse_bt_send_first_package_flag -043a 20600000 rtn +043a 704b0c01 jam 1 ,mem_mouse_bt_send_first_package_flag +043b 20600000 rtn p_mouse_le_enable_att_list_timer: -043b da6046c6 arg mem_le_start_encrypt_timer ,regc -043c da403d60 arg mouse_le_write_enable ,regb -043d 2020336d branch timer_single_step +043c da6046c6 arg mem_le_start_encrypt_timer ,regc +043d da403d60 arg mouse_le_write_enable ,regb +043e 2020336d branch timer_single_step p_mouse_check_direct_timeout_timer: -043e da6046ae arg mem_mouse_direct_timer ,regc -043f da400441 arg p_mouse_check_direct_timeout ,regb -0440 20203374 branch timer_single_step_2b +043f da6046ae arg mem_mouse_direct_timer ,regc +0440 da400442 arg p_mouse_check_direct_timeout ,regb +0441 20203374 branch timer_single_step_2b p_mouse_check_direct_timeout: -0441 2040046b call p_mouse_long_button_bt_normal_discovery +0442 2040046c call p_mouse_long_button_bt_normal_discovery p_mouse_bt_discovery_button_up_init: -0442 d8e00009 arg mouse_bt_discovery_button_long_down_flag ,queue -0443 204043d2 call mouse_disable_function_flag -0444 202043ca branch mouse_bt_discovery_button_down_disable +0443 d8e00009 arg mouse_bt_discovery_button_long_down_flag ,queue +0444 204043d2 call mouse_disable_function_flag +0445 202043ca branch mouse_bt_discovery_button_down_disable p_mouse_le_current_mult_update_timer: -0445 da604b6a arg mem_mouse_le_current_mult_timer ,regc -0446 da400448 arg p_mouse_le_current_mult_reinit ,regb -0447 2020336d branch timer_single_step +0446 da604b6a arg mem_mouse_le_current_mult_timer ,regc +0447 da400449 arg p_mouse_le_current_mult_reinit ,regb +0448 2020336d branch timer_single_step p_mouse_le_current_mult_reinit: -0448 6800c7c7 fetch 1 ,mem_lpm_mult_init -0449 6000c172 store 1 ,mem_lpm_mult -044a 2020045d branch p_mouse_long_mult_flag_enable +0449 6800c7c7 fetch 1 ,mem_lpm_mult_init +044a 6000c172 store 1 ,mem_lpm_mult +044b 2020045e branch p_mouse_long_mult_flag_enable p_le_send_smp_security_request_timer: -044b 6800cb6c fetch 1 ,mem_mouse_le_bb_connected_flag -044c 207a0000 rtn blank -044d da604b6d arg mem_mouse_send_secutiry_request_timer ,regc -044e da400450 arg p_le_pairing_sm_start_check ,regb -044f 2020336d branch timer_single_step +044c 6800cb6c fetch 1 ,mem_mouse_le_bb_connected_flag +044d 207a0000 rtn blank +044e da604b6d arg mem_mouse_send_secutiry_request_timer ,regc +044f da400451 arg p_le_pairing_sm_start_check ,regb +0450 2020336d branch timer_single_step p_le_pairing_sm_start_check: -0450 6800cb6e fetch 1 ,mem_le_send_security_request_flag -0451 247a0000 nrtn blank -0452 20205bf5 branch le_pairing_sm_start +0451 6800cb6e fetch 1 ,mem_le_send_security_request_flag +0452 247a0000 nrtn blank +0453 20205bf5 branch le_pairing_sm_start p_mouse_wheel_trigger_timer: -0453 da604809 arg mem_mouse_wheel_trigger_timer ,regc -0454 da400456 arg p_mouse_wheel_trigger_disable ,regb -0455 2020336d branch timer_single_step +0454 da604809 arg mem_mouse_wheel_trigger_timer ,regc +0455 da400457 arg p_mouse_wheel_trigger_disable ,regb +0456 2020336d branch timer_single_step p_mouse_wheel_trigger_disable: -0456 70480800 jam 0 ,mem_mouse_wheel_trigger -0457 20600000 rtn +0457 70480800 jam 0 ,mem_mouse_wheel_trigger +0458 20600000 rtn p_mouse_g24_long_sleep_param_update_timer: -0458 da604b6b arg mem_24g_long_sleep_param_update_timer ,regc -0459 da40045b arg p_mouse_g24_long_sleep_normal_param ,regb -045a 2020336d branch timer_single_step +0459 da604b6b arg mem_24g_long_sleep_param_update_timer ,regc +045a da40045c arg p_mouse_g24_long_sleep_normal_param ,regb +045b 2020336d branch timer_single_step p_mouse_g24_long_sleep_normal_param: -045b 58057e40 setarg g24_long_sleep_step2 -045c 6001ccac store 3 ,mem_24g_enter_hibernate +045c 58057e40 setarg g24_long_sleep_step2 +045d 6001ccac store 3 ,mem_24g_enter_hibernate p_mouse_long_mult_flag_enable: -045d 704b6901 jam 1 ,mem_mouse_long_mult_flag -045e 20600000 rtn +045e 704b6901 jam 1 ,mem_mouse_long_mult_flag +045f 20600000 rtn p_mouse_g24_stop_mode_timeout_timer: -045f da604dc9 arg mem_24g_stop_g24_mode_timeout ,regc -0460 da400462 arg p_mouse_g24_stop_mode_timeout ,regb -0461 20203374 branch timer_single_step_2b +0460 da604dc9 arg mem_24g_stop_g24_mode_timeout ,regc +0461 da400463 arg p_mouse_g24_stop_mode_timeout ,regb +0462 20203374 branch timer_single_step_2b p_mouse_g24_stop_mode_timeout: -0462 704dc801 jam 1 ,mem_24g_stop_g24_mode -0463 20600000 rtn +0463 704dc801 jam 1 ,mem_24g_stop_g24_mode +0464 20600000 rtn p_mouse_bt_discovery_timer: -0464 da604b47 arg mem_select_ui_button_count ,regc -0465 da400467 arg p_mouse_long_button_bt_discovery ,regb -0466 2020336d branch timer_single_step +0465 da604b47 arg mem_select_ui_button_count ,regc +0466 da400468 arg p_mouse_long_button_bt_discovery ,regb +0467 2020336d branch timer_single_step p_mouse_long_button_bt_discovery: -0467 6800c720 fetch 1 ,mem_device_flag -0468 c1010000 rtneq mode_24g_device -0469 6800cbeb fetch 1 ,mem_le_switch_adv_flag -046a 243a0472 nbranch p_mouse_fast_conn_adv_switch_timer_reinit ,blank +0468 6800c720 fetch 1 ,mem_device_flag +0469 c1010000 rtneq mode_24g_device +046a 6800cbeb fetch 1 ,mem_le_switch_adv_flag +046b 243a0473 nbranch p_mouse_fast_conn_adv_switch_timer_reinit ,blank p_mouse_long_button_bt_normal_discovery: -046b 20400424 call p_mouse_le_adv_data_update -046c 68014682 fetch 2 ,mem_ui_state_map -046d 2feffe07 isolate1 ui_state_bt_reconnect ,pdata -046e 2040c392 call mouse_cancel_reconnect ,true -046f d8e00009 arg mouse_bt_discovery_button_long_down_flag ,queue -0470 204043ce call mouse_enable_function_flag -0471 202043b8 branch mouse_long_button_bt_discovry +046c 20400425 call p_mouse_le_adv_data_update +046d 68014682 fetch 2 ,mem_ui_state_map +046e 2feffe07 isolate1 ui_state_bt_reconnect ,pdata +046f 2040c392 call mouse_cancel_reconnect ,true +0470 d8e00009 arg mouse_bt_discovery_button_long_down_flag ,queue +0471 204043ce call mouse_enable_function_flag +0472 202043b8 branch mouse_long_button_bt_discovry p_mouse_fast_conn_adv_switch_timer_reinit: -0472 68014687 fetch 2 ,mem_discovery_timeout -0473 600146ac store 2 ,mem_mouse_discovery_timer -0474 20600000 rtn +0473 68014687 fetch 2 ,mem_discovery_timeout +0474 600146ac store 2 ,mem_mouse_discovery_timer +0475 20600000 rtn p_mouse_get_select_state: -0475 6808c6ed fetcht 1 ,mem_config_select_device_button_gpio -0476 204004ff call p_gpio_set_input_pd -0477 6808c6ed fetcht 1 ,mem_config_select_device_button_gpio -0478 2020681d branch gpio_get_bit +0476 6808c6ed fetcht 1 ,mem_config_select_device_button_gpio +0477 204004ff call p_gpio_set_input_pd +0478 6808c6ed fetcht 1 ,mem_config_select_device_button_gpio +0479 2020681d branch gpio_get_bit p_mouse_select_device_by_button: -0479 20400475 call p_mouse_get_select_state -047a 20208485 branch p_mouse_select_device_button_up ,true -047b 204004fa call p_gpio_set_input_pu +047a 20400476 call p_mouse_get_select_state +047b 20208486 branch p_mouse_select_device_button_up ,true +047c 204004fa call p_gpio_set_input_pu p_mouse_select_device_button_down: -047c 20400464 call p_mouse_bt_discovery_timer -047d 6800c6d9 fetch 1 ,mem_select_device_button_statue -047e c1000000 rtneq pb_button_state_down -047f 7046d900 jam pb_button_state_down ,mem_select_device_button_statue -0480 680146a8 fetch 2 ,mem_mouse_direct_timeout -0481 600146ae store 2 ,mem_mouse_direct_timer -0482 18000e03 force page_length_timer ,queue -0483 680140b9 fetch 2 ,mem_page_to -0484 20207f08 branch timer_init +047d 20400465 call p_mouse_bt_discovery_timer +047e 6800c6d9 fetch 1 ,mem_select_device_button_statue +047f c1000000 rtneq pb_button_state_down +0480 7046d900 jam pb_button_state_down ,mem_select_device_button_statue +0481 680146a8 fetch 2 ,mem_mouse_direct_timeout +0482 600146ae store 2 ,mem_mouse_direct_timer +0483 18000e03 force page_length_timer ,queue +0484 680140b9 fetch 2 ,mem_page_to +0485 20207f08 branch timer_init p_mouse_select_device_button_up: -0485 204004fa call p_gpio_set_input_pu -0486 6800c6d9 fetch 1 ,mem_select_device_button_statue -0487 c1008000 rtneq pb_button_state_up -0488 6800cb47 fetch 1 ,mem_select_ui_button_count -0489 1fe67c14 sub pdata ,20 ,null -048a 2441048f ncall p_mouse_ready_reconnection_by_button ,positive -048b 6800c685 fetch 1 ,mem_ui_button_timeout -048c 6000cb47 store 1 ,mem_select_ui_button_count -048d 7046d901 jam pb_button_state_up ,mem_select_device_button_statue -048e 20600000 rtn +0486 204004fa call p_gpio_set_input_pu +0487 6800c6d9 fetch 1 ,mem_select_device_button_statue +0488 c1008000 rtneq pb_button_state_up +0489 6800cb47 fetch 1 ,mem_select_ui_button_count +048a 1fe67c14 sub pdata ,20 ,null +048b 24410490 ncall p_mouse_ready_reconnection_by_button ,positive +048c 6800c685 fetch 1 ,mem_ui_button_timeout +048d 6000cb47 store 1 ,mem_select_ui_button_count +048e 7046d901 jam pb_button_state_up ,mem_select_device_button_statue +048f 20600000 rtn p_mouse_ready_reconnection_by_button: -048f 20400495 call p_mouse_switch_device_flag -0490 7041bd00 jam 0 ,mem_link_key_exists -0491 204002e0 call p_mouse_store_flash_device_info -0492 680246d3 fetch mouse_flag_len ,mem_mouse_flag -0493 c1048000 rtneq mouse_bt_discovery_button_long_down_flag -0494 2020437e branch mouse_set_reconnection +0490 20400496 call p_mouse_switch_device_flag +0491 7041bd00 jam 0 ,mem_link_key_exists +0492 204002e0 call p_mouse_store_flash_device_info +0493 680246d3 fetch mouse_flag_len ,mem_mouse_flag +0494 c1048000 rtneq mouse_bt_discovery_button_long_down_flag +0495 2020437e branch mouse_set_reconnection p_mouse_switch_device_flag: -0495 6808c720 fetcht 1 ,mem_device_flag -0496 18408401 increase 1 ,temp -0497 6800c6d2 fetch 1 ,mem_device_number -0498 98467c00 isub temp ,null -0499 244143cc ncall mouse_select_device_count_clean ,positive -049a 6008c720 storet 1 ,mem_device_flag -049b 20600000 rtn +0496 6808c720 fetcht 1 ,mem_device_flag +0497 18408401 increase 1 ,temp +0498 6800c6d2 fetch 1 ,mem_device_number +0499 98467c00 isub temp ,null +049a 244143cc ncall mouse_select_device_count_clean ,positive +049b 6008c720 storet 1 ,mem_device_flag +049c 20600000 rtn p_mouse_sensor_poweron: -049c 204002e6 call p_mouse_spi_init -049d 58008006 setarg 0x8006 -049e 20406413 call twspi_write -049f 20002ee0 nop 12000 -04a0 da604b96 arg mem_sensor_poweron_init ,regc -04a1 204002ba call p_sensor_wr_seq +049d 204002e6 call p_mouse_spi_init +049e 58008006 setarg 0x8006 +049f 20406413 call twspi_write +04a0 20002ee0 nop 12000 +04a1 da604b96 arg mem_sensor_poweron_init ,regc +04a2 204002ba call p_sensor_wr_seq p_mouse_dpi_config: -04a2 6800c77a fetch 1 ,mem_mouse_dpi -04a3 c0ff84a6 bne 0xff ,p_mouse_seting_dpi +04a3 6800c77a fetch 1 ,mem_mouse_dpi +04a4 c0ff84a7 bne 0xff ,p_mouse_seting_dpi p_mouse_dpi_config_default: -04a4 6800c6e1 fetch 1 ,mem_config_sensor_motion -04a5 6000c77a store 1 ,mem_mouse_dpi +04a5 6800c6e1 fetch 1 ,mem_config_sensor_motion +04a6 6000c77a store 1 ,mem_mouse_dpi p_mouse_seting_dpi: p_mouse_seting_sensor_type: -04a6 6800c6e0 fetch 1 ,mem_config_sensor_type -04a7 c00204c4 beq p3212 ,p_mouse_seting_3212_dpi -04a8 6800c77a fetch 1 ,mem_mouse_dpi -04a9 c00004b3 beq mouse_dpi_level1 ,p_mouse_set_cpi1 -04aa c00104b7 beq mouse_dpi_level3 ,p_mouse_set_cpi3 -04ab c00184b1 beq mouse_dpi_level4 ,p_mouse_dpi_recount +04a7 6800c6e0 fetch 1 ,mem_config_sensor_type +04a8 c00204c5 beq p3212 ,p_mouse_seting_3212_dpi +04a9 6800c77a fetch 1 ,mem_mouse_dpi +04aa c00004b4 beq mouse_dpi_level1 ,p_mouse_set_cpi1 +04ab c00104b8 beq mouse_dpi_level3 ,p_mouse_set_cpi3 +04ac c00184b2 beq mouse_dpi_level4 ,p_mouse_dpi_recount p_mouse_set_cpi2: -04ac 6800c6e0 fetch 1 ,mem_config_sensor_type -04ad c00304bb beq p3065_xy ,p_mouse_3065xy_set_cpi2 +04ad 6800c6e0 fetch 1 ,mem_config_sensor_type +04ae c00304bc beq p3065_xy ,p_mouse_3065xy_set_cpi2 p_mouse_320x_set_cpi3: -04ae 6800c781 fetch 1 ,mem_320x_dpi_3 +04af 6800c781 fetch 1 ,mem_320x_dpi_3 p_mouse_dpi_store: -04af 6000c6b5 store 1 ,mem_mouse_cpi_count -04b0 20203dc1 branch mouse_p3205_dpi + 3 +04b0 6000c6b5 store 1 ,mem_mouse_cpi_count +04b1 20203dc1 branch mouse_p3205_dpi + 3 p_mouse_dpi_recount: -04b1 70477a00 jam mouse_dpi_level1 ,mem_mouse_dpi -04b2 202004b3 branch p_mouse_set_cpi1 +04b2 70477a00 jam mouse_dpi_level1 ,mem_mouse_dpi +04b3 202004b4 branch p_mouse_set_cpi1 p_mouse_set_cpi1: -04b3 6800c6e0 fetch 1 ,mem_config_sensor_type -04b4 c00304be beq p3065_xy ,p_mouse_3065xy_set_cpi1 +04b4 6800c6e0 fetch 1 ,mem_config_sensor_type +04b5 c00304bf beq p3065_xy ,p_mouse_3065xy_set_cpi1 p_mouse_320x_set_cpi1: -04b5 6800c77f fetch 1 ,mem_320x_dpi_1 -04b6 202004af branch p_mouse_dpi_store +04b6 6800c77f fetch 1 ,mem_320x_dpi_1 +04b7 202004b0 branch p_mouse_dpi_store p_mouse_set_cpi3: -04b7 6800c6e0 fetch 1 ,mem_config_sensor_type -04b8 c00304c1 beq p3065_xy ,p_mouse_3065xy_set_cpi3 +04b8 6800c6e0 fetch 1 ,mem_config_sensor_type +04b9 c00304c2 beq p3065_xy ,p_mouse_3065xy_set_cpi3 p_mouse_320x_set_cpi4: -04b9 6800c782 fetch 1 ,mem_320x_dpi_4 -04ba 202004af branch p_mouse_dpi_store +04ba 6800c782 fetch 1 ,mem_320x_dpi_4 +04bb 202004b0 branch p_mouse_dpi_store p_mouse_3065xy_set_cpi2: -04bb 6800c781 fetch 1 ,mem_320x_dpi_3 -04bc 1fe0ffff increase -1 ,pdata -04bd 202004af branch p_mouse_dpi_store +04bc 6800c781 fetch 1 ,mem_320x_dpi_3 +04bd 1fe0ffff increase -1 ,pdata +04be 202004b0 branch p_mouse_dpi_store p_mouse_3065xy_set_cpi1: -04be 6800c77f fetch 1 ,mem_320x_dpi_1 -04bf 1fe0ffff increase -1 ,pdata -04c0 202004af branch p_mouse_dpi_store +04bf 6800c77f fetch 1 ,mem_320x_dpi_1 +04c0 1fe0ffff increase -1 ,pdata +04c1 202004b0 branch p_mouse_dpi_store p_mouse_3065xy_set_cpi3: -04c1 6800c782 fetch 1 ,mem_320x_dpi_4 -04c2 1fe0ffff increase -1 ,pdata -04c3 202004af branch p_mouse_dpi_store +04c2 6800c782 fetch 1 ,mem_320x_dpi_4 +04c3 1fe0ffff increase -1 ,pdata +04c4 202004b0 branch p_mouse_dpi_store p_mouse_seting_3212_dpi: -04c4 6800c77a fetch 1 ,mem_mouse_dpi -04c5 c0003d9d beq mouse_dpi_level1 ,mouse_set_p3212_cpi1 -04c6 c000bd9b beq mouse_dpi_level2 ,mouse_set_p3212_cpi2 -04c7 c0013d9f beq mouse_dpi_level3 ,mouse_set_p3212_cpi3 -04c8 c001bda1 beq mouse_dpi_level4 ,mouse_set_p3212_cpi4 -04c9 c0023da1 beq mouse_dpi_level5 ,mouse_set_p3212_cpi4 +04c5 6800c77a fetch 1 ,mem_mouse_dpi +04c6 c0003d9d beq mouse_dpi_level1 ,mouse_set_p3212_cpi1 +04c7 c000bd9b beq mouse_dpi_level2 ,mouse_set_p3212_cpi2 +04c8 c0013d9f beq mouse_dpi_level3 ,mouse_set_p3212_cpi3 +04c9 c001bda1 beq mouse_dpi_level4 ,mouse_set_p3212_cpi4 +04ca c0023da1 beq mouse_dpi_level5 ,mouse_set_p3212_cpi4 p_mouse_set_p3212_cpi3: -04ca 70477a02 jam mouse_dpi_level3 ,mem_mouse_dpi -04cb 20203d9f branch mouse_set_p3212_cpi3 +04cb 70477a02 jam mouse_dpi_level3 ,mem_mouse_dpi +04cc 20203d9f branch mouse_set_p3212_cpi3 p_mouse_motion: -04cc 78547c00 disable user -04cd 58000000 setarg 0 -04ce 6003469b store 6 ,mem_mouse_x -04cf 20400505 call p_mouse_cheak_sensor_data -04d0 20404079 call mouse_zwheel -04d1 204004e5 call p_mouse_key -04d2 243404d6 nbranch p_mouse_motion_nodata ,user -04d3 20400786 call p_drawing_optima -04d4 204004d9 call p_mouse_logo_led_on_check -04d5 20203fa0 branch mouse_motion + 9 +04cd 78547c00 disable user +04ce 58000000 setarg 0 +04cf 6003469b store 6 ,mem_mouse_x +04d0 20400505 call p_mouse_cheak_sensor_data +04d1 20404079 call mouse_zwheel +04d2 204004e5 call p_mouse_key +04d3 243404d7 nbranch p_mouse_motion_nodata ,user +04d4 20400786 call p_drawing_optima +04d5 204004da call p_mouse_logo_led_on_check +04d6 20203fa0 branch mouse_motion + 9 p_mouse_motion_nodata: -04d6 20400791 call p_drawing_optima_init -04d7 704bf400 jam 0 ,mem_mouse_logo_led_on_check_count -04d8 20600000 rtn +04d7 20400791 call p_drawing_optima_init +04d8 704bf400 jam 0 ,mem_mouse_logo_led_on_check_count +04d9 20600000 rtn p_mouse_logo_led_on_check: -04d9 6800cbf4 fetch 1 ,mem_mouse_logo_led_on_check_count -04da 1fe0fe01 increase 1 ,pdata -04db 6000cbf4 store 1 ,mem_mouse_logo_led_on_check_count -04dc 1fe67c08 sub pdata ,low_voltage_led_count ,null -04dd 20610000 rtn positive +04da 6800cbf4 fetch 1 ,mem_mouse_logo_led_on_check_count +04db 1fe0fe01 increase 1 ,pdata +04dc 6000cbf4 store 1 ,mem_mouse_logo_led_on_check_count +04dd 1fe67c08 sub pdata ,low_voltage_led_count ,null +04de 20610000 rtn positive p_mouse_logo_led_on_enable: -04de 704bf501 jam on ,mem_mouse_logo_led_on_enable -04df 704b2701 jam on ,mem_mouse_multi_led_blink_enable +04df 704bf501 jam on ,mem_mouse_logo_led_on_enable 04e0 704b2a00 jam multi_led_on ,mem_mouse_multi_led_type 04e1 704b2b00 jam 0 ,mem_mouse_multi_led_on_timer @@ -2380,16 +2380,18 @@ 06ab 20600000 rtn p_mouse_multi_led_type_on: -06ac 6800cbf5 fetch 1 ,mem_mouse_logo_led_on_enable -06ad 245a06b6 ncall p_mouse_logo_led_on ,blank -06ae 204006de call p_mouse_multi_led_on -06af 6800cb2b fetch 1 ,mem_mouse_multi_led_on_timer -06b0 1fe0fe01 increase 1 ,pdata -06b1 6000cb2b store 1 ,mem_mouse_multi_led_on_timer -06b2 6808cb2c fetcht 1 ,mem_mouse_multi_led_on_timer_init -06b3 98467c00 isub temp ,null -06b4 204286c3 call p_mouse_multi_led_off_poweron2s ,zero -06b5 20600000 rtn +06ac 204006de call p_mouse_multi_led_on +06ad 6800cb2b fetch 1 ,mem_mouse_multi_led_on_timer +06ae 1fe0fe01 increase 1 ,pdata +06af 6000cb2b store 1 ,mem_mouse_multi_led_on_timer +06b0 6808cb2c fetcht 1 ,mem_mouse_multi_led_on_timer_init +06b1 98467c00 isub temp ,null +06b2 204286c3 call p_mouse_multi_led_off_poweron2s ,zero +06b3 20600000 rtn + +p_mouse_logo_led_on_timer: +06b4 6800cbf5 fetch 1 ,mem_mouse_logo_led_on_enable +06b5 207a0000 rtn blank p_mouse_logo_led_on: 06b6 6808cbf6 fetcht 1 ,mem_mouse_logo_led_gpio @@ -35522,7 +35524,7 @@ z_check_51cmd_adv: 1001e 68034be5 fetch 6 ,mem_le_normal_lap 1001f 600344a0 store 6 ,mem_le_lap -10020 20400424 call p_mouse_le_adv_data_update +10020 20400425 call p_mouse_le_adv_data_update 10021 20207df4 branch check_51cmd_adv org 0x20001 @@ -35546,7 +35548,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 c2850485 bbit1 app_disc_pb_button ,p_mouse_select_device_button_up +20010 c2850486 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: @@ -35600,10 +35602,10 @@ 30007 7047a101 jam 1 ,mem_mouse_le_reconnect_flag 30008 680146a8 fetch 2 ,mem_mouse_direct_timeout 30009 600146ae store 2 ,mem_mouse_direct_timer -3000a 2040042c call p_mouse_store_eeprom_enable +3000a 2040042d call p_mouse_store_eeprom_enable 3000b 20403418 call app_lpm_mult_disable 3000c d8c04390 arg mem_le_scan_data ,contr -3000d 20400428 call p_le_adv_data_update +3000d 20400429 call p_le_adv_data_update 3000e 20207df4 branch check_51cmd_adv z_send_lmp_escape: @@ -35789,7 +35791,7 @@ 6000f 58000000 setarg 0 60010 600146b0 store 2 ,mem_mouse_no_data_timer 60011 600146ae store 2 ,mem_mouse_direct_timer -60012 2040042c call p_mouse_store_eeprom_enable +60012 2040042d call p_mouse_store_eeprom_enable 60013 204043ca call mouse_bt_discovery_button_down_disable 60014 704b5300 jam 0 ,mem_mouse_bt_reconnect_flag 60015 20400306 call p_mouse_load_flash_device_info @@ -35804,7 +35806,7 @@ z3_check_51cmd_adv: 6001d 68034be5 fetch 6 ,mem_le_normal_lap 6001e 600344a0 store 6 ,mem_le_lap -6001f 20400424 call p_mouse_le_adv_data_update +6001f 20400425 call p_mouse_le_adv_data_update 60020 20207df4 branch check_51cmd_adv org 0x70001 Index: output/romcode.rom =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/PBSwitch_3mode_2ch_LTM-V59/output/romcode.rom (revision 3661) +++ /branch/mouse_project/YJX_Project/YJX_1059/PBSwitch_3mode_2ch_LTM-V59/output/romcode.rom (working copy) @@ -24603,7 +24603,7 @@ 207a0000 68034be5 600344a0 -20400424 +20400425 20207df4 c0080004 c008801b @@ -24620,7 +24620,7 @@ 202042b0 204041c1 68014208 -c2850485 +c2850486 202041f7 c2828015 c2818015 @@ -24659,10 +24659,10 @@ 7047a101 680146a8 600146ae -2040042c +2040042d 20403418 d8c04390 -20400428 +20400429 20207df4 68008048 c0420013 @@ -24791,7 +24791,7 @@ 58000000 600146b0 600146ae -2040042c +2040042d 204043ca 704b5300 20400306 @@ -24804,7 +24804,7 @@ 202006cc 68034be5 600344a0 -20400424 +20400425 20207df4 c0300005 c0308017 @@ -25137,4 +25137,4 @@ 20400035 6008cdcc 20600000 -0000420e +00005960 Index: program/patch.prog =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/PBSwitch_3mode_2ch_LTM-V59/program/patch.prog (revision 3661) +++ /branch/mouse_project/YJX_Project/YJX_1059/PBSwitch_3mode_2ch_LTM-V59/program/patch.prog (working copy) @@ -1755,6 +1755,7 @@ call mouse_check_hid_handshake_timer call p_mouse_bt_check_sniff_req_timeout_timer endif + call p_mouse_logo_led_on_timer branch p_mouse_multi_led_blink_timer ifdef BLE_FAST_CONN_ENABLE @@ -2205,7 +2206,6 @@ rtn positive p_mouse_logo_led_on_enable: jam ON,mem_mouse_logo_led_on_enable - jam ON,mem_mouse_multi_led_blink_enable jam MULTI_LED_ON,mem_mouse_multi_led_type jam 0,mem_mouse_multi_led_on_timer p_mouse_logo_led_on_revert: @@ -2975,8 +2975,6 @@ rtn p_mouse_multi_led_type_on: - fetch 1,mem_mouse_logo_led_on_enable - ncall p_mouse_logo_led_on,blank call p_mouse_multi_led_on fetch 1,mem_mouse_multi_led_on_timer increase 1,pdata @@ -2986,6 +2984,9 @@ call p_mouse_multi_led_off_poweron2s,zero rtn +p_mouse_logo_led_on_timer: + fetch 1,mem_mouse_logo_led_on_enable + rtn blank p_mouse_logo_led_on: fetcht 1,mem_mouse_logo_led_gpio call gpio_out_active Index: sched/mouse.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/PBSwitch_3mode_2ch_LTM-V59/sched/mouse.dat (revision 3661) +++ /branch/mouse_project/YJX_Project/YJX_1059/PBSwitch_3mode_2ch_LTM-V59/sched/mouse.dat (working copy) @@ -318,7 +318,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:40 7e 05 # 240ms dpi B4 B5 check easy -mem_firmware_version:01 00 +mem_firmware_version:02 00 mem_device_flag:02 mem_device1_type:34