Index: output/flash.dat =================================================================== --- /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_G1050/output/flash.dat (revision 4456) +++ /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_G1050/output/flash.dat (working copy) @@ -11,7 +11,7 @@ 20 40 03 -9e +9f 68 00 c1 @@ -71,7 +71,7 @@ 58 00 03 -6e +6f 60 01 4d @@ -79,7 +79,7 @@ 58 00 03 -88 +89 60 01 41 @@ -95,7 +95,7 @@ 58 00 03 -b9 +ba 60 01 41 @@ -119,7 +119,7 @@ 58 00 03 -e0 +e1 60 01 41 @@ -323,7 +323,7 @@ c0 72 03 -e3 +e4 c0 73 05 @@ -463,7 +463,7 @@ 20 40 03 -7f +80 20 40 74 @@ -643,7 +643,7 @@ c0 00 83 -71 +72 20 40 02 @@ -2435,7 +2435,7 @@ 20 40 03 -75 +76 20 40 02 @@ -3480,6 +3480,10 @@ 20 07 86 +20 +40 +07 +2c 70 11 c5 @@ -3511,7 +3515,7 @@ c2 00 03 -69 +6a 20 60 00 @@ -3555,7 +3559,7 @@ 20 40 03 -7d +7e d8 c0 19 @@ -3563,7 +3567,7 @@ 20 40 03 -7d +7e d8 c0 1a @@ -3571,7 +3575,7 @@ 20 40 03 -7d +7e d8 c0 1b @@ -3595,7 +3599,7 @@ 20 40 03 -7d +7e d8 a0 19 @@ -3603,7 +3607,7 @@ 20 40 03 -7d +7e d8 a0 1a @@ -3611,7 +3615,7 @@ 20 40 03 -7d +7e d8 a0 1b @@ -3619,7 +3623,7 @@ 20 20 03 -7d +7e 20 40 58 @@ -3635,7 +3639,7 @@ c0 7f 83 -8f +90 68 00 c6 @@ -3655,7 +3659,7 @@ 20 5a 03 -dd +de 68 02 46 @@ -3675,11 +3679,11 @@ 20 40 03 -9b +9c 20 40 03 -b4 +b5 da 20 46 @@ -3691,7 +3695,7 @@ 20 54 03 -a3 +a4 20 60 00 @@ -3755,7 +3759,7 @@ 20 34 03 -ab +ac 20 60 00 @@ -3843,7 +3847,7 @@ 20 5a 03 -dd +de 68 02 46 @@ -3867,11 +3871,11 @@ 20 40 03 -9b +9c 20 40 03 -b4 +b5 68 00 cb @@ -3879,7 +3883,7 @@ c0 00 83 -cc +cd 68 00 cb @@ -3983,11 +3987,11 @@ 20 20 03 -e3 +e4 20 40 03 -e6 +e7 20 40 3f @@ -3997,17 +4001,13 @@ 3e e3 68 -10 -80 -78 -79 -20 -7e -05 -60 -10 +00 +c6 +ea +c1 +7f 80 -78 +00 68 10 80 @@ -5991,7 +5991,7 @@ 20 5a 03 -a7 +a8 20 20 56 @@ -7840,8 +7840,8 @@ 20 00 01 -fd -60 +da +26 aa 55 08 @@ -8410,7 +8410,7 @@ 00 5a 00 -6e +78 00 aa 55 @@ -8428,7 +8428,7 @@ 07 1b 1c -05 +17 1e ff 1f @@ -8912,7 +8912,7 @@ 00 b8 4b -17 +05 aa 55 03 @@ -8926,7 +8926,7 @@ aa aa 55 -45 +4f 1b ff 20 @@ -8972,7 +8972,7 @@ 20 40 03 -9e +9f 20 20 41 @@ -9328,7 +9328,7 @@ 20 20 03 -71 +72 68 02 4c @@ -9872,7 +9872,7 @@ 20 40 03 -9e +9f 20 40 58 @@ -10328,7 +10328,7 @@ 20 40 03 -67 +68 24 34 02 @@ -10344,7 +10344,7 @@ 20 40 03 -67 +68 24 34 02 @@ -10532,7 +10532,7 @@ 20 20 03 -71 +72 70 11 9e @@ -12517,5 +12517,5 @@ 55 00 00 -c7 -24 +5c +41 Index: output/program.lis =================================================================== --- /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_G1050/output/program.lis (revision 4456) +++ /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_G1050/output/program.lis (working copy) @@ -7,7 +7,7 @@ p_zcode: p_wake_from_power: -0001 2040039e call p_mouse_data_init +0001 2040039f call p_mouse_data_init 0002 6800c1de fetch 1 ,mem_tx_power 0003 6000ccf8 store 1 ,mem_tx_power_temp 0004 20400734 call power_ctrl_pac_succ_cnt_init @@ -26,19 +26,19 @@ 000f 20200786 branch p_zcode_entrance p_mouse_cb_fuction: -0010 5800036e setarg p_mouse_g24_package_data +0010 5800036f setarg p_mouse_g24_package_data 0011 60014d72 store 2 ,mem_cb_24g_data -0012 58000388 setarg p_mouse_le +0012 58000389 setarg p_mouse_le 0013 600141ef store 2 ,mem_cb_le_process 0014 5800066a setarg p_le_mouse_bb_event_connect_complete 0015 600141f9 store 2 ,mem_cb_att_write -0016 580003b9 setarg p_mouse_bt +0016 580003ba setarg p_mouse_bt 0017 600141f1 store 2 ,mem_cb_bt_process 0018 5800025e setarg p_mouse_before_lpm 0019 600141ed store 2 ,mem_cb_before_lpm 001a 5800043d setarg p_mouse_priority_bb_event 001b 600141f5 store 2 ,mem_cb_bb_event_process -001c 580003e0 setarg p_mouse_idle +001c 580003e1 setarg p_mouse_idle 001d 600141f3 store 2 ,mem_cb_idle_process 001e 58000475 setarg p_mouse_before_hibernate 001f 600141eb store 2 ,mem_cb_before_hibernate @@ -97,7 +97,7 @@ 004c c0590091 beq patch16_2 ,p_g24_dispatch 004d c0620298 beq patch18_4 ,p_device_init 004e c0718545 beq patch1c_3 ,p_mouse_seting_dpi -004f c07203e3 beq patch1c_4 ,p_mouse_wheel_check +004f c07203e4 beq patch1c_4 ,p_mouse_wheel_check 0050 c0730569 beq patch1c_6 ,p_mouse_motion 0051 c07505a0 beq patch1d_2 ,p_mouse_bb_event_discovery_btn 0052 c07585a5 beq patch1d_3 ,p_mouse_start_discovery @@ -140,7 +140,7 @@ 006f d8a009ae arg mem_sp_state ,contw 0070 df20000c arg 12 ,loopcnt 0071 20407ed4 call clear_mem -0072 2040037f call p_mouse_le_txbuff_load +0072 20400380 call p_mouse_le_txbuff_load 0073 204074c1 call init_memp 0074 20406a03 call rfcomm_init 0075 20405cf6 call init_lmp @@ -199,7 +199,7 @@ 009c c1ff8000 rtnne state_24g_pairing_success 009d 2040068e call power_ctrl_start 009e 6800cb29 fetch 1 ,mem_mouse_multi_led_state -009f c0008371 beq on ,p_g24_transmit_by_interrupt_enable +009f c0008372 beq on ,p_g24_transmit_by_interrupt_enable p_g24_short_sleep: 00a0 20400268 call p_g24_lpm_wait @@ -799,7 +799,7 @@ p_mouse_before_lpm: 025e c6130000 rtnmark1 mark_24g -025f 20400375 call p_mouse_le_txbuff_save +025f 20400376 call p_mouse_le_txbuff_save 0260 20400270 call p_mouse_setgpio_lpm 0261 6800c040 fetch 1 ,mem_context 0262 c3000265 bbit0 state_inconn ,p_clear_wake @@ -1155,182 +1155,182 @@ 0364 20200786 branch p_zcode_entrance p_g24_auto_pair_start: -0365 7011c561 jam zcode_61 ,mem_zcode_temp_param0 -0366 20200786 branch p_zcode_entrance +0365 2040072c call p_mouse_discovery_multi_led_blink +0366 7011c561 jam zcode_61 ,mem_zcode_temp_param0 +0367 20200786 branch p_zcode_entrance p_pdata_0xff_check: -0367 20407fe7 call enable_user -0368 5800ffff setarg 0xffff +0368 20407fe7 call enable_user +0369 5800ffff setarg 0xffff p_pdata_0xff_check_loop: -0369 e8c90000 ifetcht 2 ,contr -036a 98467c00 isub temp ,null -036b 2442ffe9 ncall disable_user ,zero -036c c2000369 loop p_pdata_0xff_check_loop -036d 20600000 rtn +036a e8c90000 ifetcht 2 ,contr +036b 98467c00 isub temp ,null +036c 2442ffe9 ncall disable_user ,zero +036d c200036a loop p_pdata_0xff_check_loop +036e 20600000 rtn p_mouse_g24_package_data: -036e 20404401 call mouse_g24_package_data -036f 6801469f fetch 2 ,mem_mouse_z -0370 207a0000 rtn blank +036f 20404401 call mouse_g24_package_data +0370 6801469f fetch 2 ,mem_mouse_z +0371 207a0000 rtn blank p_g24_transmit_by_interrupt_enable: -0371 704d8101 jam g24_tx_timer_int_enable ,mem_24g_transmit_by_interrupt -0372 58000000 setarg 0 -0373 60014d82 store 2 ,mem_24g_transmit_by_interrupt_exit_count -0374 20600000 rtn +0372 704d8101 jam g24_tx_timer_int_enable ,mem_24g_transmit_by_interrupt +0373 58000000 setarg 0 +0374 60014d82 store 2 ,mem_24g_transmit_by_interrupt_exit_count +0375 20600000 rtn p_mouse_le_txbuff_save: -0375 d8c01800 arg mem_le_tx_buffer0 ,contr -0376 d8a0480c arg mem_le_tx_buffer0_omemalloc ,contw -0377 2040037d call p_mouse_le_txbuff_copy -0378 d8c01900 arg mem_le_tx_buffer1 ,contr -0379 2040037d call p_mouse_le_txbuff_copy -037a d8c01a00 arg mem_le_tx_buffer2 ,contr -037b 2040037d call p_mouse_le_txbuff_copy -037c d8c01b00 arg mem_le_tx_buffer3 ,contr +0376 d8c01800 arg mem_le_tx_buffer0 ,contr +0377 d8a0480c arg mem_le_tx_buffer0_omemalloc ,contw +0378 2040037e call p_mouse_le_txbuff_copy +0379 d8c01900 arg mem_le_tx_buffer1 ,contr +037a 2040037e call p_mouse_le_txbuff_copy +037b d8c01a00 arg mem_le_tx_buffer2 ,contr +037c 2040037e call p_mouse_le_txbuff_copy +037d d8c01b00 arg mem_le_tx_buffer3 ,contr p_mouse_le_txbuff_copy: -037d df20001b arg 27 ,loopcnt -037e 20207f01 branch memcpy +037e df20001b arg 27 ,loopcnt +037f 20207f01 branch memcpy p_mouse_le_txbuff_load: -037f d8c0480c arg mem_le_tx_buffer0_omemalloc ,contr -0380 d8a01800 arg mem_le_tx_buffer0 ,contw -0381 2040037d call p_mouse_le_txbuff_copy -0382 d8a01900 arg mem_le_tx_buffer1 ,contw -0383 2040037d call p_mouse_le_txbuff_copy -0384 d8a01a00 arg mem_le_tx_buffer2 ,contw -0385 2040037d call p_mouse_le_txbuff_copy -0386 d8a01b00 arg mem_le_tx_buffer3 ,contw -0387 2020037d branch p_mouse_le_txbuff_copy +0380 d8c0480c arg mem_le_tx_buffer0_omemalloc ,contr +0381 d8a01800 arg mem_le_tx_buffer0 ,contw +0382 2040037e call p_mouse_le_txbuff_copy +0383 d8a01900 arg mem_le_tx_buffer1 ,contw +0384 2040037e call p_mouse_le_txbuff_copy +0385 d8a01a00 arg mem_le_tx_buffer2 ,contw +0386 2040037e call p_mouse_le_txbuff_copy +0387 d8a01b00 arg mem_le_tx_buffer3 ,contw +0388 2020037e branch p_mouse_le_txbuff_copy p_mouse_le: -0388 20405892 call le_fifo_check_nearly_full -0389 247a0000 nrtn blank -038a 6800cbb3 fetch 1 ,mem_mouse_fast_conn_flag -038b c07f838f beq 0xff ,p_mouse_le_next -038c 6800c6c5 fetch 1 ,mem_le_connect_status_flag -038d 1fe17e03 and pdata ,0x03 ,pdata -038e c1818000 rtnne 0x03 +0389 20405892 call le_fifo_check_nearly_full +038a 247a0000 nrtn blank +038b 6800cbb3 fetch 1 ,mem_mouse_fast_conn_flag +038c c07f8390 beq 0xff ,p_mouse_le_next +038d 6800c6c5 fetch 1 ,mem_le_connect_status_flag +038e 1fe17e03 and pdata ,0x03 ,pdata +038f c1818000 rtnne 0x03 p_mouse_le_next: -038f 6800c79e fetch 1 ,mem_mouse_clear_sensor_data_flag -0390 205a03dd call p_mouse_clear_sensor_data ,blank -0391 680246d3 fetch mouse_flag_len ,mem_mouse_flag -0392 c282c179 bbit1 mouse_bt_discovery_button_down_flag ,mouse_le_send_empty_packet -0393 20403f97 call mouse_motion -0394 24740000 nrtn user -0395 2040039b call p_mouse_le_current_mult_update -0396 204003b4 call p_mouse_wheel_trigger +0390 6800c79e fetch 1 ,mem_mouse_clear_sensor_data_flag +0391 205a03de call p_mouse_clear_sensor_data ,blank +0392 680246d3 fetch mouse_flag_len ,mem_mouse_flag +0393 c282c179 bbit1 mouse_bt_discovery_button_down_flag ,mouse_le_send_empty_packet +0394 20403f97 call mouse_motion +0395 24740000 nrtn user +0396 2040039c call p_mouse_le_current_mult_update +0397 204003b5 call p_mouse_wheel_trigger p_mouse_data_push: -0397 da20469a arg mem_mouse_key ,rega -0398 20407e3d call queue_push -0399 205403a3 call p_mouse_queue_increase ,user -039a 20600000 rtn +0398 da20469a arg mem_mouse_key ,rega +0399 20407e3d call queue_push +039a 205403a4 call p_mouse_queue_increase ,user +039b 20600000 rtn p_mouse_le_current_mult_update: -039b 70417208 jam 8 ,mem_lpm_mult -039c 704b681e jam 30 ,mem_mouse_le_current_mult_timer -039d 20600000 rtn +039c 70417208 jam 8 ,mem_lpm_mult +039d 704b681e jam 30 ,mem_mouse_le_current_mult_timer +039e 20600000 rtn p_mouse_data_init: -039e 7047a207 jam 7 ,mem_mouse_data_queue -039f 7047a304 jam 4 ,mem_mouse_data_queue + 1 -03a0 580047a2 setarg mem_mouse_data_queue -03a1 60014218 store 2 ,mem_queue_ptr -03a2 20207e38 branch queue_init +039f 7047a207 jam 7 ,mem_mouse_data_queue +03a0 7047a304 jam 4 ,mem_mouse_data_queue + 1 +03a1 580047a2 setarg mem_mouse_data_queue +03a2 60014218 store 2 ,mem_queue_ptr +03a3 20207e38 branch queue_init p_mouse_queue_increase: -03a3 6800c7c3 fetch 1 ,mem_mouse_data_queue_num -03a4 1fe0fe01 increase 1 ,pdata -03a5 6000c7c3 store 1 ,mem_mouse_data_queue_num -03a6 20600000 rtn +03a4 6800c7c3 fetch 1 ,mem_mouse_data_queue_num +03a5 1fe0fe01 increase 1 ,pdata +03a6 6000c7c3 store 1 ,mem_mouse_data_queue_num +03a7 20600000 rtn p_mouse_data_pull: -03a7 da20469a arg mem_mouse_key ,rega -03a8 20407e54 call queue_pop -03a9 203403ab branch p_mouse_fill_data_le ,user -03aa 20600000 rtn +03a8 da20469a arg mem_mouse_key ,rega +03a9 20407e54 call queue_pop +03aa 203403ac branch p_mouse_fill_data_le ,user +03ab 20600000 rtn p_mouse_fill_data_le: -03ab 20405652 call le_clear_md -03ac 6800c7c3 fetch 1 ,mem_mouse_data_queue_num -03ad 1fe67c01 sub pdata ,1 ,null -03ae 24415650 ncall le_set_md ,positive -03af 6800c7c3 fetch 1 ,mem_mouse_data_queue_num -03b0 207a0000 rtn blank -03b1 1fe0ffff increase -1 ,pdata -03b2 6000c7c3 store 1 ,mem_mouse_data_queue_num -03b3 20203f90 branch mouse_fill_data_le +03ac 20405652 call le_clear_md +03ad 6800c7c3 fetch 1 ,mem_mouse_data_queue_num +03ae 1fe67c01 sub pdata ,1 ,null +03af 24415650 ncall le_set_md ,positive +03b0 6800c7c3 fetch 1 ,mem_mouse_data_queue_num +03b1 207a0000 rtn blank +03b2 1fe0ffff increase -1 ,pdata +03b3 6000c7c3 store 1 ,mem_mouse_data_queue_num +03b4 20203f90 branch mouse_fill_data_le p_mouse_wheel_trigger: -03b4 6801469f fetch 2 ,mem_mouse_z -03b5 207a0000 rtn blank -03b6 70480801 jam 1 ,mem_mouse_wheel_trigger -03b7 7048090a jam 10 ,mem_mouse_wheel_trigger_timer -03b8 20600000 rtn +03b5 6801469f fetch 2 ,mem_mouse_z +03b6 207a0000 rtn blank +03b7 70480801 jam 1 ,mem_mouse_wheel_trigger +03b8 7048090a jam 10 ,mem_mouse_wheel_trigger_timer +03b9 20600000 rtn p_mouse_bt: -03b9 20770000 rtn attempt -03ba 6800c1e2 fetch 1 ,mem_app_handshake_flag -03bb 207a0000 rtn blank -03bc 20405271 call l2cap_malloc_is_fifo_nearly_full -03bd 247a0000 nrtn blank -03be 6800c79e fetch 1 ,mem_mouse_clear_sensor_data_flag -03bf 205a03dd call p_mouse_clear_sensor_data ,blank -03c0 680246d3 fetch mouse_flag_len ,mem_mouse_flag -03c1 c282bf8a bbit1 mouse_bt_discovery_button_down_flag ,mouse_send_empty_data -03c2 c284bf8a bbit1 mouse_bt_discovery_button_long_down_flag ,mouse_send_empty_data -03c3 20403f97 call mouse_motion -03c4 24740000 nrtn user -03c5 2040039b call p_mouse_le_current_mult_update -03c6 204003b4 call p_mouse_wheel_trigger -03c7 6800cb05 fetch 1 ,mem_mouse_bt_boot_mode -03c8 c00083cc beq 1 ,p_mouse_send_data_boot_mode -03c9 6800cb0c fetch 1 ,mem_mouse_bt_send_first_package_flag -03ca 207a0000 rtn blank -03cb 20203f81 branch mouse_send_data +03ba 20770000 rtn attempt +03bb 6800c1e2 fetch 1 ,mem_app_handshake_flag +03bc 207a0000 rtn blank +03bd 20405271 call l2cap_malloc_is_fifo_nearly_full +03be 247a0000 nrtn blank +03bf 6800c79e fetch 1 ,mem_mouse_clear_sensor_data_flag +03c0 205a03de call p_mouse_clear_sensor_data ,blank +03c1 680246d3 fetch mouse_flag_len ,mem_mouse_flag +03c2 c282bf8a bbit1 mouse_bt_discovery_button_down_flag ,mouse_send_empty_data +03c3 c284bf8a bbit1 mouse_bt_discovery_button_long_down_flag ,mouse_send_empty_data +03c4 20403f97 call mouse_motion +03c5 24740000 nrtn user +03c6 2040039c call p_mouse_le_current_mult_update +03c7 204003b5 call p_mouse_wheel_trigger +03c8 6800cb05 fetch 1 ,mem_mouse_bt_boot_mode +03c9 c00083cd beq 1 ,p_mouse_send_data_boot_mode +03ca 6800cb0c fetch 1 ,mem_mouse_bt_send_first_package_flag +03cb 207a0000 rtn blank +03cc 20203f81 branch mouse_send_data p_mouse_send_data_boot_mode: -03cc 6800c69a fetch 1 ,mem_mouse_key -03cd 6000cb06 store 1 ,mem_mouse_bt_boot_data -03ce 6800c69b fetch 1 ,mem_mouse_x -03cf e0a08000 istore 1 ,contw -03d0 6800c69d fetch 1 ,mem_mouse_y -03d1 e0a08000 istore 1 ,contw -03d2 6801469f fetch 2 ,mem_mouse_z -03d3 e0a10000 istore 2 ,contw -03d4 da200007 arg 7 ,rega -03d5 20404d63 call hid_malloc_tx_buff -03d6 6801424e fetch 2 ,mem_hid_int_remote_cid -03d7 e0a10000 istore 2 ,contw -03d8 580002a1 setarg 0x02a1 -03d9 e0a10000 istore 2 ,contw -03da 6802cb06 fetch 5 ,mem_mouse_bt_boot_data -03db e0a28000 istore 5 ,contw -03dc 20600000 rtn +03cd 6800c69a fetch 1 ,mem_mouse_key +03ce 6000cb06 store 1 ,mem_mouse_bt_boot_data +03cf 6800c69b fetch 1 ,mem_mouse_x +03d0 e0a08000 istore 1 ,contw +03d1 6800c69d fetch 1 ,mem_mouse_y +03d2 e0a08000 istore 1 ,contw +03d3 6801469f fetch 2 ,mem_mouse_z +03d4 e0a10000 istore 2 ,contw +03d5 da200007 arg 7 ,rega +03d6 20404d63 call hid_malloc_tx_buff +03d7 6801424e fetch 2 ,mem_hid_int_remote_cid +03d8 e0a10000 istore 2 ,contw +03d9 580002a1 setarg 0x02a1 +03da e0a10000 istore 2 ,contw +03db 6802cb06 fetch 5 ,mem_mouse_bt_boot_data +03dc e0a28000 istore 5 ,contw +03dd 20600000 rtn p_mouse_clear_sensor_data: -03dd 70479e01 jam 1 ,mem_mouse_clear_sensor_data_flag -03de 20405814 call le_set_config_more_data -03df 202002d3 branch p_mouse_init_sensor_reset +03de 70479e01 jam 1 ,mem_mouse_clear_sensor_data_flag +03df 20405814 call le_set_config_more_data +03e0 202002d3 branch p_mouse_init_sensor_reset p_mouse_idle: -03e0 20407e34 call ui_check_paring_button -03e1 20400428 call p_mouse_dpi_check -03e2 202003e3 branch p_mouse_wheel_check +03e1 20407e34 call ui_check_paring_button +03e2 20400428 call p_mouse_dpi_check +03e3 202003e4 branch p_mouse_wheel_check p_mouse_wheel_check: -03e3 204003e6 call p_mouse_t_wheel_scan -03e4 20403f36 call mouse_wheel_scan -03e5 20203ee3 branch mouse_wheel_check + 3 +03e4 204003e7 call p_mouse_t_wheel_scan +03e5 20403f36 call mouse_wheel_scan +03e6 20203ee3 branch mouse_wheel_check + 3 p_mouse_t_wheel_scan: -03e6 68108078 hfetch 1 ,core_gpio_pu0 -03e7 79207e05 set1 5 ,pdata -03e8 60108078 hstore 1 ,core_gpio_pu0 +03e7 6800c6ea fetch 1 ,mem_whee_ta_data_gpio +03e8 c17f8000 rtneq gpio_disable 03e9 6810807b hfetch 1 ,core_gpio_pu3 03ea 79207e06 set1 6 ,pdata 03eb 6010807b hstore 1 ,core_gpio_pu3 @@ -2050,7 +2050,7 @@ p_in_le_tx_4: 05d7 20405892 call le_fifo_check_nearly_full -05d8 205a03a7 call p_mouse_data_pull ,blank +05d8 205a03a8 call p_mouse_data_pull ,blank 05d9 20205622 branch le_prepare_tx + 4 p_le_check_tx_retransmit_setmd: @@ -35730,7 +35730,7 @@ 8000d 704b6700 jam 0 ,mem_mouse_long_mult_flag 8000e 20402f20 call g24_app_tx_attempt_success 8000f 2040015f call p_g24_txbuf_clear -80010 20200371 branch p_g24_transmit_by_interrupt_enable +80010 20200372 branch p_g24_transmit_by_interrupt_enable z_g24_tx_attemp_data_prep: 80011 70119eff jam 0xff ,mem_24g_common_temp @@ -35788,11 +35788,11 @@ 9001a 204002f6 call p_mouse_load_flash_info_check 9001b df200003 arg 3 ,loopcnt 9001c d8c0473f arg mem_device2_addr ,contr -9001d 20400367 call p_pdata_0xff_check +9001d 20400368 call p_pdata_0xff_check 9001e 243402c2 nbranch p_mouse_le_fast_conn_disable ,user 9001f df200003 arg 3 ,loopcnt 90020 d8c0475c arg mem_device3_addr ,contr -90021 20400367 call p_pdata_0xff_check +90021 20400368 call p_pdata_0xff_check 90022 243402c2 nbranch p_mouse_le_fast_conn_disable ,user 90023 204002c4 call p_mouse_fast_conn_init 90024 20600000 rtn @@ -35963,7 +35963,7 @@ b0028 60014498 store 2 ,mem_le_interval_min + 2 b0029 7047c600 jam le_lpm_enable ,mem_mouse_le_conn_param_reject b002a 70479e00 jam 0 ,mem_mouse_clear_sensor_data_flag -b002b 2040039e call p_mouse_data_init +b002b 2040039f call p_mouse_data_init b002c 20405816 call le_clr_config_more_data b002d 20400301 call p_mouse_store_flash_device_info b002e 202041d9 branch mouse_bb_disconnected @@ -36070,7 +36070,7 @@ d0020 704b6700 jam 0 ,mem_mouse_long_mult_flag d0021 20402f20 call g24_app_tx_attempt_success d0022 2040015f call p_g24_txbuf_clear -d0023 20200371 branch p_g24_transmit_by_interrupt_enable +d0023 20200372 branch p_g24_transmit_by_interrupt_enable z7_g24_store_dongle_addr: d0024 68024c21 fetch 4 ,mem_24g_rxpayload + 2 @@ -36126,6 +36126,6 @@ e0009 704b6b14 jam 0x14 ,mem_mouse_send_secutiry_request_timer z_mouse_le_bb_event_connected_next: -e000a 2040039e call p_mouse_data_init +e000a 2040039f call p_mouse_data_init e000b 202041c3 branch mouse_le_bb_event_connected Index: output/romcode.rom =================================================================== --- /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_G1050/output/romcode.rom (revision 4456) +++ /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_G1050/output/romcode.rom (working copy) @@ -24882,7 +24882,7 @@ 704b6700 20402f20 2040015f -20200371 +20200372 70119eff 6800cc42 6000919f @@ -24927,11 +24927,11 @@ 204002f6 df200003 d8c0473f -20400367 +20400368 243402c2 df200003 d8c0475c -20400367 +20400368 243402c2 204002c4 20600000 @@ -25062,7 +25062,7 @@ 60014498 7047c600 70479e00 -2040039e +2040039f 20405816 20400301 202041d9 @@ -25145,7 +25145,7 @@ 704b6700 20402f20 2040015f -20200371 +20200372 68024c21 20200195 6800cd7f @@ -25182,6 +25182,6 @@ 6800c7a1 243a000a 704b6b14 -2040039e +2040039f 202041c3 -0000be2a +0000de0e Index: program/patch.prog =================================================================== --- /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_G1050/program/patch.prog (revision 4456) +++ /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_G1050/program/patch.prog (working copy) @@ -1384,6 +1384,7 @@ branch p_zcode_entrance p_g24_auto_pair_start: + call p_mouse_discovery_multi_led_blink jam ZCODE_61,mem_zcode_temp_param0 branch p_zcode_entrance @@ -1637,9 +1638,11 @@ branch mouse_wheel_check+3 p_mouse_t_wheel_scan: - hfetch 1,core_gpio_pu0 //wheel gpio need pull up - set1 5,pdata - hstore 1,core_gpio_pu0 +// hfetch 1,core_gpio_pu0 //wheel gpio need pull up +// set1 5,pdata +// hstore 1,core_gpio_pu0 + fetch 1,mem_whee_ta_data_gpio + rtneq GPIO_DISABLE hfetch 1,core_gpio_pu3 set1 6,pdata hstore 1,core_gpio_pu3 Index: sched/mouse.dat =================================================================== --- /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_G1050/sched/mouse.dat (revision 4456) +++ /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_G1050/sched/mouse.dat (working copy) @@ -148,7 +148,7 @@ mem_adc_channel:32 #gpio5 mem_mouse_vdd_full_vol:96 00#1.5v 5a 00#mem_mouse_vdd_empty_vol:34 01#0.9v -6e 00#mem_mouse_vdd_low_vol:4c 01 #1.1v +78 00#mem_mouse_vdd_low_vol:4c 01 #1.2v mem_config_sensor_type:00 @@ -161,7 +161,7 @@ 07 #mem_dpi_button_gpio:05 1b #mem_whee_a_data_gpio:0b 1c #mem_whee_b_data_gpio:07 -05 #mem_whee_ta_data_gpio:ff +17 #mem_whee_ta_data_gpio:05 1e #mem_whee_tb_data_gpio:ff ff #mem_config_bt_button_gpio:18 1f #mem_config_select_device_button_gpio:ff @@ -341,7 +341,7 @@ mem_xip_flash_offset:00 00 00 mem_zcode_head:20 20 00 40 -mem_mouse_comm_gpio:17 +mem_mouse_comm_gpio:05 #yichip sdp