Index: output/flash.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_LBX-221/output/flash.dat (revision 3796) +++ /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_LBX-221/output/flash.dat (working copy) @@ -131,7 +131,7 @@ 58 00 03 -df +de 60 01 41 @@ -147,7 +147,7 @@ 58 00 04 -1a +19 60 01 41 @@ -155,7 +155,7 @@ 58 00 04 -27 +26 60 01 41 @@ -183,7 +183,7 @@ 20 40 04 -20 +1f 68 00 c7 @@ -1107,7 +1107,7 @@ 20 20 04 -20 +1f 68 00 cc @@ -3885,10 +3885,6 @@ 7e 34 20 -40 -03 -cc -20 20 3e e0 @@ -3911,7 +3907,7 @@ 20 20 83 -dd +dc 20 40 05 @@ -3958,8 +3954,8 @@ 05 20 20 -3d -7e +05 +22 20 40 05 @@ -3975,31 +3971,31 @@ c0 0a 03 -f0 +ef c0 0a 83 -f2 +f1 c0 14 83 -f4 +f3 c0 19 03 -f6 +f5 c0 20 03 -f8 +f7 c0 02 03 -fa +f9 c0 09 83 -fa +f9 c0 0c b3 @@ -4007,31 +4003,31 @@ c0 10 83 -fe +fd c0 00 -84 -00 +83 +ff c0 01 04 -09 +08 c0 15 84 -0b +0a c0 1c 84 -0d +0c c0 1d 04 -12 +11 c0 1e 04 -15 +14 20 20 41 @@ -4175,7 +4171,7 @@ 20 40 04 -1d +1c 70 11 c6 @@ -4207,7 +4203,7 @@ 20 40 04 -1d +1c 70 11 c6 @@ -4262,6 +4258,10 @@ 42 20 40 +03 +cb +20 +40 04 ba 20 @@ -8160,8 +8160,8 @@ 20 07 f2 -5c -4c +60 +e0 aa 55 08 @@ -9077,7 +9077,7 @@ 00 a7 4b -01 +02 00 aa 55 @@ -9294,7 +9294,7 @@ 20 40 03 -f4 +f3 70 46 c6 @@ -9310,7 +9310,7 @@ 20 40 04 -1d +1c 70 4a ff @@ -9542,7 +9542,7 @@ 20 40 03 -f4 +f3 70 47 c4 @@ -9562,7 +9562,7 @@ 20 40 04 -1d +1c 70 4b 72 @@ -12250,7 +12250,7 @@ c0 02 83 -fc +fb 20 20 4d @@ -12279,5 +12279,5 @@ 55 00 00 -3b -c5 +63 +56 Index: output/program.lis =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_LBX-221/output/program.lis (revision 3796) +++ /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_LBX-221/output/program.lis (working copy) @@ -39,13 +39,13 @@ 001c 600141f1 store 2 ,mem_cb_bt_process 001d 580002a1 setarg p_mouse_before_lpm 001e 600141ed store 2 ,mem_cb_before_lpm -001f 580003df setarg p_mouse_priority_bb_event +001f 580003de setarg p_mouse_priority_bb_event 0020 600141f5 store 2 ,mem_cb_bb_event_process 0021 580003c9 setarg p_mouse_idle 0022 600141f3 store 2 ,mem_cb_idle_process -0023 5800041a setarg p_mouse_before_hibernate +0023 58000419 setarg p_mouse_before_hibernate 0024 600141eb store 2 ,mem_cb_before_hibernate -0025 58000427 setarg p_mouse_bb_event_timer +0025 58000426 setarg p_mouse_bb_event_timer 0026 600141fd store 2 ,mem_cb_event_timer 0027 20600000 rtn @@ -54,7 +54,7 @@ 0029 60014d7b store 2 ,mem_24g_transmit_by_interrupt_exit_count_init 002a 24558034 ncall p_mouse_24g_transmit_by_interrupt_exit_count_max ,wake 002b 204002c5 call p_mouse_init_sunt -002c 20400420 call p_mouse_sensor_powerdown +002c 2040041f call p_mouse_sensor_powerdown p_mouse_wakeup_no_from_power: 002d 6800c71f fetch 1 ,mem_reconn_times_init @@ -349,7 +349,7 @@ 0110 6000cd88 store 1 ,mem_24g_search_dongle_action 0111 58000708 setarg g24_disconn_nodata_timer 0112 600146b0 store 2 ,mem_mouse_no_data_timer -0113 20200420 branch p_mouse_sensor_powerdown +0113 2020041f branch p_mouse_sensor_powerdown p_g24_search_dongle_success: 0114 6800cc64 fetch 1 ,mem_24g_abort_pac @@ -1286,148 +1286,148 @@ p_mouse_idle: 03c9 20407e34 call ui_check_paring_button -03ca 204003cc call p_mouse_dpi_check -03cb 20203ee0 branch mouse_wheel_check +03ca 20203ee0 branch mouse_wheel_check p_mouse_dpi_check: -03cc 6808c6e7 fetcht 1 ,mem_dpi_button_gpio -03cd 20400570 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 2040056b call p_gpio_set_input_pu +03cb 6808c6e7 fetcht 1 ,mem_dpi_button_gpio +03cc 20400570 call p_gpio_set_input_pd +03cd 6808c6e7 fetcht 1 ,mem_dpi_button_gpio +03ce 2040681d call gpio_get_bit +03cf 202083dc branch p_mouse_dpi_up ,true +03d0 2040056b call p_gpio_set_input_pu p_mouse_dpi_down: -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 20400505 call p_mouse_dpi_multi_led_blink -03dc 20203d7e branch mouse_seting_dpi +03d1 6800c6b6 fetch 1 ,mem_mouse_dpi_button_state +03d2 c1000000 rtneq dpi_button_state_down +03d3 7046b600 jam dpi_button_state_down ,mem_mouse_dpi_button_state +03d4 6800c77a fetch 1 ,mem_mouse_dpi +03d5 1fe0fe01 increase 1 ,pdata +03d6 1fe17e03 and pdata ,0x03 ,pdata +03d7 6000c77a store 1 ,mem_mouse_dpi +03d8 1fe0fe02 increase 2 ,pdata +03d9 6000cb2c store 1 ,mem_mouse_multi_led_blink_count +03da 20400505 call p_mouse_dpi_multi_led_blink +03db 20200522 branch p_mouse_seting_dpi p_mouse_dpi_up: -03dd 2040056b call p_gpio_set_input_pu -03de 20203d62 branch mouse_dpi_up +03dc 2040056b call p_gpio_set_input_pu +03dd 20203d62 branch mouse_dpi_up p_mouse_priority_bb_event: -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 c0010409 beq bt_evt_bb_disconnected ,p_mouse_bb_event_disconnected -03eb c015840b beq bt_evt_switch_success_master ,p_mouse_enter_sniff_check -03ec c01c840d beq bt_evt_24g_pairing_complete ,p_mouse_24g_pairing_complete -03ed c01d0412 beq bt_evt_24g_attempt_fail ,p_mouse_24g_attempt_fail -03ee c01e0415 beq bt_evt_24g_attempt_success ,p_mouse_24g_attempt_success -03ef 2020417d branch mouse_priority_bb_event + 1 +03de 1a627e00 copy regc ,pdata +03df c00a03ef beq bt_evt_le_connected ,p_mouse_le_bb_event_connected +03e0 c00a83f1 beq bt_evt_le_disconnected ,p_mouse_le_bb_disconnected +03e1 c01483f3 beq bt_evt_le_enc_info ,p_mouse_le_enc_info +03e2 c01903f5 beq bt_evt_le_start_enc ,p_mouse_le_ll_start_encryt +03e3 c02003f7 beq bt_evt_le_parse_conn_papa_update_rsp ,p_mouse_le_conn_param_update_rsp_recieved +03e4 c00203f9 beq bt_evt_reconn_failed ,p_mouse_bb_event_reconn_failed +03e5 c00983f9 beq bt_evt_reconn_page_timeout ,p_mouse_bb_event_reconn_timeout +03e6 c00cb3df beq bt_evt_switch_not_accept ,app_bt_role_switch +03e7 c01083fd beq bt_evt_sniff_not_accept ,p_mouse_sniff_not_accept +03e8 c00083ff beq bt_evt_bb_connected ,p_mouse_bb_event_connected +03e9 c0010408 beq bt_evt_bb_disconnected ,p_mouse_bb_event_disconnected +03ea c015840a beq bt_evt_switch_success_master ,p_mouse_enter_sniff_check +03eb c01c840c beq bt_evt_24g_pairing_complete ,p_mouse_24g_pairing_complete +03ec c01d0411 beq bt_evt_24g_attempt_fail ,p_mouse_24g_attempt_fail +03ed c01e0414 beq bt_evt_24g_attempt_success ,p_mouse_24g_attempt_success +03ee 2020417d branch mouse_priority_bb_event + 1 p_mouse_le_bb_event_connected: -03f0 7011c6b5 jam zcode_b5 ,mem_zcode_temp_param0 -03f1 20200761 branch p_zcode_entrance +03ef 7011c6b5 jam zcode_b5 ,mem_zcode_temp_param0 +03f0 20200761 branch p_zcode_entrance p_mouse_le_bb_disconnected: -03f2 7011c6a2 jam zcode_a2 ,mem_zcode_temp_param0 -03f3 20200761 branch p_zcode_entrance +03f1 7011c6a2 jam zcode_a2 ,mem_zcode_temp_param0 +03f2 20200761 branch p_zcode_entrance p_mouse_le_enc_info: p_app_updata_le_param: -03f4 700a9912 jam bt_cmd_le_update_conn ,mem_fifo_temp -03f5 20207d8f branch ui_ipc_send_cmd +03f3 700a9912 jam bt_cmd_le_update_conn ,mem_fifo_temp +03f4 20207d8f branch ui_ipc_send_cmd p_mouse_le_ll_start_encryt: -03f6 7011c6b3 jam zcode_b3 ,mem_zcode_temp_param0 -03f7 20200761 branch p_zcode_entrance +03f5 7011c6b3 jam zcode_b3 ,mem_zcode_temp_param0 +03f6 20200761 branch p_zcode_entrance p_mouse_le_conn_param_update_rsp_recieved: -03f8 7011c6a1 jam zcode_a1 ,mem_zcode_temp_param0 -03f9 20200761 branch p_zcode_entrance +03f7 7011c6a1 jam zcode_a1 ,mem_zcode_temp_param0 +03f8 20200761 branch p_zcode_entrance p_mouse_bb_event_reconn_timeout: p_mouse_bb_event_reconn_failed: -03fa 7011c6a3 jam zcode_a3 ,mem_zcode_temp_param0 -03fb 20200761 branch p_zcode_entrance +03f9 7011c6a3 jam zcode_a3 ,mem_zcode_temp_param0 +03fa 20200761 branch p_zcode_entrance p_mouse_irtual_cable_unplug: -03fc 7011c670 jam zcode_70 ,mem_zcode_temp_param0 -03fd 20200761 branch p_zcode_entrance +03fb 7011c670 jam zcode_70 ,mem_zcode_temp_param0 +03fc 20200761 branch p_zcode_entrance p_mouse_sniff_not_accept: -03fe 7011c6b1 jam zcode_b1 ,mem_zcode_temp_param0 -03ff 20200761 branch p_zcode_entrance +03fd 7011c6b1 jam zcode_b1 ,mem_zcode_temp_param0 +03fe 20200761 branch p_zcode_entrance p_mouse_bb_event_connected: -0400 20400500 call p_mouse_mode_bt_device1_multi_led_on -0401 20400459 call p_mouse_store_eeprom_enable -0402 204002c4 call p_mouse_init_sensor_reset -0403 58000000 setarg 0 -0404 6001cb6b store 3 ,mem_le_switch_adv_flag -0405 204004b7 call p_mouse_null_enter_hibernate_disable -0406 204004f1 call p_mouse_discovey_led_blink_off -0407 70480900 jam 0 ,mem_mouse_send_switch_req_timer -0408 202042ca branch mouse_stop_discovery +03ff 20400500 call p_mouse_mode_bt_device1_multi_led_on +0400 20400459 call p_mouse_store_eeprom_enable +0401 204002c4 call p_mouse_init_sensor_reset +0402 58000000 setarg 0 +0403 6001cb6b store 3 ,mem_le_switch_adv_flag +0404 204004b7 call p_mouse_null_enter_hibernate_disable +0405 204004f1 call p_mouse_discovey_led_blink_off +0406 70480900 jam 0 ,mem_mouse_send_switch_req_timer +0407 202042ca branch mouse_stop_discovery p_mouse_bb_event_disconnected: -0409 7011c6b4 jam zcode_b4 ,mem_zcode_temp_param0 -040a 20200761 branch p_zcode_entrance +0408 7011c6b4 jam zcode_b4 ,mem_zcode_temp_param0 +0409 20200761 branch p_zcode_entrance p_mouse_enter_sniff_check: -040b 7011c6b2 jam zcode_b2 ,mem_zcode_temp_param0 -040c 20200761 branch p_zcode_entrance +040a 7011c6b2 jam zcode_b2 ,mem_zcode_temp_param0 +040b 20200761 branch p_zcode_entrance p_mouse_24g_pairing_complete: -040d 204004f5 call p_mouse_multi_led_blink_off -040e 20400500 call p_mouse_mode_24g_device_multi_led_on -040f 204002c4 call p_mouse_init_sensor_reset -0410 7011c650 jam zcode_50 ,mem_zcode_temp_param0 -0411 20200761 branch p_zcode_entrance +040c 204004f5 call p_mouse_multi_led_blink_off +040d 20400500 call p_mouse_mode_24g_device_multi_led_on +040e 204002c4 call p_mouse_init_sensor_reset +040f 7011c650 jam zcode_50 ,mem_zcode_temp_param0 +0410 20200761 branch p_zcode_entrance p_mouse_24g_attempt_fail: -0412 2040041d call p_mouse_sensor_powerdown_check -0413 7011c651 jam zcode_51 ,mem_zcode_temp_param0 -0414 20200761 branch p_zcode_entrance +0411 2040041c call p_mouse_sensor_powerdown_check +0412 7011c651 jam zcode_51 ,mem_zcode_temp_param0 +0413 20200761 branch p_zcode_entrance p_mouse_24g_attempt_success: -0415 204004f5 call p_mouse_multi_led_blink_off -0416 20400500 call p_mouse_mode_24g_device_multi_led_on -0417 204002c4 call p_mouse_init_sensor_reset -0418 7011c652 jam zcode_52 ,mem_zcode_temp_param0 -0419 20200761 branch p_zcode_entrance +0414 204004f5 call p_mouse_multi_led_blink_off +0415 20400500 call p_mouse_mode_24g_device_multi_led_on +0416 204002c4 call p_mouse_init_sensor_reset +0417 7011c652 jam zcode_52 ,mem_zcode_temp_param0 +0418 20200761 branch p_zcode_entrance p_mouse_before_hibernate: -041a 2040041d call p_mouse_sensor_powerdown_check -041b 7011c6a0 jam zcode_a0 ,mem_zcode_temp_param0 -041c 20200761 branch p_zcode_entrance +0419 2040041c call p_mouse_sensor_powerdown_check +041a 7011c6a0 jam zcode_a0 ,mem_zcode_temp_param0 +041b 20200761 branch p_zcode_entrance p_mouse_sensor_powerdown_check: -041d 6800cafe fetch 1 ,mem_mouse_init_sensor_reset_flag -041e 207a0000 rtn blank -041f 704afe00 jam 0 ,mem_mouse_init_sensor_reset_flag +041c 6800cafe fetch 1 ,mem_mouse_init_sensor_reset_flag +041d 207a0000 rtn blank +041e 704afe00 jam 0 ,mem_mouse_init_sensor_reset_flag p_mouse_sensor_powerdown: -0420 204002c5 call p_mouse_init_sunt -0421 58000006 setarg 0x06 -0422 20406414 call twspi_read -0423 1fe1fe08 or pdata ,0x08 ,pdata -0424 1fed7e00 lshift8 pdata ,pdata -0425 1fe0fe06 add pdata ,0x06 ,pdata -0426 20206413 branch twspi_write +041f 204002c5 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 p_mouse_bb_event_timer: -0427 20400442 call p_mouse_le_switch_adv_timer +0426 20400442 call p_mouse_le_switch_adv_timer +0427 204003cb call p_mouse_dpi_check 0428 204004ba call p_mouse_multi_led_blink_timer 0429 20400508 call p_mouse_logo_led_blink_timer 042a 2040048b call p_mouse_wheel_trigger_timer @@ -35545,7 +35545,7 @@ z_hid_rx_process_hid_control: 10038 18427e00 copy temp ,pdata -10039 c00283fc beq hid_control_p_virtualcableunplug ,p_mouse_irtual_cable_unplug +10039 c00283fb beq hid_control_p_virtualcableunplug ,p_mouse_irtual_cable_unplug 1003a 20204d41 branch hid_rx_process_hid_control + 2 org 0x20001 @@ -36157,7 +36157,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 204003f4 call p_app_updata_le_param +b0014 204003f3 call p_app_updata_le_param b0015 7047c401 jam le_lpm_disable ,mem_mouse_le_conn_param_reject b0016 20600000 rtn @@ -36166,7 +36166,7 @@ b0018 202005e2 branch p_mouse_le_conn_param_update_rsp_not_accepted_mult_reset z_mouse_le_bb_disconnected: -b0019 2040041d call p_mouse_sensor_powerdown_check +b0019 2040041c 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 @@ -36241,7 +36241,7 @@ c0015 20200018 branch z_mouse_le_ll_enable_start_enc_flag z_mouse_le_ll_reconn_start_encryt: -c0016 204003f4 call p_app_updata_le_param +c0016 204003f3 call p_app_updata_le_param c0017 7046c60a jam 10 ,mem_le_start_encrypt_timer z_mouse_le_ll_enable_start_enc_flag: @@ -36249,7 +36249,7 @@ c0019 202041b9 branch mouse_le_enable_connect_flag z_mouse_bb_event_disconnected: -c001a 2040041d call p_mouse_sensor_powerdown_check +c001a 2040041c 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-221/output/romcode.rom (revision 3796) +++ /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_LBX-221/output/romcode.rom (working copy) @@ -24628,7 +24628,7 @@ 704b0301 20600000 18427e00 -c00283fc +c00283fb 20204d41 c008001d c008802a @@ -25082,12 +25082,12 @@ 58000009 60014496 60014498 -204003f4 +204003f3 7047c401 20600000 704b6401 202005e2 -2040041d +2040041c 704b7200 58000007 60014496 @@ -25147,11 +25147,11 @@ c0008016 7046c614 20200018 -204003f4 +204003f3 7046c60a d8e00001 202041b9 -2040041d +2040041c 704aff00 704b0100 704b0a00 @@ -25175,4 +25175,4 @@ 204004b7 20400389 202041c3 -0000a96a +0000189b Index: program/patch.prog =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_LBX-221/program/patch.prog (revision 3796) +++ /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_LBX-221/program/patch.prog (working copy) @@ -1676,7 +1676,6 @@ p_mouse_idle: call ui_check_paring_button - call p_mouse_dpi_check branch mouse_wheel_check p_mouse_dpi_check: @@ -1697,7 +1696,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 @@ -1839,6 +1838,7 @@ ifdef BLE_FAST_CONN_ENABLE call p_mouse_le_switch_adv_timer endif + call p_mouse_dpi_check call p_mouse_multi_led_blink_timer call p_mouse_logo_led_blink_timer call p_mouse_wheel_trigger_timer Index: sched/mouse.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_LBX-221/sched/mouse.dat (revision 3796) +++ /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_LBX-221/sched/mouse.dat (working copy) @@ -292,7 +292,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