Index: output/flash.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_LBX-172/output/flash.dat (revision 3715) +++ /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_LBX-172/output/flash.dat (working copy) @@ -135,7 +135,7 @@ 58 00 03 -e0 +df 60 01 41 @@ -151,7 +151,7 @@ 58 00 04 -19 +18 60 01 41 @@ -159,7 +159,7 @@ 58 00 04 -26 +25 60 01 41 @@ -187,7 +187,7 @@ 20 40 04 -1f +1e 68 00 c7 @@ -1099,7 +1099,7 @@ 20 20 04 -1f +1e 68 00 cc @@ -3889,10 +3889,6 @@ 7e 34 20 -40 -03 -cd -20 20 3e e0 @@ -3915,7 +3911,7 @@ 20 20 83 -de +dd 20 40 05 @@ -3962,8 +3958,8 @@ ee 20 20 -3d -7e +04 +fb 20 40 05 @@ -3979,31 +3975,31 @@ c0 0a 03 -f1 +f0 c0 0a 83 -f3 +f2 c0 14 83 -f5 +f4 c0 19 03 -f7 +f6 c0 20 03 -f9 +f8 c0 02 03 -fb +fa c0 09 83 -fb +fa c0 0c b3 @@ -4011,31 +4007,31 @@ c0 10 83 -ff +fe c0 00 84 -01 +00 c0 01 04 -08 +07 c0 15 84 -0a +09 c0 1c 84 -0c +0b c0 1d 04 -11 +10 c0 1e 04 -14 +13 20 20 41 @@ -4171,7 +4167,7 @@ 20 40 04 -1c +1b 70 11 c6 @@ -4203,7 +4199,7 @@ 20 40 04 -1c +1b 70 11 c6 @@ -4254,6 +4250,10 @@ 13 20 40 +03 +cc +20 +40 04 aa 20 @@ -7984,8 +7984,8 @@ 20 07 c6 -3e -c5 +69 +fc aa 55 08 @@ -8913,7 +8913,7 @@ 00 a7 4b -01 +02 00 aa 55 @@ -9121,7 +9121,7 @@ 20 40 03 -f5 +f4 70 46 c6 @@ -9137,7 +9137,7 @@ 20 40 04 -1c +1b 70 4a ff @@ -9369,7 +9369,7 @@ 20 40 03 -f5 +f4 70 47 c4 @@ -9389,7 +9389,7 @@ 20 40 04 -1c +1b 70 4b 72 @@ -12077,7 +12077,7 @@ c0 02 83 -fd +fc 20 20 4d @@ -12106,5 +12106,5 @@ 55 00 00 -6d -1e +76 +b5 Index: output/program.lis =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_LBX-172/output/program.lis (revision 3715) +++ /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_LBX-172/output/program.lis (working copy) @@ -40,13 +40,13 @@ 001d 600141f1 store 2 ,mem_cb_bt_process 001e 5800029f setarg p_mouse_before_lpm 001f 600141ed store 2 ,mem_cb_before_lpm -0020 580003e0 setarg p_mouse_priority_bb_event +0020 580003df setarg p_mouse_priority_bb_event 0021 600141f5 store 2 ,mem_cb_bb_event_process 0022 580003ca setarg p_mouse_idle 0023 600141f3 store 2 ,mem_cb_idle_process -0024 58000419 setarg p_mouse_before_hibernate +0024 58000418 setarg p_mouse_before_hibernate 0025 600141eb store 2 ,mem_cb_before_hibernate -0026 58000426 setarg p_mouse_bb_event_timer +0026 58000425 setarg p_mouse_bb_event_timer 0027 600141fd store 2 ,mem_cb_event_timer 0028 20600000 rtn @@ -55,7 +55,7 @@ 002a 60014d7e store 2 ,mem_24g_transmit_by_interrupt_exit_count_init 002b 24558035 ncall p_mouse_24g_transmit_by_interrupt_exit_count_max ,wake 002c 204002c3 call p_mouse_init_sunt -002d 2040041f call p_mouse_sensor_powerdown +002d 2040041e call p_mouse_sensor_powerdown p_mouse_wakeup_no_from_power: 002e 6800c71f fetch 1 ,mem_reconn_times_init @@ -347,7 +347,7 @@ 010e 6000cd8b store 1 ,mem_24g_search_dongle_action 010f 58000708 setarg g24_disconn_nodata_timer 0110 600146b0 store 2 ,mem_mouse_no_data_timer -0111 2020041f branch p_mouse_sensor_powerdown +0111 2020041e branch p_mouse_sensor_powerdown p_g24_search_dongle_success: 0112 6800cc67 fetch 1 ,mem_24g_abort_pac @@ -1287,145 +1287,145 @@ p_mouse_idle: 03ca 20407e34 call ui_check_paring_button -03cb 204003cd call p_mouse_dpi_check -03cc 20203ee0 branch mouse_wheel_check +03cb 20203ee0 branch mouse_wheel_check p_mouse_dpi_check: -03cd 6808c6e7 fetcht 1 ,mem_dpi_button_gpio -03ce 20400544 call p_gpio_set_input_pd -03cf 6808c6e7 fetcht 1 ,mem_dpi_button_gpio -03d0 2040681d call gpio_get_bit -03d1 202083de branch p_mouse_dpi_up ,true -03d2 2040053f call p_gpio_set_input_pu +03cc 6808c6e7 fetcht 1 ,mem_dpi_button_gpio +03cd 20400544 call p_gpio_set_input_pd +03ce 6808c6e7 fetcht 1 ,mem_dpi_button_gpio +03cf 2040681d call gpio_get_bit +03d0 202083dd branch p_mouse_dpi_up ,true +03d1 2040053f call p_gpio_set_input_pu p_mouse_dpi_down: -03d3 6800c6b6 fetch 1 ,mem_mouse_dpi_button_state -03d4 c1000000 rtneq dpi_button_state_down -03d5 7046b600 jam dpi_button_state_down ,mem_mouse_dpi_button_state -03d6 6800c77a fetch 1 ,mem_mouse_dpi -03d7 1fe0fe01 increase 1 ,pdata -03d8 1fe17e03 and pdata ,0x03 ,pdata -03d9 6000c77a store 1 ,mem_mouse_dpi -03da 1fe0fe02 increase 2 ,pdata -03db 6000cb2c store 1 ,mem_mouse_multi_led_blink_count -03dc 204004ee call p_mouse_dpi_multi_led_blink -03dd 20203d7e branch mouse_seting_dpi +03d2 6800c6b6 fetch 1 ,mem_mouse_dpi_button_state +03d3 c1000000 rtneq dpi_button_state_down +03d4 7046b600 jam dpi_button_state_down ,mem_mouse_dpi_button_state +03d5 6800c77a fetch 1 ,mem_mouse_dpi +03d6 1fe0fe01 increase 1 ,pdata +03d7 1fe17e03 and pdata ,0x03 ,pdata +03d8 6000c77a store 1 ,mem_mouse_dpi +03d9 1fe0fe02 increase 2 ,pdata +03da 6000cb2c store 1 ,mem_mouse_multi_led_blink_count +03db 204004ee call p_mouse_dpi_multi_led_blink +03dc 202004fb branch p_mouse_seting_dpi p_mouse_dpi_up: -03de 2040053f call p_gpio_set_input_pu -03df 20203d62 branch mouse_dpi_up +03dd 2040053f call p_gpio_set_input_pu +03de 20203d62 branch mouse_dpi_up p_mouse_priority_bb_event: -03e0 1a627e00 copy regc ,pdata -03e1 c00a03f1 beq bt_evt_le_connected ,p_mouse_le_bb_event_connected -03e2 c00a83f3 beq bt_evt_le_disconnected ,p_mouse_le_bb_disconnected -03e3 c01483f5 beq bt_evt_le_enc_info ,p_mouse_le_enc_info -03e4 c01903f7 beq bt_evt_le_start_enc ,p_mouse_le_ll_start_encryt -03e5 c02003f9 beq bt_evt_le_parse_conn_papa_update_rsp ,p_mouse_le_conn_param_update_rsp_recieved -03e6 c00203fb beq bt_evt_reconn_failed ,p_mouse_bb_event_reconn_failed -03e7 c00983fb beq bt_evt_reconn_page_timeout ,p_mouse_bb_event_reconn_timeout -03e8 c00cb3df beq bt_evt_switch_not_accept ,app_bt_role_switch -03e9 c01083ff beq bt_evt_sniff_not_accept ,p_mouse_sniff_not_accept -03ea c0008401 beq bt_evt_bb_connected ,p_mouse_bb_event_connected -03eb c0010408 beq bt_evt_bb_disconnected ,p_mouse_bb_event_disconnected -03ec c015840a beq bt_evt_switch_success_master ,p_mouse_enter_sniff_check -03ed c01c840c beq bt_evt_24g_pairing_complete ,p_mouse_24g_pairing_complete -03ee c01d0411 beq bt_evt_24g_attempt_fail ,p_mouse_24g_attempt_fail -03ef c01e0414 beq bt_evt_24g_attempt_success ,p_mouse_24g_attempt_success -03f0 2020417d branch mouse_priority_bb_event + 1 +03df 1a627e00 copy regc ,pdata +03e0 c00a03f0 beq bt_evt_le_connected ,p_mouse_le_bb_event_connected +03e1 c00a83f2 beq bt_evt_le_disconnected ,p_mouse_le_bb_disconnected +03e2 c01483f4 beq bt_evt_le_enc_info ,p_mouse_le_enc_info +03e3 c01903f6 beq bt_evt_le_start_enc ,p_mouse_le_ll_start_encryt +03e4 c02003f8 beq bt_evt_le_parse_conn_papa_update_rsp ,p_mouse_le_conn_param_update_rsp_recieved +03e5 c00203fa beq bt_evt_reconn_failed ,p_mouse_bb_event_reconn_failed +03e6 c00983fa beq bt_evt_reconn_page_timeout ,p_mouse_bb_event_reconn_timeout +03e7 c00cb3df beq bt_evt_switch_not_accept ,app_bt_role_switch +03e8 c01083fe beq bt_evt_sniff_not_accept ,p_mouse_sniff_not_accept +03e9 c0008400 beq bt_evt_bb_connected ,p_mouse_bb_event_connected +03ea c0010407 beq bt_evt_bb_disconnected ,p_mouse_bb_event_disconnected +03eb c0158409 beq bt_evt_switch_success_master ,p_mouse_enter_sniff_check +03ec c01c840b beq bt_evt_24g_pairing_complete ,p_mouse_24g_pairing_complete +03ed c01d0410 beq bt_evt_24g_attempt_fail ,p_mouse_24g_attempt_fail +03ee c01e0413 beq bt_evt_24g_attempt_success ,p_mouse_24g_attempt_success +03ef 2020417d branch mouse_priority_bb_event + 1 p_mouse_le_bb_event_connected: -03f1 7011c6b5 jam zcode_b5 ,mem_zcode_temp_param0 -03f2 20200735 branch p_zcode_entrance +03f0 7011c6b5 jam zcode_b5 ,mem_zcode_temp_param0 +03f1 20200735 branch p_zcode_entrance p_mouse_le_bb_disconnected: -03f3 7011c6a2 jam zcode_a2 ,mem_zcode_temp_param0 -03f4 20200735 branch p_zcode_entrance +03f2 7011c6a2 jam zcode_a2 ,mem_zcode_temp_param0 +03f3 20200735 branch p_zcode_entrance p_mouse_le_enc_info: p_app_updata_le_param: -03f5 700a9912 jam bt_cmd_le_update_conn ,mem_fifo_temp -03f6 20207d8f branch ui_ipc_send_cmd +03f4 700a9912 jam bt_cmd_le_update_conn ,mem_fifo_temp +03f5 20207d8f branch ui_ipc_send_cmd p_mouse_le_ll_start_encryt: -03f7 7011c6b3 jam zcode_b3 ,mem_zcode_temp_param0 -03f8 20200735 branch p_zcode_entrance +03f6 7011c6b3 jam zcode_b3 ,mem_zcode_temp_param0 +03f7 20200735 branch p_zcode_entrance p_mouse_le_conn_param_update_rsp_recieved: -03f9 7011c6a1 jam zcode_a1 ,mem_zcode_temp_param0 -03fa 20200735 branch p_zcode_entrance +03f8 7011c6a1 jam zcode_a1 ,mem_zcode_temp_param0 +03f9 20200735 branch p_zcode_entrance p_mouse_bb_event_reconn_timeout: p_mouse_bb_event_reconn_failed: -03fb 7011c6a3 jam zcode_a3 ,mem_zcode_temp_param0 -03fc 20200735 branch p_zcode_entrance +03fa 7011c6a3 jam zcode_a3 ,mem_zcode_temp_param0 +03fb 20200735 branch p_zcode_entrance p_mouse_irtual_cable_unplug: -03fd 7011c670 jam zcode_70 ,mem_zcode_temp_param0 -03fe 20200735 branch p_zcode_entrance +03fc 7011c670 jam zcode_70 ,mem_zcode_temp_param0 +03fd 20200735 branch p_zcode_entrance p_mouse_sniff_not_accept: -03ff 7011c6b1 jam zcode_b1 ,mem_zcode_temp_param0 -0400 20200735 branch p_zcode_entrance +03fe 7011c6b1 jam zcode_b1 ,mem_zcode_temp_param0 +03ff 20200735 branch p_zcode_entrance p_mouse_bb_event_connected: -0401 204004e9 call p_mouse_mode_bt_device1_multi_led_on -0402 2040044a call p_mouse_store_eeprom_enable -0403 204002c2 call p_mouse_init_sensor_reset -0404 204004a7 call p_mouse_null_enter_hibernate_disable -0405 204004da call p_mouse_discovey_led_blink_off -0406 70480900 jam 0 ,mem_mouse_send_switch_req_timer -0407 202042ca branch mouse_stop_discovery +0400 204004e9 call p_mouse_mode_bt_device1_multi_led_on +0401 2040044a call p_mouse_store_eeprom_enable +0402 204002c2 call p_mouse_init_sensor_reset +0403 204004a7 call p_mouse_null_enter_hibernate_disable +0404 204004da call p_mouse_discovey_led_blink_off +0405 70480900 jam 0 ,mem_mouse_send_switch_req_timer +0406 202042ca branch mouse_stop_discovery p_mouse_bb_event_disconnected: -0408 7011c6b4 jam zcode_b4 ,mem_zcode_temp_param0 -0409 20200735 branch p_zcode_entrance +0407 7011c6b4 jam zcode_b4 ,mem_zcode_temp_param0 +0408 20200735 branch p_zcode_entrance p_mouse_enter_sniff_check: -040a 7011c6b2 jam zcode_b2 ,mem_zcode_temp_param0 -040b 20200735 branch p_zcode_entrance +0409 7011c6b2 jam zcode_b2 ,mem_zcode_temp_param0 +040a 20200735 branch p_zcode_entrance p_mouse_24g_pairing_complete: -040c 204004de call p_mouse_multi_led_blink_off -040d 204004e9 call p_mouse_mode_24g_device_multi_led_on -040e 204002c2 call p_mouse_init_sensor_reset -040f 7011c650 jam zcode_50 ,mem_zcode_temp_param0 -0410 20200735 branch p_zcode_entrance +040b 204004de call p_mouse_multi_led_blink_off +040c 204004e9 call p_mouse_mode_24g_device_multi_led_on +040d 204002c2 call p_mouse_init_sensor_reset +040e 7011c650 jam zcode_50 ,mem_zcode_temp_param0 +040f 20200735 branch p_zcode_entrance p_mouse_24g_attempt_fail: -0411 2040041c call p_mouse_sensor_powerdown_check -0412 7011c651 jam zcode_51 ,mem_zcode_temp_param0 -0413 20200735 branch p_zcode_entrance +0410 2040041b call p_mouse_sensor_powerdown_check +0411 7011c651 jam zcode_51 ,mem_zcode_temp_param0 +0412 20200735 branch p_zcode_entrance p_mouse_24g_attempt_success: -0414 204004de call p_mouse_multi_led_blink_off -0415 204004e9 call p_mouse_mode_24g_device_multi_led_on -0416 204002c2 call p_mouse_init_sensor_reset -0417 7011c652 jam zcode_52 ,mem_zcode_temp_param0 -0418 20200735 branch p_zcode_entrance +0413 204004de call p_mouse_multi_led_blink_off +0414 204004e9 call p_mouse_mode_24g_device_multi_led_on +0415 204002c2 call p_mouse_init_sensor_reset +0416 7011c652 jam zcode_52 ,mem_zcode_temp_param0 +0417 20200735 branch p_zcode_entrance p_mouse_before_hibernate: -0419 2040041c call p_mouse_sensor_powerdown_check -041a 7011c6a0 jam zcode_a0 ,mem_zcode_temp_param0 -041b 20200735 branch p_zcode_entrance +0418 2040041b call p_mouse_sensor_powerdown_check +0419 7011c6a0 jam zcode_a0 ,mem_zcode_temp_param0 +041a 20200735 branch p_zcode_entrance p_mouse_sensor_powerdown_check: -041c 6800cafe fetch 1 ,mem_mouse_init_sensor_reset_flag -041d 207a0000 rtn blank -041e 704afe00 jam 0 ,mem_mouse_init_sensor_reset_flag +041b 6800cafe fetch 1 ,mem_mouse_init_sensor_reset_flag +041c 207a0000 rtn blank +041d 704afe00 jam 0 ,mem_mouse_init_sensor_reset_flag p_mouse_sensor_powerdown: -041f 204002c3 call p_mouse_init_sunt -0420 58000006 setarg 0x06 -0421 20406414 call twspi_read -0422 1fe1fe08 or pdata ,0x08 ,pdata -0423 1fed7e00 lshift8 pdata ,pdata -0424 1fe0fe06 add pdata ,0x06 ,pdata -0425 20206413 branch twspi_write +041e 204002c3 call p_mouse_init_sunt +041f 58000006 setarg 0x06 +0420 20406414 call twspi_read +0421 1fe1fe08 or pdata ,0x08 ,pdata +0422 1fed7e00 lshift8 pdata ,pdata +0423 1fe0fe06 add pdata ,0x06 ,pdata +0424 20206413 branch twspi_write p_mouse_bb_event_timer: +0425 204003cc call p_mouse_dpi_check 0426 204004aa call p_mouse_multi_led_blink_timer 0427 2040047f call p_mouse_wheel_trigger_timer 0428 204004a0 call p_mouse_null_enter_hibernate_timer @@ -35487,7 +35487,7 @@ z_hid_rx_process_hid_control: 10038 18427e00 copy temp ,pdata -10039 c00283fd beq hid_control_p_virtualcableunplug ,p_mouse_irtual_cable_unplug +10039 c00283fc beq hid_control_p_virtualcableunplug ,p_mouse_irtual_cable_unplug 1003a 20204d41 branch hid_rx_process_hid_control + 2 org 0x20001 @@ -36117,7 +36117,7 @@ b0011 58000009 setarg le_interval_11_25ms b0012 60014496 store 2 ,mem_le_interval_min b0013 60014498 store 2 ,mem_le_interval_min + 2 -b0014 204003f5 call p_app_updata_le_param +b0014 204003f4 call p_app_updata_le_param b0015 7047c401 jam le_lpm_disable ,mem_mouse_le_conn_param_reject b0016 20600000 rtn @@ -36126,7 +36126,7 @@ b0018 202005b6 branch p_mouse_le_conn_param_update_rsp_not_accepted_mult_reset z_mouse_le_bb_disconnected: -b0019 2040041c call p_mouse_sensor_powerdown_check +b0019 2040041b call p_mouse_sensor_powerdown_check b001a 704b7200 jam 0 ,mem_mouse_le_bb_connected_flag b001b 58000007 setarg le_interval_8_75ms b001c 60014496 store 2 ,mem_le_interval_min @@ -36193,7 +36193,7 @@ c0015 20200018 branch z_mouse_le_ll_enable_start_enc_flag z_mouse_le_ll_reconn_start_encryt: -c0016 204003f5 call p_app_updata_le_param +c0016 204003f4 call p_app_updata_le_param c0017 7046c60a jam 10 ,mem_le_start_encrypt_timer z_mouse_le_ll_enable_start_enc_flag: @@ -36201,7 +36201,7 @@ c0019 202041b9 branch mouse_le_enable_connect_flag z_mouse_bb_event_disconnected: -c001a 2040041c call p_mouse_sensor_powerdown_check +c001a 2040041b call p_mouse_sensor_powerdown_check c001b 704aff00 jam 0 ,mem_bt_rcvd_switch_req_accept c001c 704b0100 jam 0 ,mem_bt_send_lmp_setup_complete c001d 704b0a00 jam 0 ,mem_mouse_bt_send_first_package_flag Index: output/romcode.rom =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_LBX-172/output/romcode.rom (revision 3715) +++ /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_LBX-172/output/romcode.rom (working copy) @@ -24628,7 +24628,7 @@ 704b0301 20600000 18427e00 -c00283fd +c00283fc 20204d41 c0080021 c008802e @@ -25098,12 +25098,12 @@ 58000009 60014496 60014498 -204003f5 +204003f4 7047c401 20600000 704b6401 202005b6 -2040041c +2040041b 704b7200 58000007 60014496 @@ -25157,11 +25157,11 @@ c0008016 7046c614 20200018 -204003f5 +204003f4 7046c60a d8e00001 202041b9 -2040041c +2040041b 704aff00 704b0100 704b0a00 @@ -25179,4 +25179,4 @@ 204004a7 2040038a 202041c3 -00001f35 +0000a28f Index: program/patch.prog =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_LBX-172/program/patch.prog (revision 3715) +++ /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_LBX-172/program/patch.prog (working copy) @@ -1679,7 +1679,6 @@ p_mouse_idle: call ui_check_paring_button - call p_mouse_dpi_check branch mouse_wheel_check p_mouse_dpi_check: @@ -1700,7 +1699,7 @@ increase 2,pdata store 1,mem_mouse_multi_led_blink_count call p_mouse_dpi_multi_led_blink - branch mouse_seting_dpi + branch p_mouse_seting_dpi p_mouse_dpi_up: call p_gpio_set_input_pu branch mouse_dpi_up @@ -1835,6 +1834,7 @@ call p_mouse_low_voltage_led_timer call p_low_power_nodata_off_led_time_check endif + call p_mouse_dpi_check call p_mouse_multi_led_blink_timer call p_mouse_wheel_trigger_timer call p_mouse_null_enter_hibernate_timer Index: sched/mouse.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_LBX-172/sched/mouse.dat (revision 3715) +++ /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_LBX-172/sched/mouse.dat (working copy) @@ -293,7 +293,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 -mem_firmware_version:01 00 +mem_firmware_version:02 00 mem_device_flag: 02