Index: output/flash.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_LBX-172-6/output/flash.dat (revision 3796) +++ /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_LBX-172-6/output/flash.dat (working copy) @@ -131,7 +131,7 @@ 58 00 03 -dd +dc 60 01 41 @@ -147,7 +147,7 @@ 58 00 04 -16 +15 60 01 41 @@ -155,7 +155,7 @@ 58 00 04 -23 +22 60 01 41 @@ -183,7 +183,7 @@ 20 40 04 -1c +1b 68 00 c7 @@ -1099,7 +1099,7 @@ 20 20 04 -1c +1b 68 00 cc @@ -3877,10 +3877,6 @@ 7e 34 20 -40 -03 -ca -20 20 3e e0 @@ -3903,7 +3899,7 @@ 20 20 83 -db +da 20 40 05 @@ -3950,8 +3946,8 @@ f9 20 20 -3d -7e +05 +06 20 40 05 @@ -3967,31 +3963,31 @@ c0 0a 03 -ee +ed c0 0a 83 -f0 +ef c0 14 83 -f2 +f1 c0 19 03 -f4 +f3 c0 20 03 -f6 +f5 c0 02 03 -f8 +f7 c0 09 83 -f8 +f7 c0 0c b3 @@ -3999,31 +3995,31 @@ c0 10 83 -fc +fb c0 00 83 -fe +fd c0 01 04 -07 +06 c0 15 84 -09 +08 c0 1c 84 -0b +0a c0 1d 04 -0f +0e c0 1e 04 -12 +11 20 20 41 @@ -4163,7 +4159,7 @@ 20 40 04 -19 +18 70 11 c6 @@ -4191,7 +4187,7 @@ 20 40 04 -19 +18 70 11 c6 @@ -4246,6 +4242,10 @@ 3d 20 40 +03 +c9 +20 +40 04 b5 20 @@ -8072,8 +8072,8 @@ 20 07 dc -5e -c8 +14 +91 aa 55 08 @@ -8989,7 +8989,7 @@ 00 a7 4b -01 +02 00 aa 55 @@ -9197,7 +9197,7 @@ 20 40 03 -f2 +f1 70 46 c6 @@ -9213,7 +9213,7 @@ 20 40 04 -19 +18 70 4a ff @@ -9445,7 +9445,7 @@ 20 40 03 -f2 +f1 70 47 c4 @@ -9465,7 +9465,7 @@ 20 40 04 -19 +18 70 4b 72 @@ -12153,7 +12153,7 @@ c0 02 83 -fa +f9 20 20 4d @@ -12182,5 +12182,5 @@ 55 00 00 -25 -3e +30 +cc Index: output/program.lis =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_LBX-172-6/output/program.lis (revision 3796) +++ /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_LBX-172-6/output/program.lis (working copy) @@ -39,13 +39,13 @@ 001c 600141f1 store 2 ,mem_cb_bt_process 001d 5800029f setarg p_mouse_before_lpm 001e 600141ed store 2 ,mem_cb_before_lpm -001f 580003dd setarg p_mouse_priority_bb_event +001f 580003dc setarg p_mouse_priority_bb_event 0020 600141f5 store 2 ,mem_cb_bb_event_process 0021 580003c7 setarg p_mouse_idle 0022 600141f3 store 2 ,mem_cb_idle_process -0023 58000416 setarg p_mouse_before_hibernate +0023 58000415 setarg p_mouse_before_hibernate 0024 600141eb store 2 ,mem_cb_before_hibernate -0025 58000423 setarg p_mouse_bb_event_timer +0025 58000422 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 204002c3 call p_mouse_init_sunt -002c 2040041c call p_mouse_sensor_powerdown +002c 2040041b call p_mouse_sensor_powerdown p_mouse_wakeup_no_from_power: 002d 6800c71f fetch 1 ,mem_reconn_times_init @@ -347,7 +347,7 @@ 010e 6000cd88 store 1 ,mem_24g_search_dongle_action 010f 58000708 setarg g24_disconn_nodata_timer 0110 600146b0 store 2 ,mem_mouse_no_data_timer -0111 2020041c branch p_mouse_sensor_powerdown +0111 2020041b branch p_mouse_sensor_powerdown p_g24_search_dongle_success: 0112 6800cc64 fetch 1 ,mem_24g_abort_pac @@ -1284,146 +1284,146 @@ p_mouse_idle: 03c7 20407e34 call ui_check_paring_button -03c8 204003ca call p_mouse_dpi_check -03c9 20203ee0 branch mouse_wheel_check +03c8 20203ee0 branch mouse_wheel_check p_mouse_dpi_check: -03ca 6808c6e7 fetcht 1 ,mem_dpi_button_gpio -03cb 2040055a call p_gpio_set_input_pd -03cc 6808c6e7 fetcht 1 ,mem_dpi_button_gpio -03cd 2040681d call gpio_get_bit -03ce 202083db branch p_mouse_dpi_up ,true -03cf 20400555 call p_gpio_set_input_pu +03c9 6808c6e7 fetcht 1 ,mem_dpi_button_gpio +03ca 2040055a call p_gpio_set_input_pd +03cb 6808c6e7 fetcht 1 ,mem_dpi_button_gpio +03cc 2040681d call gpio_get_bit +03cd 202083da branch p_mouse_dpi_up ,true +03ce 20400555 call p_gpio_set_input_pu p_mouse_dpi_down: -03d0 6800c6b6 fetch 1 ,mem_mouse_dpi_button_state -03d1 c1000000 rtneq dpi_button_state_down -03d2 7046b600 jam dpi_button_state_down ,mem_mouse_dpi_button_state -03d3 6800c77a fetch 1 ,mem_mouse_dpi -03d4 1fe0fe01 increase 1 ,pdata -03d5 1fe17e03 and pdata ,0x03 ,pdata -03d6 6000c77a store 1 ,mem_mouse_dpi -03d7 1fe0fe02 increase 2 ,pdata -03d8 6000cb2c store 1 ,mem_mouse_multi_led_blink_count -03d9 204004f9 call p_mouse_dpi_multi_led_blink -03da 20203d7e branch mouse_seting_dpi +03cf 6800c6b6 fetch 1 ,mem_mouse_dpi_button_state +03d0 c1000000 rtneq dpi_button_state_down +03d1 7046b600 jam dpi_button_state_down ,mem_mouse_dpi_button_state +03d2 6800c77a fetch 1 ,mem_mouse_dpi +03d3 1fe0fe01 increase 1 ,pdata +03d4 1fe17e03 and pdata ,0x03 ,pdata +03d5 6000c77a store 1 ,mem_mouse_dpi +03d6 1fe0fe02 increase 2 ,pdata +03d7 6000cb2c store 1 ,mem_mouse_multi_led_blink_count +03d8 204004f9 call p_mouse_dpi_multi_led_blink +03d9 20200506 branch p_mouse_seting_dpi p_mouse_dpi_up: -03db 20400555 call p_gpio_set_input_pu -03dc 20203d62 branch mouse_dpi_up +03da 20400555 call p_gpio_set_input_pu +03db 20203d62 branch mouse_dpi_up p_mouse_priority_bb_event: -03dd 1a627e00 copy regc ,pdata -03de c00a03ee beq bt_evt_le_connected ,p_mouse_le_bb_event_connected -03df c00a83f0 beq bt_evt_le_disconnected ,p_mouse_le_bb_disconnected -03e0 c01483f2 beq bt_evt_le_enc_info ,p_mouse_le_enc_info -03e1 c01903f4 beq bt_evt_le_start_enc ,p_mouse_le_ll_start_encryt -03e2 c02003f6 beq bt_evt_le_parse_conn_papa_update_rsp ,p_mouse_le_conn_param_update_rsp_recieved -03e3 c00203f8 beq bt_evt_reconn_failed ,p_mouse_bb_event_reconn_failed -03e4 c00983f8 beq bt_evt_reconn_page_timeout ,p_mouse_bb_event_reconn_timeout -03e5 c00cb3df beq bt_evt_switch_not_accept ,app_bt_role_switch -03e6 c01083fc beq bt_evt_sniff_not_accept ,p_mouse_sniff_not_accept -03e7 c00083fe beq bt_evt_bb_connected ,p_mouse_bb_event_connected -03e8 c0010407 beq bt_evt_bb_disconnected ,p_mouse_bb_event_disconnected -03e9 c0158409 beq bt_evt_switch_success_master ,p_mouse_enter_sniff_check -03ea c01c840b beq bt_evt_24g_pairing_complete ,p_mouse_24g_pairing_complete -03eb c01d040f beq bt_evt_24g_attempt_fail ,p_mouse_24g_attempt_fail -03ec c01e0412 beq bt_evt_24g_attempt_success ,p_mouse_24g_attempt_success -03ed 2020417d branch mouse_priority_bb_event + 1 +03dc 1a627e00 copy regc ,pdata +03dd c00a03ed beq bt_evt_le_connected ,p_mouse_le_bb_event_connected +03de c00a83ef beq bt_evt_le_disconnected ,p_mouse_le_bb_disconnected +03df c01483f1 beq bt_evt_le_enc_info ,p_mouse_le_enc_info +03e0 c01903f3 beq bt_evt_le_start_enc ,p_mouse_le_ll_start_encryt +03e1 c02003f5 beq bt_evt_le_parse_conn_papa_update_rsp ,p_mouse_le_conn_param_update_rsp_recieved +03e2 c00203f7 beq bt_evt_reconn_failed ,p_mouse_bb_event_reconn_failed +03e3 c00983f7 beq bt_evt_reconn_page_timeout ,p_mouse_bb_event_reconn_timeout +03e4 c00cb3df beq bt_evt_switch_not_accept ,app_bt_role_switch +03e5 c01083fb beq bt_evt_sniff_not_accept ,p_mouse_sniff_not_accept +03e6 c00083fd beq bt_evt_bb_connected ,p_mouse_bb_event_connected +03e7 c0010406 beq bt_evt_bb_disconnected ,p_mouse_bb_event_disconnected +03e8 c0158408 beq bt_evt_switch_success_master ,p_mouse_enter_sniff_check +03e9 c01c840a beq bt_evt_24g_pairing_complete ,p_mouse_24g_pairing_complete +03ea c01d040e beq bt_evt_24g_attempt_fail ,p_mouse_24g_attempt_fail +03eb c01e0411 beq bt_evt_24g_attempt_success ,p_mouse_24g_attempt_success +03ec 2020417d branch mouse_priority_bb_event + 1 p_mouse_le_bb_event_connected: -03ee 7011c6b5 jam zcode_b5 ,mem_zcode_temp_param0 -03ef 2020074b branch p_zcode_entrance +03ed 7011c6b5 jam zcode_b5 ,mem_zcode_temp_param0 +03ee 2020074b branch p_zcode_entrance p_mouse_le_bb_disconnected: -03f0 7011c6a2 jam zcode_a2 ,mem_zcode_temp_param0 -03f1 2020074b branch p_zcode_entrance +03ef 7011c6a2 jam zcode_a2 ,mem_zcode_temp_param0 +03f0 2020074b branch p_zcode_entrance p_mouse_le_enc_info: p_app_updata_le_param: -03f2 700a9912 jam bt_cmd_le_update_conn ,mem_fifo_temp -03f3 20207d8f branch ui_ipc_send_cmd +03f1 700a9912 jam bt_cmd_le_update_conn ,mem_fifo_temp +03f2 20207d8f branch ui_ipc_send_cmd p_mouse_le_ll_start_encryt: -03f4 7011c6b3 jam zcode_b3 ,mem_zcode_temp_param0 -03f5 2020074b branch p_zcode_entrance +03f3 7011c6b3 jam zcode_b3 ,mem_zcode_temp_param0 +03f4 2020074b branch p_zcode_entrance p_mouse_le_conn_param_update_rsp_recieved: -03f6 7011c6a1 jam zcode_a1 ,mem_zcode_temp_param0 -03f7 2020074b branch p_zcode_entrance +03f5 7011c6a1 jam zcode_a1 ,mem_zcode_temp_param0 +03f6 2020074b branch p_zcode_entrance p_mouse_bb_event_reconn_timeout: p_mouse_bb_event_reconn_failed: -03f8 7011c6a3 jam zcode_a3 ,mem_zcode_temp_param0 -03f9 2020074b branch p_zcode_entrance +03f7 7011c6a3 jam zcode_a3 ,mem_zcode_temp_param0 +03f8 2020074b branch p_zcode_entrance p_mouse_irtual_cable_unplug: -03fa 7011c670 jam zcode_70 ,mem_zcode_temp_param0 -03fb 2020074b branch p_zcode_entrance +03f9 7011c670 jam zcode_70 ,mem_zcode_temp_param0 +03fa 2020074b branch p_zcode_entrance p_mouse_sniff_not_accept: -03fc 7011c6b1 jam zcode_b1 ,mem_zcode_temp_param0 -03fd 2020074b branch p_zcode_entrance +03fb 7011c6b1 jam zcode_b1 ,mem_zcode_temp_param0 +03fc 2020074b branch p_zcode_entrance p_mouse_bb_event_connected: -03fe 204004f4 call p_mouse_mode_bt_device1_multi_led_on -03ff 20400454 call p_mouse_store_eeprom_enable -0400 204002c2 call p_mouse_init_sensor_reset -0401 58000000 setarg 0 -0402 6001cb6b store 3 ,mem_le_switch_adv_flag -0403 204004b2 call p_mouse_null_enter_hibernate_disable -0404 204004e5 call p_mouse_discovey_led_blink_off -0405 70480900 jam 0 ,mem_mouse_send_switch_req_timer -0406 202042ca branch mouse_stop_discovery +03fd 204004f4 call p_mouse_mode_bt_device1_multi_led_on +03fe 20400454 call p_mouse_store_eeprom_enable +03ff 204002c2 call p_mouse_init_sensor_reset +0400 58000000 setarg 0 +0401 6001cb6b store 3 ,mem_le_switch_adv_flag +0402 204004b2 call p_mouse_null_enter_hibernate_disable +0403 204004e5 call p_mouse_discovey_led_blink_off +0404 70480900 jam 0 ,mem_mouse_send_switch_req_timer +0405 202042ca branch mouse_stop_discovery p_mouse_bb_event_disconnected: -0407 7011c6b4 jam zcode_b4 ,mem_zcode_temp_param0 -0408 2020074b branch p_zcode_entrance +0406 7011c6b4 jam zcode_b4 ,mem_zcode_temp_param0 +0407 2020074b branch p_zcode_entrance p_mouse_enter_sniff_check: -0409 7011c6b2 jam zcode_b2 ,mem_zcode_temp_param0 -040a 2020074b branch p_zcode_entrance +0408 7011c6b2 jam zcode_b2 ,mem_zcode_temp_param0 +0409 2020074b branch p_zcode_entrance p_mouse_24g_pairing_complete: -040b 204004e9 call p_mouse_multi_led_blink_off -040c 204002c2 call p_mouse_init_sensor_reset -040d 7011c650 jam zcode_50 ,mem_zcode_temp_param0 -040e 2020074b branch p_zcode_entrance +040a 204004e9 call p_mouse_multi_led_blink_off +040b 204002c2 call p_mouse_init_sensor_reset +040c 7011c650 jam zcode_50 ,mem_zcode_temp_param0 +040d 2020074b branch p_zcode_entrance p_mouse_24g_attempt_fail: -040f 20400419 call p_mouse_sensor_powerdown_check -0410 7011c651 jam zcode_51 ,mem_zcode_temp_param0 -0411 2020074b branch p_zcode_entrance +040e 20400418 call p_mouse_sensor_powerdown_check +040f 7011c651 jam zcode_51 ,mem_zcode_temp_param0 +0410 2020074b branch p_zcode_entrance p_mouse_24g_attempt_success: -0412 204004e9 call p_mouse_multi_led_blink_off -0413 204002c2 call p_mouse_init_sensor_reset -0414 7011c652 jam zcode_52 ,mem_zcode_temp_param0 -0415 2020074b branch p_zcode_entrance +0411 204004e9 call p_mouse_multi_led_blink_off +0412 204002c2 call p_mouse_init_sensor_reset +0413 7011c652 jam zcode_52 ,mem_zcode_temp_param0 +0414 2020074b branch p_zcode_entrance p_mouse_before_hibernate: -0416 20400419 call p_mouse_sensor_powerdown_check -0417 7011c6a0 jam zcode_a0 ,mem_zcode_temp_param0 -0418 2020074b branch p_zcode_entrance +0415 20400418 call p_mouse_sensor_powerdown_check +0416 7011c6a0 jam zcode_a0 ,mem_zcode_temp_param0 +0417 2020074b branch p_zcode_entrance p_mouse_sensor_powerdown_check: -0419 6800cafe fetch 1 ,mem_mouse_init_sensor_reset_flag -041a 207a0000 rtn blank -041b 704afe00 jam 0 ,mem_mouse_init_sensor_reset_flag +0418 6800cafe fetch 1 ,mem_mouse_init_sensor_reset_flag +0419 207a0000 rtn blank +041a 704afe00 jam 0 ,mem_mouse_init_sensor_reset_flag p_mouse_sensor_powerdown: -041c 204002c3 call p_mouse_init_sunt -041d 58000006 setarg 0x06 -041e 20406414 call twspi_read -041f 1fe1fe08 or pdata ,0x08 ,pdata -0420 1fed7e00 lshift8 pdata ,pdata -0421 1fe0fe06 add pdata ,0x06 ,pdata -0422 20206413 branch twspi_write +041b 204002c3 call p_mouse_init_sunt +041c 58000006 setarg 0x06 +041d 20406414 call twspi_read +041e 1fe1fe08 or pdata ,0x08 ,pdata +041f 1fed7e00 lshift8 pdata ,pdata +0420 1fe0fe06 add pdata ,0x06 ,pdata +0421 20206413 branch twspi_write p_mouse_bb_event_timer: -0423 2040043d call p_mouse_le_switch_adv_timer +0422 2040043d call p_mouse_le_switch_adv_timer +0423 204003c9 call p_mouse_dpi_check 0424 204004b5 call p_mouse_multi_led_blink_timer 0425 20400486 call p_mouse_wheel_trigger_timer 0426 204004ab call p_mouse_null_enter_hibernate_timer @@ -35515,7 +35515,7 @@ z_hid_rx_process_hid_control: 10038 18427e00 copy temp ,pdata -10039 c00283fa beq hid_control_p_virtualcableunplug ,p_mouse_irtual_cable_unplug +10039 c00283f9 beq hid_control_p_virtualcableunplug ,p_mouse_irtual_cable_unplug 1003a 20204d41 branch hid_rx_process_hid_control + 2 org 0x20001 @@ -36126,7 +36126,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 204003f2 call p_app_updata_le_param +b0014 204003f1 call p_app_updata_le_param b0015 7047c401 jam le_lpm_disable ,mem_mouse_le_conn_param_reject b0016 20600000 rtn @@ -36135,7 +36135,7 @@ b0018 202005cc branch p_mouse_le_conn_param_update_rsp_not_accepted_mult_reset z_mouse_le_bb_disconnected: -b0019 20400419 call p_mouse_sensor_powerdown_check +b0019 20400418 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 @@ -36210,7 +36210,7 @@ c0015 20200018 branch z_mouse_le_ll_enable_start_enc_flag z_mouse_le_ll_reconn_start_encryt: -c0016 204003f2 call p_app_updata_le_param +c0016 204003f1 call p_app_updata_le_param c0017 7046c60a jam 10 ,mem_le_start_encrypt_timer z_mouse_le_ll_enable_start_enc_flag: @@ -36218,7 +36218,7 @@ c0019 202041b9 branch mouse_le_enable_connect_flag z_mouse_bb_event_disconnected: -c001a 20400419 call p_mouse_sensor_powerdown_check +c001a 20400418 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-6/output/romcode.rom (revision 3796) +++ /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_LBX-172-6/output/romcode.rom (working copy) @@ -24628,7 +24628,7 @@ 704b0301 20600000 18427e00 -c00283fa +c00283f9 20204d41 c008001d c008802a @@ -25081,12 +25081,12 @@ 58000009 60014496 60014498 -204003f2 +204003f1 7047c401 20600000 704b6401 202005cc -20400419 +20400418 704b7200 58000007 60014496 @@ -25146,11 +25146,11 @@ c0008016 7046c614 20200018 -204003f2 +204003f1 7046c60a d8e00001 202041b9 -20400419 +20400418 704aff00 704b0100 704b0a00 @@ -25174,4 +25174,4 @@ 204004b2 20400387 202041c3 -0000d6f3 +0000e252 Index: program/patch.prog =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_LBX-172-6/program/patch.prog (revision 3796) +++ /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_LBX-172-6/program/patch.prog (working copy) @@ -1674,7 +1674,6 @@ p_mouse_idle: call ui_check_paring_button - call p_mouse_dpi_check branch mouse_wheel_check p_mouse_dpi_check: @@ -1695,7 +1694,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 @@ 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_wheel_trigger_timer call p_mouse_null_enter_hibernate_timer Index: sched/mouse.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_LBX-172-6/sched/mouse.dat (revision 3796) +++ /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_LBX-172-6/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