Index: output/flash.dat =================================================================== --- /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_D1123E/output/flash.dat (revision 4377) +++ /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_D1123E/output/flash.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -da +c6 1f 20 20 @@ -75,7 +75,7 @@ 20 20 07 -d5 +d0 58 00 03 @@ -275,7 +275,7 @@ c0 42 87 -d3 +ce c0 44 87 @@ -678,8 +678,8 @@ 3c 20 20 -2d -8c +2b +93 70 11 c5 @@ -687,7 +687,7 @@ 20 20 07 -d5 +d0 70 11 c5 @@ -695,7 +695,7 @@ 20 20 07 -d5 +d0 20 40 02 @@ -1687,7 +1687,7 @@ 20 20 07 -d5 +d0 20 40 07 @@ -1699,7 +1699,7 @@ 20 20 07 -d5 +d0 79 3f 80 @@ -2807,7 +2807,7 @@ 20 20 07 -d5 +d0 da 20 43 @@ -2871,7 +2871,7 @@ 20 20 07 -d5 +d0 20 40 03 @@ -3615,7 +3615,7 @@ 20 20 07 -d5 +d0 70 11 c5 @@ -3623,7 +3623,7 @@ 20 20 07 -d5 +d0 58 00 00 @@ -4379,7 +4379,7 @@ 20 20 07 -d5 +d0 20 40 04 @@ -4391,7 +4391,7 @@ 20 20 07 -d5 +d0 70 0a 99 @@ -4407,7 +4407,7 @@ 20 20 07 -d5 +d0 70 11 c5 @@ -4415,7 +4415,7 @@ 20 20 07 -d5 +d0 70 11 c5 @@ -4423,7 +4423,7 @@ 20 20 07 -d5 +d0 70 11 c5 @@ -4431,7 +4431,7 @@ 20 20 07 -d5 +d0 70 11 c5 @@ -4439,7 +4439,7 @@ 20 20 07 -d5 +d0 70 4b b9 @@ -4467,7 +4467,7 @@ 20 20 07 -d5 +d0 70 11 c5 @@ -4475,7 +4475,7 @@ 20 20 07 -d5 +d0 70 4b b9 @@ -4495,7 +4495,7 @@ 20 20 07 -d5 +d0 70 4b b9 @@ -4519,7 +4519,7 @@ 20 20 07 -d5 +d0 70 4b b9 @@ -4555,7 +4555,7 @@ 20 20 07 -d5 +d0 68 00 cb @@ -5537,8 +5537,8 @@ 05 71 c0 -2d -05 +03 +85 71 68 00 @@ -6175,7 +6175,7 @@ 20 20 07 -d5 +d0 70 11 c5 @@ -6183,7 +6183,7 @@ 20 20 07 -d5 +d0 d8 a0 43 @@ -6295,7 +6295,7 @@ 20 20 07 -d5 +d0 70 11 c5 @@ -6303,7 +6303,7 @@ 20 20 07 -d5 +d0 68 00 84 @@ -6875,7 +6875,7 @@ 20 20 07 -d5 +d0 68 10 80 @@ -7323,7 +7323,7 @@ 20 20 07 -d5 +d0 20 40 62 @@ -7761,8 +7761,8 @@ cd 8b c1 -90 -00 +be +80 00 70 4d @@ -7935,7 +7935,7 @@ c0 10 07 -d0 +cb 70 89 55 @@ -7963,7 +7963,7 @@ 70 89 58 -6c +3c 20 20 29 @@ -7986,26 +7986,6 @@ 5b 70 89 -4c -5b -70 -89 -4d -96 -70 -89 -4e -2c -70 -89 -4f -46 -20 -60 -00 -00 -70 -89 56 c0 70 @@ -8043,7 +8023,7 @@ 20 22 87 -f4 +ef 60 08 cb @@ -8119,7 +8099,7 @@ 24 22 87 -e5 +e0 20 40 03 @@ -8156,8 +8136,8 @@ 20 00 01 -9e -4b +8b +de aa 55 08 @@ -9131,7 +9111,7 @@ 00 b4 4b -0f +10 00 aa 55 @@ -9274,15 +9254,9 @@ 00 57 4b -4b +31 32 00 -55 -aa -aa -55 -51 -29 ff 20 20 @@ -12872,5 +12846,5 @@ 55 00 00 -55 -71 +8c +2e Index: output/program.lis =================================================================== --- /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_D1123E/output/program.lis (revision 4377) +++ /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_D1123E/output/program.lis (working copy) @@ -25,7 +25,7 @@ p_mouse_setting_config: 0010 7011c580 jam zcode_80 ,mem_zcode_temp_param0 -0011 202007d5 branch p_zcode_entrance +0011 202007d0 branch p_zcode_entrance p_mouse_cb_fuction: 0012 58000393 setarg p_mouse_g24_package_data @@ -85,7 +85,7 @@ 0040 c2840056 bbit1 8 ,pf_patch_ext 0041 c0008071 beq patch00_1 ,p_soft_reset_1 0042 c001007b beq patch00_2 ,p_soft_reset_2 -0043 c04287d3 beq patch10_5 ,p_shutdown_radio +0043 c04287ce beq patch10_5 ,p_shutdown_radio 0044 c04487ac beq patch11_1 ,p_set_freq_tx 0045 c02886e9 beq patch0a_1 ,p_slave_conn_recv_packet 0046 c05286ee beq patch14_5 ,p_lpm_sleep @@ -210,17 +210,15 @@ 00a5 24740000 nrtn user 00a6 20400263 call p_clear_wake 00a7 5800f03c setarg 61500 - -p_g24_enter_sleep: -00a8 20202d8c branch g24_lpm_long_sleep2 +00a8 20202b93 branch lpm_dispatch_sleep p_g24_pair_dispatch: 00a9 7011c5c0 jam zcode_c0 ,mem_zcode_temp_param0 -00aa 202007d5 branch p_zcode_entrance +00aa 202007d0 branch p_zcode_entrance p_g24_reconn_dispatch: 00ab 7011c570 jam zcode_70 ,mem_zcode_temp_param0 -00ac 202007d5 branch p_zcode_entrance +00ac 202007d0 branch p_zcode_entrance p_g24_transmit_by_interrupt: 00ad 2040023f call p_g24_timer_check @@ -566,14 +564,14 @@ p_g24_pairing_sm: 01a3 7011c590 jam zcode_90 ,mem_zcode_temp_param0 -01a4 202007d5 branch p_zcode_entrance +01a4 202007d0 branch p_zcode_entrance p_g24_paring_mode_start: 01a5 20400789 call power_ctrl_pac_succ_cnt_init p_g24_paring_mode: 01a6 7011c591 jam zcode_91 ,mem_zcode_temp_param0 -01a7 202007d5 branch p_zcode_entrance +01a7 202007d0 branch p_zcode_entrance p_g24_check_51cmd_stop_24g: 01a8 793f8026 set0 mark_24g ,mark @@ -922,7 +920,7 @@ p_mouse4_0_check_reconn_target: 02bb 7011c523 jam zcode_23 ,mem_zcode_temp_param0 -02bc 202007d5 branch p_zcode_entrance +02bc 202007d0 branch p_zcode_entrance p_le_check_adv_flag: 02bd da204370 arg mem_le_adv_data ,rega @@ -948,7 +946,7 @@ p_mouse_24g_pairing_button: 02cb 7011c562 jam zcode_62 ,mem_zcode_temp_param0 -02cc 202007d5 branch p_zcode_entrance +02cc 202007d0 branch p_zcode_entrance p_mouse_init_sunt: 02cd 20400336 call p_mouse_spi_init @@ -1202,11 +1200,11 @@ p_g24_start_24g_mode: 0385 7011c560 jam zcode_60 ,mem_zcode_temp_param0 -0386 202007d5 branch p_zcode_entrance +0386 202007d0 branch p_zcode_entrance p_g24_auto_pair_start: 0387 7011c561 jam zcode_61 ,mem_zcode_temp_param0 -0388 202007d5 branch p_zcode_entrance +0388 202007d0 branch p_zcode_entrance p_g24_pair_timer_clear: 0389 58000000 setarg 0 @@ -1457,12 +1455,12 @@ p_mouse_le_bb_event_connected: 0444 7011c5d0 jam zcode_d0 ,mem_zcode_temp_param0 -0445 202007d5 branch p_zcode_entrance +0445 202007d0 branch p_zcode_entrance p_mouse_le_bb_disconnected: 0446 20400472 call p_mouse_sensor_powerdown_check 0447 7011c5a2 jam zcode_a2 ,mem_zcode_temp_param0 -0448 202007d5 branch p_zcode_entrance +0448 202007d0 branch p_zcode_entrance p_mouse_le_enc_info: @@ -1472,25 +1470,25 @@ p_mouse_le_ll_start_encryt: 044b 7011c5b3 jam zcode_b3 ,mem_zcode_temp_param0 -044c 202007d5 branch p_zcode_entrance +044c 202007d0 branch p_zcode_entrance p_mouse_le_conn_param_update_rsp_recieved: 044d 7011c5a1 jam zcode_a1 ,mem_zcode_temp_param0 -044e 202007d5 branch p_zcode_entrance +044e 202007d0 branch p_zcode_entrance p_mouse_bb_event_reconn_timeout: p_mouse_bb_event_reconn_failed: 044f 7011c5a3 jam zcode_a3 ,mem_zcode_temp_param0 -0450 202007d5 branch p_zcode_entrance +0450 202007d0 branch p_zcode_entrance p_mouse_irtual_cable_unplug: 0451 7011c571 jam zcode_71 ,mem_zcode_temp_param0 -0452 202007d5 branch p_zcode_entrance +0452 202007d0 branch p_zcode_entrance p_mouse_sniff_not_accept: 0453 7011c5b1 jam zcode_b1 ,mem_zcode_temp_param0 -0454 202007d5 branch p_zcode_entrance +0454 202007d0 branch p_zcode_entrance p_mouse_bb_event_connected: 0455 704bb900 jam 0 ,mem_mouse_connected_state @@ -1501,18 +1499,18 @@ p_mouse_bb_event_disconnected: 0459 20400472 call p_mouse_sensor_powerdown_check 045a 7011c5b4 jam zcode_b4 ,mem_zcode_temp_param0 -045b 202007d5 branch p_zcode_entrance +045b 202007d0 branch p_zcode_entrance p_mouse_enter_sniff_check: 045c 7011c5b2 jam zcode_b2 ,mem_zcode_temp_param0 -045d 202007d5 branch p_zcode_entrance +045d 202007d0 branch p_zcode_entrance p_mouse_24g_pairing_complete: 045e 704bb900 jam 0 ,mem_mouse_connected_state 045f 204002fa call p_mouse_init_sensor_reset 0460 20400766 call p_mouse_discovey_led_blink_off 0461 7011c592 jam zcode_92 ,mem_zcode_temp_param0 -0462 202007d5 branch p_zcode_entrance +0462 202007d0 branch p_zcode_entrance p_mouse_24g_attempt_fail: 0463 704bb901 jam 1 ,mem_mouse_connected_state @@ -1520,7 +1518,7 @@ 0465 20400778 call p_mouse_dpi_multi_led_blink 0466 20400472 call p_mouse_sensor_powerdown_check 0467 7011c5a0 jam zcode_a0 ,mem_zcode_temp_param0 -0468 202007d5 branch p_zcode_entrance +0468 202007d0 branch p_zcode_entrance p_mouse_24g_attempt_success: 0469 704bb900 jam 0 ,mem_mouse_connected_state @@ -1535,7 +1533,7 @@ p_mouse_before_hibernate: 046f 20400472 call p_mouse_sensor_powerdown_check 0470 7011c5a4 jam zcode_a4 ,mem_zcode_temp_param0 -0471 202007d5 branch p_zcode_entrance +0471 202007d0 branch p_zcode_entrance p_mouse_sensor_powerdown_check: 0472 6800cb00 fetch 1 ,mem_mouse_init_sensor_reset_flag @@ -1875,7 +1873,7 @@ 0564 c002bdaa beq p3610 ,mouse_seting_3610_dpi 0565 c002057b beq p3212 ,p_mouse_seting_3212_dpi 0566 c0030571 beq p3065_xy ,p_mouse_seting_3065xy_dpi -0567 c02d0571 beq p_mx8650 ,p_mouse_seting_3065xy_dpi +0567 c0038571 beq mx8650 ,p_mouse_seting_3065xy_dpi p_mouse_seting_3205_dpi: 0568 6800c77a fetch 1 ,mem_mouse_dpi @@ -2110,11 +2108,11 @@ p_le_addr_random_config: 0605 7011c581 jam zcode_81 ,mem_zcode_temp_param0 -0606 202007d5 branch p_zcode_entrance +0606 202007d0 branch p_zcode_entrance p_mouse_start_discovery: 0607 7011c550 jam zcode_50 ,mem_zcode_temp_param0 -0608 202007d5 branch p_zcode_entrance +0608 202007d0 branch p_zcode_entrance p_le_adv_data_update: 0609 d8a0437b arg mem_le_adv_data + 11 ,contw @@ -2154,11 +2152,11 @@ p_le_update_param: 0623 7011c540 jam zcode_40 ,mem_zcode_temp_param0 -0624 202007d5 branch p_zcode_entrance +0624 202007d0 branch p_zcode_entrance p_le_update_channel_map: 0625 7011c541 jam zcode_41 ,mem_zcode_temp_param0 -0626 202007d5 branch p_zcode_entrance +0626 202007d0 branch p_zcode_entrance p_le_prepare_tx: 0627 68008456 fetch 1 ,mem_le_arq @@ -2351,7 +2349,7 @@ p_le_mouse_bb_event_connect_complete: 06b4 7011c542 jam zcode_42 ,mem_zcode_temp_param0 -06b5 202007d5 branch p_zcode_entrance +06b5 202007d0 branch p_zcode_entrance p_twspi_reset: 06b6 68108077 hfetch 1 ,core_gpio_out3 @@ -2495,7 +2493,7 @@ 0722 6800cb2e fetch 1 ,mem_mouse_multi_led_blink_count 0723 247a0000 nrtn blank 0724 7011c510 jam zcode_10 ,mem_zcode_temp_param0 -0725 202007d5 branch p_zcode_entrance +0725 202007d0 branch p_zcode_entrance p_check_51cmd_once_continue: 0726 204062bc call lmo_fifo_check @@ -2663,7 +2661,7 @@ power_ctrl_txpower_decrs_check: 0792 6800cd8b fetch 1 ,mem_power_ctrl_pac_succ_cnt -0793 c1900000 rtnne 32 +0793 c1be8000 rtnne 125 0794 704d8b00 jam 0 ,mem_power_ctrl_pac_succ_cnt power_ctrl_txpower_decrs: @@ -2726,7 +2724,7 @@ 07bb 6800c1de fetch 1 ,mem_tx_power 07bc c00107bf beq tx_power_5db ,p_set_tx_power_5db 07bd c00207c7 beq tx_power_f5db ,p_set_tx_power_f5db -07be c01007d0 beq tx_power_pair ,p_set_tx_power_pair +07be c01007cb beq tx_power_pair ,p_set_tx_power_pair p_set_tx_power_5db: 07bf 708955d0 jam 0xd0 ,0x8955 @@ -2737,7 +2735,7 @@ p_set_tx_power_0db: 07c3 708955d0 jam 0xd0 ,0x8955 07c4 708956e0 jam 0xe0 ,0x8956 -07c5 7089586c jam 0x6c ,0x8958 +07c5 7089583c jam 0x3c ,0x8958 07c6 2020294b branch set_tx_power_0db p_set_tx_power_f5db: @@ -2746,60 +2744,53 @@ 07c9 7089583c jam 0x3c ,0x8958 07ca 2020295b branch set_tx_power_f5db -p_rx_low_sens: -07cb 70894c5b jam 0x5b ,0x894c -07cc 70894d96 jam 0x96 ,0x894d -07cd 70894e2c jam 0x2c ,0x894e -07ce 70894f46 jam 0x46 ,0x894f -07cf 20600000 rtn - p_set_tx_power_pair: -07d0 708956c0 jam 0xc0 ,0x8956 -07d1 708955d0 jam 0xd0 ,0x8955 -07d2 20600000 rtn +07cb 708956c0 jam 0xc0 ,0x8956 +07cc 708955d0 jam 0xd0 ,0x8955 +07cd 20600000 rtn p_shutdown_radio: -07d3 18002a08 force 8 ,radio_ctrl -07d4 202028fa branch shutdown_radio + 1 +07ce 18002a08 force 8 ,radio_ctrl +07cf 202028fa branch shutdown_radio + 1 p_zcode_entrance: -07d5 680891c5 fetcht 1 ,mem_zcode_temp_param0 -07d6 18518400 rshift4 temp ,temp -07d7 6800cb56 fetch 1 ,mem_zcode_current_number -07d8 98467c00 isub temp ,null -07d9 202287f4 branch p_zcode_run ,zero -07da 6008cb56 storet 1 ,mem_zcode_current_number -07db 18408401 increase 1 ,temp -07dc 58000100 setarg zcode_buff_size -07dd 984f8400 imul32 temp ,temp -07de 6801cb57 fetch 3 ,mem_xip_flash_offset -07df 98467e00 isub temp ,pdata -07e0 6809cb5a fetcht 3 ,mem_flash_start_addr -07e1 9840fe00 iadd temp ,pdata -07e2 1fe0fffb increase -5 ,pdata -07e3 6001cb5d store 3 ,mem_flash_address -07e4 20400375 call p_flash_release_deep_power_down +07d0 680891c5 fetcht 1 ,mem_zcode_temp_param0 +07d1 18518400 rshift4 temp ,temp +07d2 6800cb56 fetch 1 ,mem_zcode_current_number +07d3 98467c00 isub temp ,null +07d4 202287ef branch p_zcode_run ,zero +07d5 6008cb56 storet 1 ,mem_zcode_current_number +07d6 18408401 increase 1 ,temp +07d7 58000100 setarg zcode_buff_size +07d8 984f8400 imul32 temp ,temp +07d9 6801cb57 fetch 3 ,mem_xip_flash_offset +07da 98467e00 isub temp ,pdata +07db 6809cb5a fetcht 3 ,mem_flash_start_addr +07dc 9840fe00 iadd temp ,pdata +07dd 1fe0fffb increase -5 ,pdata +07de 6001cb5d store 3 ,mem_flash_address +07df 20400375 call p_flash_release_deep_power_down p_zcode_read_loop: -07e5 6801cb5d fetch 3 ,mem_flash_address -07e6 d8400100 arg zcode_buff_size ,temp -07e7 da201f00 arg mem_zcode_buff ,rega -07e8 20406562 call spid_read_flash -07e9 68021f00 fetch 4 ,mem_zcode_buff -07ea 680a4b60 fetcht 4 ,mem_zcode_head -07eb 98467c00 isub temp ,null -07ec 242287e5 nbranch p_zcode_read_loop ,zero -07ed 20400336 call p_mouse_spi_init -07ee 58001f00 setarg mem_zcode_buff -07ef 60014199 store 2 ,mem_patch_ptr -07f0 70419b40 jam zcode_code_size ,mem_patch_len -07f1 204064ca call load_ucode -07f2 58000000 setarg 0 -07f3 60024199 store 4 ,mem_patch_ptr +07e0 6801cb5d fetch 3 ,mem_flash_address +07e1 d8400100 arg zcode_buff_size ,temp +07e2 da201f00 arg mem_zcode_buff ,rega +07e3 20406562 call spid_read_flash +07e4 68021f00 fetch 4 ,mem_zcode_buff +07e5 680a4b60 fetcht 4 ,mem_zcode_head +07e6 98467c00 isub temp ,null +07e7 242287e0 nbranch p_zcode_read_loop ,zero +07e8 20400336 call p_mouse_spi_init +07e9 58001f00 setarg mem_zcode_buff +07ea 60014199 store 2 ,mem_patch_ptr +07eb 70419b40 jam zcode_code_size ,mem_patch_len +07ec 204064ca call load_ucode +07ed 58000000 setarg 0 +07ee 60024199 store 4 ,mem_patch_ptr p_zcode_run: -07f4 680091c5 fetch 1 ,mem_zcode_temp_param0 -07f5 20200001 branch p_zcode +07ef 680091c5 fetch 1 ,mem_zcode_temp_param0 +07f0 20200001 branch p_zcode org 0x2000 start: Index: program/patch.prog =================================================================== --- /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_D1123E/program/patch.prog (revision 4377) +++ /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_D1123E/program/patch.prog (working copy) @@ -285,8 +285,7 @@ else setarg 61500 endif -p_g24_enter_sleep: - branch g24_lpm_long_sleep2 + branch lpm_dispatch_sleep p_g24_pair_dispatch: jam ZCODE_C0,mem_zcode_temp_param0 @@ -2361,7 +2360,7 @@ beq P3610,mouse_seting_3610_dpi beq P3212,p_mouse_seting_3212_dpi beq P3065_XY,p_mouse_seting_3065XY_dpi - beq P_MX8650,p_mouse_seting_3065XY_dpi + beq MX8650,p_mouse_seting_3065XY_dpi // beq KA8,p_mouse_seting_ka8_dpi p_mouse_seting_3205_dpi: fetch 1,mem_mouse_dpi @@ -3429,7 +3428,7 @@ power_ctrl_txpower_decrs_check: fetch 1,mem_power_ctrl_pac_succ_cnt - rtnne 32 + rtnne 125 jam 0,mem_power_ctrl_pac_succ_cnt power_ctrl_txpower_decrs: fetcht 1,mem_rssi_avg_received @@ -3541,7 +3540,7 @@ jam 0xd0,0x8955 jam 0xe0,0x8956 // jam 0x88,0x8957 - jam 0x6c,0x8958 + jam 0x3c,0x8958 // jam 0x10,0x8959 branch set_tx_power_0db @@ -3575,12 +3574,12 @@ // jam 0x10,0x8959 branch set_tx_power_f5db -p_rx_low_sens: - jam 0x5b,0x894c - jam 0x96,0x894d - jam 0x2c,0x894e - jam 0x46,0x894f - rtn +//p_rx_low_sens: +// jam 0x5b,0x894c +// jam 0x96,0x894d +// jam 0x2c,0x894e +// jam 0x46,0x894f +// rtn //p_rx_high_sens: // jam 0xfb,0x894c Index: sched/mouse.dat =================================================================== --- /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_D1123E/sched/mouse.dat (revision 4377) +++ /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_D1123E/sched/mouse.dat (working copy) @@ -308,7 +308,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:0f 00 +mem_firmware_version:10 00 mem_device_flag:01 mem_device1_type:34