Index: output/flash.dat =================================================================== --- /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_D1123E/output/flash.dat (revision 4093) +++ /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_D1123E/output/flash.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -ea +d2 1f 20 20 @@ -75,7 +75,7 @@ 20 20 07 -d9 +d3 58 00 03 @@ -275,7 +275,7 @@ c0 42 87 -d7 +d1 c0 44 87 @@ -687,7 +687,7 @@ 20 20 07 -d9 +d3 70 11 c5 @@ -695,7 +695,7 @@ 20 20 07 -d9 +d3 20 40 02 @@ -1687,7 +1687,7 @@ 20 20 07 -d9 +d3 20 40 07 @@ -1699,7 +1699,7 @@ 20 20 07 -d9 +d3 79 3f 80 @@ -2807,7 +2807,7 @@ 20 20 07 -d9 +d3 da 20 43 @@ -2871,7 +2871,7 @@ 20 20 07 -d9 +d3 20 40 03 @@ -3615,7 +3615,7 @@ 20 20 07 -d9 +d3 70 11 c5 @@ -3623,7 +3623,7 @@ 20 20 07 -d9 +d3 58 00 00 @@ -4379,7 +4379,7 @@ 20 20 07 -d9 +d3 20 40 04 @@ -4391,7 +4391,7 @@ 20 20 07 -d9 +d3 70 0a 99 @@ -4407,7 +4407,7 @@ 20 20 07 -d9 +d3 70 11 c5 @@ -4415,7 +4415,7 @@ 20 20 07 -d9 +d3 70 11 c5 @@ -4423,7 +4423,7 @@ 20 20 07 -d9 +d3 70 11 c5 @@ -4431,7 +4431,7 @@ 20 20 07 -d9 +d3 70 11 c5 @@ -4439,7 +4439,7 @@ 20 20 07 -d9 +d3 70 4b b9 @@ -4467,7 +4467,7 @@ 20 20 07 -d9 +d3 70 11 c5 @@ -4475,7 +4475,7 @@ 20 20 07 -d9 +d3 70 4b b9 @@ -4491,7 +4491,7 @@ 20 20 07 -d9 +d3 70 4b b9 @@ -4515,7 +4515,7 @@ 20 20 07 -d9 +d3 70 4b b9 @@ -4547,7 +4547,7 @@ 20 20 07 -d9 +d3 68 00 cb @@ -6167,7 +6167,7 @@ 20 20 07 -d9 +d3 70 11 c5 @@ -6175,7 +6175,7 @@ 20 20 07 -d9 +d3 d8 a0 43 @@ -6287,7 +6287,7 @@ 20 20 07 -d9 +d3 70 11 c5 @@ -6295,7 +6295,7 @@ 20 20 07 -d9 +d3 68 00 84 @@ -6867,7 +6867,7 @@ 20 20 07 -d9 +d3 68 10 80 @@ -7315,7 +7315,7 @@ 20 20 07 -d9 +d3 20 40 62 @@ -7919,19 +7919,15 @@ c0 01 07 -c2 +bd c0 02 07 -ca +c5 c0 10 07 -d4 -20 -40 -07 -cf +ce 70 89 55 @@ -7943,27 +7939,11 @@ 70 89 58 -6c +3c 20 20 29 -4b -70 -89 -4c -fb -70 -89 -4d -ef -70 -89 -4e -ec -70 -89 -4f -5e +53 70 89 55 @@ -7975,15 +7955,11 @@ 70 89 58 -3c +6c 20 20 29 -53 -20 -40 -07 -cf +4b 70 89 55 @@ -7991,11 +7967,11 @@ 70 89 56 -c0 +e0 70 89 58 -6c +3c 20 20 29 @@ -8059,7 +8035,7 @@ 20 22 87 -f8 +f2 60 08 cb @@ -8135,7 +8111,7 @@ 24 22 87 -e9 +e3 20 40 03 @@ -8172,8 +8148,8 @@ 20 00 01 -36 -2b +90 +38 aa 55 08 @@ -9147,7 +9123,7 @@ 00 b4 4b -0d +0e 00 aa 55 @@ -9290,14 +9266,14 @@ 00 57 4b -5b +43 32 00 55 aa aa 55 -4f +50 29 ff 20 @@ -12888,5 +12864,5 @@ 55 00 00 -e7 -25 +c5 +38 Index: output/program.lis =================================================================== --- /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_D1123E/output/program.lis (revision 4093) +++ /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 202007d9 branch p_zcode_entrance +0011 202007d3 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 c04287d7 beq patch10_5 ,p_shutdown_radio +0043 c04287d1 beq patch10_5 ,p_shutdown_radio 0044 c04487aa beq patch11_1 ,p_set_freq_tx 0045 c02886e7 beq patch0a_1 ,p_slave_conn_recv_packet 0046 c05286ec beq patch14_5 ,p_lpm_sleep @@ -216,11 +216,11 @@ p_g24_pair_dispatch: 00a9 7011c5c0 jam zcode_c0 ,mem_zcode_temp_param0 -00aa 202007d9 branch p_zcode_entrance +00aa 202007d3 branch p_zcode_entrance p_g24_reconn_dispatch: 00ab 7011c570 jam zcode_70 ,mem_zcode_temp_param0 -00ac 202007d9 branch p_zcode_entrance +00ac 202007d3 branch p_zcode_entrance p_g24_transmit_by_interrupt: 00ad 2040023f call p_g24_timer_check @@ -566,14 +566,14 @@ p_g24_pairing_sm: 01a3 7011c590 jam zcode_90 ,mem_zcode_temp_param0 -01a4 202007d9 branch p_zcode_entrance +01a4 202007d3 branch p_zcode_entrance p_g24_paring_mode_start: 01a5 20400787 call power_ctrl_pac_succ_cnt_init p_g24_paring_mode: 01a6 7011c591 jam zcode_91 ,mem_zcode_temp_param0 -01a7 202007d9 branch p_zcode_entrance +01a7 202007d3 branch p_zcode_entrance p_g24_check_51cmd_stop_24g: 01a8 793f8026 set0 mark_24g ,mark @@ -922,7 +922,7 @@ p_mouse4_0_check_reconn_target: 02bb 7011c523 jam zcode_23 ,mem_zcode_temp_param0 -02bc 202007d9 branch p_zcode_entrance +02bc 202007d3 branch p_zcode_entrance p_le_check_adv_flag: 02bd da204370 arg mem_le_adv_data ,rega @@ -948,7 +948,7 @@ p_mouse_24g_pairing_button: 02cb 7011c562 jam zcode_62 ,mem_zcode_temp_param0 -02cc 202007d9 branch p_zcode_entrance +02cc 202007d3 branch p_zcode_entrance p_mouse_init_sunt: 02cd 20400336 call p_mouse_spi_init @@ -1202,11 +1202,11 @@ p_g24_start_24g_mode: 0385 7011c560 jam zcode_60 ,mem_zcode_temp_param0 -0386 202007d9 branch p_zcode_entrance +0386 202007d3 branch p_zcode_entrance p_g24_auto_pair_start: 0387 7011c561 jam zcode_61 ,mem_zcode_temp_param0 -0388 202007d9 branch p_zcode_entrance +0388 202007d3 branch p_zcode_entrance p_g24_pair_timer_clear: 0389 58000000 setarg 0 @@ -1457,12 +1457,12 @@ p_mouse_le_bb_event_connected: 0444 7011c5d0 jam zcode_d0 ,mem_zcode_temp_param0 -0445 202007d9 branch p_zcode_entrance +0445 202007d3 branch p_zcode_entrance p_mouse_le_bb_disconnected: 0446 20400470 call p_mouse_sensor_powerdown_check 0447 7011c5a2 jam zcode_a2 ,mem_zcode_temp_param0 -0448 202007d9 branch p_zcode_entrance +0448 202007d3 branch p_zcode_entrance p_mouse_le_enc_info: @@ -1472,25 +1472,25 @@ p_mouse_le_ll_start_encryt: 044b 7011c5b3 jam zcode_b3 ,mem_zcode_temp_param0 -044c 202007d9 branch p_zcode_entrance +044c 202007d3 branch p_zcode_entrance p_mouse_le_conn_param_update_rsp_recieved: 044d 7011c5a1 jam zcode_a1 ,mem_zcode_temp_param0 -044e 202007d9 branch p_zcode_entrance +044e 202007d3 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 202007d9 branch p_zcode_entrance +0450 202007d3 branch p_zcode_entrance p_mouse_irtual_cable_unplug: 0451 7011c571 jam zcode_71 ,mem_zcode_temp_param0 -0452 202007d9 branch p_zcode_entrance +0452 202007d3 branch p_zcode_entrance p_mouse_sniff_not_accept: 0453 7011c5b1 jam zcode_b1 ,mem_zcode_temp_param0 -0454 202007d9 branch p_zcode_entrance +0454 202007d3 branch p_zcode_entrance p_mouse_bb_event_connected: 0455 704bb900 jam 0 ,mem_mouse_connected_state @@ -1501,17 +1501,17 @@ p_mouse_bb_event_disconnected: 0459 20400470 call p_mouse_sensor_powerdown_check 045a 7011c5b4 jam zcode_b4 ,mem_zcode_temp_param0 -045b 202007d9 branch p_zcode_entrance +045b 202007d3 branch p_zcode_entrance p_mouse_enter_sniff_check: 045c 7011c5b2 jam zcode_b2 ,mem_zcode_temp_param0 -045d 202007d9 branch p_zcode_entrance +045d 202007d3 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 7011c592 jam zcode_92 ,mem_zcode_temp_param0 -0461 202007d9 branch p_zcode_entrance +0461 202007d3 branch p_zcode_entrance p_mouse_24g_attempt_fail: 0462 704bb901 jam 1 ,mem_mouse_connected_state @@ -1519,7 +1519,7 @@ 0464 20400776 call p_mouse_dpi_multi_led_blink 0465 20400470 call p_mouse_sensor_powerdown_check 0466 7011c5a0 jam zcode_a0 ,mem_zcode_temp_param0 -0467 202007d9 branch p_zcode_entrance +0467 202007d3 branch p_zcode_entrance p_mouse_24g_attempt_success: 0468 704bb900 jam 0 ,mem_mouse_connected_state @@ -1533,7 +1533,7 @@ p_mouse_before_hibernate: 046d 20400470 call p_mouse_sensor_powerdown_check 046e 7011c5a4 jam zcode_a4 ,mem_zcode_temp_param0 -046f 202007d9 branch p_zcode_entrance +046f 202007d3 branch p_zcode_entrance p_mouse_sensor_powerdown_check: 0470 6800cb00 fetch 1 ,mem_mouse_init_sensor_reset_flag @@ -2108,11 +2108,11 @@ p_le_addr_random_config: 0603 7011c581 jam zcode_81 ,mem_zcode_temp_param0 -0604 202007d9 branch p_zcode_entrance +0604 202007d3 branch p_zcode_entrance p_mouse_start_discovery: 0605 7011c550 jam zcode_50 ,mem_zcode_temp_param0 -0606 202007d9 branch p_zcode_entrance +0606 202007d3 branch p_zcode_entrance p_le_adv_data_update: 0607 d8a0437b arg mem_le_adv_data + 11 ,contw @@ -2152,11 +2152,11 @@ p_le_update_param: 0621 7011c540 jam zcode_40 ,mem_zcode_temp_param0 -0622 202007d9 branch p_zcode_entrance +0622 202007d3 branch p_zcode_entrance p_le_update_channel_map: 0623 7011c541 jam zcode_41 ,mem_zcode_temp_param0 -0624 202007d9 branch p_zcode_entrance +0624 202007d3 branch p_zcode_entrance p_le_prepare_tx: 0625 68008456 fetch 1 ,mem_le_arq @@ -2349,7 +2349,7 @@ p_le_mouse_bb_event_connect_complete: 06b2 7011c542 jam zcode_42 ,mem_zcode_temp_param0 -06b3 202007d9 branch p_zcode_entrance +06b3 202007d3 branch p_zcode_entrance p_twspi_reset: 06b4 68108077 hfetch 1 ,core_gpio_out3 @@ -2493,7 +2493,7 @@ 0720 6800cb2e fetch 1 ,mem_mouse_multi_led_blink_count 0721 247a0000 nrtn blank 0722 7011c510 jam zcode_10 ,mem_zcode_temp_param0 -0723 202007d9 branch p_zcode_entrance +0723 202007d3 branch p_zcode_entrance p_check_51cmd_once_continue: 0724 204062bc call lmo_fifo_check @@ -2722,88 +2722,82 @@ 07b7 2000000a nop 10 07b8 7089027d jam 0x7d ,rfen_mdm 07b9 6800c1de fetch 1 ,mem_tx_power -07ba c00107c2 beq tx_power_5db ,p_set_tx_power_5db -07bb c00207ca beq tx_power_f5db ,p_set_tx_power_f5db -07bc c01007d4 beq tx_power_pair ,p_set_tx_power_pair - -p_set_tx_power_0db: -07bd 204007cf call p_rx_low_sens -07be 708955d0 jam 0xd0 ,0x8955 -07bf 708956e0 jam 0xe0 ,0x8956 -07c0 7089586c jam 0x6c ,0x8958 -07c1 2020294b branch set_tx_power_0db +07ba c00107bd beq tx_power_5db ,p_set_tx_power_5db +07bb c00207c5 beq tx_power_f5db ,p_set_tx_power_f5db +07bc c01007ce beq tx_power_pair ,p_set_tx_power_pair p_set_tx_power_5db: -07c2 70894cfb jam 0xfb ,0x894c -07c3 70894def jam 0xef ,0x894d -07c4 70894eec jam 0xec ,0x894e -07c5 70894f5e jam 0x5e ,0x894f -07c6 708955d0 jam 0xd0 ,0x8955 -07c7 708956e0 jam 0xe0 ,0x8956 -07c8 7089583c jam 0x3c ,0x8958 -07c9 20202953 branch set_tx_power_5db +07bd 708955d0 jam 0xd0 ,0x8955 +07be 708956e0 jam 0xe0 ,0x8956 +07bf 7089583c jam 0x3c ,0x8958 +07c0 20202953 branch set_tx_power_5db + +p_set_tx_power_0db: +07c1 708955d0 jam 0xd0 ,0x8955 +07c2 708956e0 jam 0xe0 ,0x8956 +07c3 7089586c jam 0x6c ,0x8958 +07c4 2020294b branch set_tx_power_0db p_set_tx_power_f5db: -07ca 204007cf call p_rx_low_sens -07cb 708955d0 jam 0xd0 ,0x8955 -07cc 708956c0 jam 0xc0 ,0x8956 -07cd 7089586c jam 0x6c ,0x8958 -07ce 2020295b branch set_tx_power_f5db +07c5 708955d0 jam 0xd0 ,0x8955 +07c6 708956e0 jam 0xe0 ,0x8956 +07c7 7089583c jam 0x3c ,0x8958 +07c8 2020295b branch set_tx_power_f5db p_rx_low_sens: -07cf 70894c5b jam 0x5b ,0x894c -07d0 70894d96 jam 0x96 ,0x894d -07d1 70894e2c jam 0x2c ,0x894e -07d2 70894f46 jam 0x46 ,0x894f -07d3 20600000 rtn +07c9 70894c5b jam 0x5b ,0x894c +07ca 70894d96 jam 0x96 ,0x894d +07cb 70894e2c jam 0x2c ,0x894e +07cc 70894f46 jam 0x46 ,0x894f +07cd 20600000 rtn p_set_tx_power_pair: -07d4 708956c0 jam 0xc0 ,0x8956 -07d5 708955d0 jam 0xd0 ,0x8955 -07d6 20600000 rtn +07ce 708956c0 jam 0xc0 ,0x8956 +07cf 708955d0 jam 0xd0 ,0x8955 +07d0 20600000 rtn p_shutdown_radio: -07d7 18002a08 force 8 ,radio_ctrl -07d8 202028fa branch shutdown_radio + 1 +07d1 18002a08 force 8 ,radio_ctrl +07d2 202028fa branch shutdown_radio + 1 p_zcode_entrance: -07d9 680891c5 fetcht 1 ,mem_zcode_temp_param0 -07da 18518400 rshift4 temp ,temp -07db 6800cb56 fetch 1 ,mem_zcode_current_number -07dc 98467c00 isub temp ,null -07dd 202287f8 branch p_zcode_run ,zero -07de 6008cb56 storet 1 ,mem_zcode_current_number -07df 18408401 increase 1 ,temp -07e0 58000100 setarg zcode_buff_size -07e1 984f8400 imul32 temp ,temp -07e2 6801cb57 fetch 3 ,mem_xip_flash_offset -07e3 98467e00 isub temp ,pdata -07e4 6809cb5a fetcht 3 ,mem_flash_start_addr -07e5 9840fe00 iadd temp ,pdata -07e6 1fe0fffb increase -5 ,pdata -07e7 6001cb5d store 3 ,mem_flash_address -07e8 20400375 call p_flash_release_deep_power_down +07d3 680891c5 fetcht 1 ,mem_zcode_temp_param0 +07d4 18518400 rshift4 temp ,temp +07d5 6800cb56 fetch 1 ,mem_zcode_current_number +07d6 98467c00 isub temp ,null +07d7 202287f2 branch p_zcode_run ,zero +07d8 6008cb56 storet 1 ,mem_zcode_current_number +07d9 18408401 increase 1 ,temp +07da 58000100 setarg zcode_buff_size +07db 984f8400 imul32 temp ,temp +07dc 6801cb57 fetch 3 ,mem_xip_flash_offset +07dd 98467e00 isub temp ,pdata +07de 6809cb5a fetcht 3 ,mem_flash_start_addr +07df 9840fe00 iadd temp ,pdata +07e0 1fe0fffb increase -5 ,pdata +07e1 6001cb5d store 3 ,mem_flash_address +07e2 20400375 call p_flash_release_deep_power_down p_zcode_read_loop: -07e9 6801cb5d fetch 3 ,mem_flash_address -07ea d8400100 arg zcode_buff_size ,temp -07eb da201f00 arg mem_zcode_buff ,rega -07ec 20406562 call spid_read_flash -07ed 68021f00 fetch 4 ,mem_zcode_buff -07ee 680a4b60 fetcht 4 ,mem_zcode_head -07ef 98467c00 isub temp ,null -07f0 242287e9 nbranch p_zcode_read_loop ,zero -07f1 20400336 call p_mouse_spi_init -07f2 58001f00 setarg mem_zcode_buff -07f3 60014199 store 2 ,mem_patch_ptr -07f4 70419b40 jam zcode_code_size ,mem_patch_len -07f5 204064ca call load_ucode -07f6 58000000 setarg 0 -07f7 60024199 store 4 ,mem_patch_ptr +07e3 6801cb5d fetch 3 ,mem_flash_address +07e4 d8400100 arg zcode_buff_size ,temp +07e5 da201f00 arg mem_zcode_buff ,rega +07e6 20406562 call spid_read_flash +07e7 68021f00 fetch 4 ,mem_zcode_buff +07e8 680a4b60 fetcht 4 ,mem_zcode_head +07e9 98467c00 isub temp ,null +07ea 242287e3 nbranch p_zcode_read_loop ,zero +07eb 20400336 call p_mouse_spi_init +07ec 58001f00 setarg mem_zcode_buff +07ed 60014199 store 2 ,mem_patch_ptr +07ee 70419b40 jam zcode_code_size ,mem_patch_len +07ef 204064ca call load_ucode +07f0 58000000 setarg 0 +07f1 60024199 store 4 ,mem_patch_ptr p_zcode_run: -07f8 680091c5 fetch 1 ,mem_zcode_temp_param0 -07f9 20200001 branch p_zcode +07f2 680091c5 fetch 1 ,mem_zcode_temp_param0 +07f3 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 4093) +++ /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_D1123E/program/patch.prog (working copy) @@ -3517,8 +3517,24 @@ beq TX_POWER_f5DB,p_set_tx_power_f5db beq TX_POWER_PAIR,p_set_tx_power_pair // branch p_set_tx_power_0db + +p_set_tx_power_5db: +// call p_rx_high_sens +// jam 0xfb,0x894c +// jam 0xef,0x894d +// jam 0xec,0x894e +// jam 0x5e,0x894f + +// jam 0xba,0x894b + jam 0xd0,0x8955 + jam 0xe0,0x8956 +// jam 0x88,0x8957 + jam 0x3c,0x8958 +// jam 0x10,0x8959 + branch set_tx_power_5db + p_set_tx_power_0db: - call p_rx_low_sens +// call p_rx_low_sens // jam 0xba,0x894b jam 0xd0,0x8955 jam 0xe0,0x8956 @@ -3536,21 +3552,6 @@ // jam 0x3c,0x8958 // jam 0x10,0x8959 // branch set_tx_power_3db - -p_set_tx_power_5db: -// call p_rx_high_sens - jam 0xfb,0x894c - jam 0xef,0x894d - jam 0xec,0x894e - jam 0x5e,0x894f - -// jam 0xba,0x894b - jam 0xd0,0x8955 - jam 0xe0,0x8956 -// jam 0x88,0x8957 - jam 0x3c,0x8958 -// jam 0x10,0x8959 - branch set_tx_power_5db //p_set_tx_power_f3db: // call p_rx_low_sens @@ -3563,12 +3564,12 @@ // branch set_tx_power_f3db p_set_tx_power_f5db: - call p_rx_low_sens +// call p_rx_low_sens // jam 0xba,0x894b jam 0xd0,0x8955 - jam 0xc0,0x8956 + jam 0xe0,0x8956 // jam 0x88,0x8957 - jam 0x6c,0x8958 + jam 0x3c,0x8958 // jam 0x10,0x8959 branch set_tx_power_f5db Index: sched/mouse.dat =================================================================== --- /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_D1123E/sched/mouse.dat (revision 4093) +++ /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:0d 00 +mem_firmware_version:0e 00 mem_device_flag:01 mem_device1_type:34