Index: output/flash.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/Standard_MingAo/output/flash.dat (revision 2533) +++ /branch/mouse_project/YJX_Project/YJX_1059/Standard_MingAo/output/flash.dat (working copy) @@ -39,7 +39,7 @@ 20 40 03 -2a +29 20 40 06 @@ -103,11 +103,11 @@ 20 20 02 -fd +fc 58 00 03 -72 +71 60 01 4d @@ -139,7 +139,7 @@ 58 00 03 -e6 +e7 60 01 41 @@ -147,7 +147,7 @@ 58 00 03 -d1 +d2 60 01 41 @@ -435,7 +435,7 @@ 20 40 03 -83 +82 20 40 6a @@ -623,7 +623,7 @@ c0 00 83 -75 +74 68 00 c6 @@ -631,7 +631,7 @@ c2 81 03 -75 +74 20 40 00 @@ -899,7 +899,7 @@ 20 40 02 -ff +fe 68 12 00 @@ -1503,7 +1503,7 @@ 20 40 03 -8f +8e 70 4c 72 @@ -2707,7 +2707,7 @@ 20 40 03 -79 +78 20 40 00 @@ -2787,11 +2787,11 @@ 20 20 03 -6e +6d 20 40 03 -4c +4b 68 00 cb @@ -2843,7 +2843,7 @@ 20 20 03 -2a +29 68 00 cc @@ -2867,7 +2867,7 @@ 20 40 03 -2a +29 20 40 40 @@ -2883,7 +2883,7 @@ c0 18 82 -f8 +f7 20 40 40 @@ -2899,7 +2899,7 @@ 20 40 03 -95 +94 68 00 c6 @@ -2911,11 +2911,11 @@ c0 2a 02 -e6 +e5 c0 6c 02 -e9 +e8 20 20 40 @@ -2960,10 +2960,6 @@ 40 64 13 -20 -00 -2e -e0 1a 60 a6 @@ -3047,7 +3043,7 @@ 20 40 03 -95 +94 68 00 c6 @@ -3139,7 +3135,7 @@ 20 40 03 -5b +5a 20 40 44 @@ -3159,7 +3155,7 @@ 20 22 83 -4c +4b 60 09 47 @@ -3191,27 +3187,27 @@ 20 40 03 -5b +5a 20 40 03 -2c +2b 20 40 03 -43 +42 20 40 03 -38 +37 20 40 03 -2f +2e 20 40 03 -01 +00 d8 40 00 @@ -3235,15 +3231,15 @@ 20 40 03 -38 +37 20 40 03 -2f +2e 20 40 03 -53 +52 70 42 12 @@ -3295,7 +3291,7 @@ c2 80 03 -2f +2e 20 60 00 @@ -3371,11 +3367,11 @@ 20 40 03 -5b +5a 20 40 03 -43 +42 20 20 65 @@ -3383,11 +3379,11 @@ 20 40 03 -49 +48 20 40 03 -65 +64 20 40 43 @@ -3415,7 +3411,7 @@ 20 40 03 -01 +00 20 40 69 @@ -3447,7 +3443,7 @@ 20 20 03 -54 +53 70 4b 75 @@ -3483,7 +3479,7 @@ 20 40 03 -5b +5a d8 40 00 @@ -3527,7 +3523,7 @@ 20 40 03 -1c +1b 20 20 01 @@ -3571,7 +3567,7 @@ 20 40 03 -81 +80 d8 c0 19 @@ -3579,7 +3575,7 @@ 20 40 03 -81 +80 d8 c0 1a @@ -3587,7 +3583,7 @@ 20 40 03 -81 +80 d8 c0 1b @@ -3611,7 +3607,7 @@ 20 40 03 -81 +80 d8 a0 19 @@ -3619,7 +3615,7 @@ 20 40 03 -81 +80 d8 a0 1a @@ -3627,7 +3623,7 @@ 20 40 03 -81 +80 d8 a0 1b @@ -3635,7 +3631,7 @@ 20 20 03 -81 +80 70 41 72 @@ -3675,7 +3671,7 @@ 20 40 03 -2a +29 da 60 4b @@ -3685,6 +3681,10 @@ 02 de 20 +40 +2b +fa +20 20 03 99 @@ -3763,11 +3763,11 @@ 20 40 03 -8c +8b 20 40 03 -8f +8e 20 40 03 @@ -3909,17 +3909,21 @@ fe 01 20 -20 +40 02 cb 20 +20 +2b +fa +20 40 7e 34 20 40 03 -d4 +d5 20 20 3e @@ -3951,7 +3955,7 @@ 20 20 83 -e4 +e5 20 40 05 @@ -4003,7 +4007,7 @@ c0 0a 03 -f0 +f1 c0 0a 84 @@ -4038,10 +4042,6 @@ 7d 20 40 -03 -cf -20 -40 41 c3 58 @@ -4067,7 +4067,7 @@ 24 42 83 -5d +5c 20 40 34 @@ -4155,7 +4155,7 @@ 20 40 03 -75 +74 20 40 03 @@ -4427,7 +4427,7 @@ 20 20 03 -61 +60 da 60 4b @@ -6167,7 +6167,7 @@ 20 20 03 -1c +1b 20 40 58 @@ -6695,7 +6695,7 @@ 20 40 03 -5b +5a 68 01 cb @@ -6731,7 +6731,7 @@ 20 40 03 -2a +29 58 00 1f @@ -7212,8 +7212,8 @@ 20 07 05 -bf -c4 +2b +46 aa 55 08 @@ -8139,7 +8139,7 @@ 00 bc 4b -04 +05 00 aa 55 @@ -8377,7 +8377,7 @@ 20 40 03 -1c +1b 20 20 41 @@ -8665,7 +8665,7 @@ 20 40 03 -1c +1b 68 00 cb @@ -8717,7 +8717,7 @@ 20 40 03 -1c +1b 20 40 3e @@ -8729,7 +8729,7 @@ 20 40 03 -53 +52 68 10 80 @@ -9081,7 +9081,7 @@ 20 40 03 -0f +0e 68 00 c7 @@ -9105,11 +9105,11 @@ 24 22 83 -5d +5c 20 20 03 -5f +5e 20 60 00 @@ -9329,7 +9329,7 @@ 20 20 03 -1c +1b 68 00 cb @@ -9685,7 +9685,7 @@ 20 20 03 -75 +74 68 02 4c @@ -9853,7 +9853,7 @@ 20 40 03 -4c +4b 68 00 cb @@ -9917,7 +9917,7 @@ 20 20 03 -1c +1b 58 00 00 @@ -9981,7 +9981,7 @@ 20 20 03 -75 +74 68 02 4c @@ -10353,7 +10353,7 @@ 20 40 03 -5d +5c 20 40 34 @@ -11338,5 +11338,5 @@ 55 00 00 -36 -9a +3f +06 Index: output/program.lis =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/Standard_MingAo/output/program.lis (revision 2533) +++ /branch/mouse_project/YJX_Project/YJX_1059/Standard_MingAo/output/program.lis (working copy) @@ -14,7 +14,7 @@ 0005 6800c685 fetch 1 ,mem_ui_button_timeout 0006 6000c6da store 1 ,mem_combination_ui_button_count 0007 2040048a call p_mouse_bt_discovery_button_up_init -0008 2040032a call p_mouse_spi_init +0008 20400329 call p_mouse_spi_init 0009 204006a3 call p_drawing_optima_init 000a 20400019 call p_mouse_cb_fuction 000b 2040002a call p_mouse_wakeup_from_power @@ -30,10 +30,10 @@ 0015 58000000 setarg 0 0016 60014154 store 2 ,mem_lpm_interval 0017 204068a2 call load_adc_init -0018 202002fd branch p_mouse_setting_config +0018 202002fc branch p_mouse_setting_config p_mouse_cb_fuction: -0019 58000372 setarg p_mouse_g24_package_data +0019 58000371 setarg p_mouse_g24_package_data 001a 60014d77 store 2 ,mem_cb_24g_data 001b 5800039e setarg p_mouse_le 001c 600141ef store 2 ,mem_cb_le_process @@ -41,9 +41,9 @@ 001e 600141f9 store 2 ,mem_cb_att_write 001f 580002a2 setarg p_mouse_before_lpm 0020 600141ed store 2 ,mem_cb_before_lpm -0021 580003e6 setarg p_mouse_priority_bb_event +0021 580003e7 setarg p_mouse_priority_bb_event 0022 600141f5 store 2 ,mem_cb_bb_event_process -0023 580003d1 setarg p_mouse_idle +0023 580003d2 setarg p_mouse_idle 0024 600141f3 store 2 ,mem_cb_idle_process 0025 58000417 setarg p_mouse_before_hibernate 0026 600141eb store 2 ,mem_cb_before_hibernate @@ -129,7 +129,7 @@ 0068 d8a009ae arg mem_sp_state ,contw 0069 df20000c arg 12 ,loopcnt 006a 20407ed4 call clear_mem -006b 20400383 call p_mouse_le_txbuff_load +006b 20400382 call p_mouse_le_txbuff_load 006c 20406a03 call rfcomm_init 006d 20405cf6 call init_lmp 006e 2455ac65 ncall lpm_disable_exen_output ,wake @@ -190,9 +190,9 @@ 0097 20400619 call power_ctrl_start 0098 204000a6 call g24_long_sleep_shorter_param_update 0099 6800cb26 fetch 1 ,mem_mouse_multi_led_state -009a c0008375 beq on ,p_g24_transmit_by_interrupt_enable +009a c0008374 beq on ,p_g24_transmit_by_interrupt_enable 009b 6800c69a fetch 1 ,mem_mouse_key -009c c2810375 bbit1 2 ,p_g24_transmit_by_interrupt_enable +009c c2810374 bbit1 2 ,p_g24_transmit_by_interrupt_enable p_g24_short_sleep: 009d 204000d4 call p_g24_lpm_wait @@ -289,7 +289,7 @@ p_mouse_setgpio_hibernate: 00de 20403ebf call mouse_lpm_before_common -00df 204002ff call p_flash_ncs_disable +00df 204002fe call p_flash_ncs_disable 00e0 68120070 hfetch 4 ,core_gpio_oe0 00e1 681a0078 hfetcht 4 ,core_gpio_pu0 00e2 98418400 ior temp ,temp @@ -494,7 +494,7 @@ 0175 20207fe7 branch enable_user p_g24_accumulate_mouse_data: -0176 2040038f call p_mouse_data_xy_release +0176 2040038e call p_mouse_data_xy_release 0177 704c7200 jam 0 ,mem_24g_abort_pac 0178 1a20fe01 add rega ,1 ,pdata 0179 6000cc46 store 1 ,mem_24g_datalen @@ -883,7 +883,7 @@ p_mouse_before_lpm: 02a2 c6130000 rtnmark1 mark_24g -02a3 20400379 call p_mouse_le_txbuff_save +02a3 20400378 call p_mouse_le_txbuff_save 02a4 204000dc call p_mouse_setgpio_lpm 02a5 6800c040 fetch 1 ,mem_context 02a6 c30002a9 bbit0 state_inconn ,p_clear_wake @@ -913,10 +913,10 @@ 02b4 6800c241 fetch 1 ,mem_power_on_flag 02b5 c28102b8 bbit1 2 ,p_mouse_wakeup_from_hibernate 02b6 704b76ff jam latest_mode_null ,mem_mouse_latest_mode -02b7 2020036e branch p_mouse_start_24g_pair +02b7 2020036d branch p_mouse_start_24g_pair p_mouse_wakeup_from_hibernate: -02b8 2040034c call p_mouse_load_flash_device_info +02b8 2040034b call p_mouse_load_flash_device_info 02b9 6800cb76 fetch 1 ,mem_mouse_latest_mode 02ba c00082be beq latest_mode_bt ,p_mouse_check_reconn_target 02bb c00101eb beq latest_mode_24g ,p_g24_start_24g_mode @@ -933,7 +933,7 @@ 02c4 2020044d branch p_mouse_check_fast_conn_adv_start p_device_wake_from_lpm: -02c5 2020032a branch p_mouse_spi_init +02c5 20200329 branch p_mouse_spi_init p_mouse_tx_power_init: 02c6 6800ccfd fetch 1 ,mem_tx_power_temp @@ -945,23 +945,23 @@ 02ca 20200679 branch p_zcode_entrance p_mouse_init_sunt: -02cb 2040032a call p_mouse_spi_init +02cb 20400329 call p_mouse_spi_init 02cc 204040c0 call mouse_spi_sdio_gpio_pollup p_mouse_init_sensor: 02cd 204040d9 call mouse_read_sensor_id 02ce c01802d3 beq p32xx_id1 ,p_mouse_init_p32xx_id2_judge -02cf c01882f8 beq p3065_id1 ,p_mouse_p3065_init_param +02cf c01882f7 beq p3065_id1 ,p_mouse_p3065_init_param 02d0 204040d1 call mouse_twspi_reset 02d1 200003e8 nop 1000 02d2 202002cd branch p_mouse_init_sensor p_mouse_init_p32xx_id2_judge: -02d3 20400395 call p_mouse_sensor_poweron +02d3 20400394 call p_mouse_sensor_poweron 02d4 6800c6de fetch 1 ,mem_sensor_id2 02d5 c02d02d9 beq p_mx8650 ,p_mouse_mx8650_init_param -02d6 c02a02e6 beq pka8_id2 ,p_mouse_ka8_init_param -02d7 c06c02e9 beq p8009_id2 ,p_mouse_8009_init_param +02d6 c02a02e5 beq pka8_id2 ,p_mouse_ka8_init_param +02d7 c06c02e8 beq p8009_id2 ,p_mouse_8009_init_param 02d8 202040e0 branch mouse_init_p32xx_id2_judge p_mouse_mx8650_init_param: @@ -977,253 +977,253 @@ 02e0 98467c00 isub temp ,null 02e1 20628000 rtn zero 02e2 20406413 call twspi_write -02e3 20002ee0 nop 12000 -02e4 1a60a602 increase 2 ,regc -02e5 202002de branch p_sensor_wr_seq +02e3 1a60a602 increase 2 ,regc +02e4 202002de branch p_sensor_wr_seq p_mouse_ka8_init_param: -02e6 7046e002 jam ka8 ,mem_config_sensor_type -02e7 da604b94 arg mem_sensor_ka8_init ,regc -02e8 202002de branch p_sensor_wr_seq +02e5 7046e002 jam ka8 ,mem_config_sensor_type +02e6 da604b94 arg mem_sensor_ka8_init ,regc +02e7 202002de branch p_sensor_wr_seq p_mouse_8009_init_param: -02e9 58000016 setarg 0x16 -02ea 20406414 call twspi_read -02eb 1fe67cbd sub pdata ,0xbd ,null -02ec 242282cd nbranch p_mouse_init_sensor ,zero -02ed 58000019 setarg 0x19 -02ee 20406414 call twspi_read -02ef 1fe67c55 sub pdata ,0x55 ,null -02f0 242282cd nbranch p_mouse_init_sensor ,zero -02f1 5800001b setarg 0x1b -02f2 20406414 call twspi_read -02f3 1fe67c1d sub pdata ,0x1d ,null -02f4 242282cd nbranch p_mouse_init_sensor ,zero -02f5 7046e008 jam p8009 ,mem_config_sensor_type -02f6 da604ba2 arg mem_sensor_8009_init ,regc -02f7 202002de branch p_sensor_wr_seq +02e8 58000016 setarg 0x16 +02e9 20406414 call twspi_read +02ea 1fe67cbd sub pdata ,0xbd ,null +02eb 242282cd nbranch p_mouse_init_sensor ,zero +02ec 58000019 setarg 0x19 +02ed 20406414 call twspi_read +02ee 1fe67c55 sub pdata ,0x55 ,null +02ef 242282cd nbranch p_mouse_init_sensor ,zero +02f0 5800001b setarg 0x1b +02f1 20406414 call twspi_read +02f2 1fe67c1d sub pdata ,0x1d ,null +02f3 242282cd nbranch p_mouse_init_sensor ,zero +02f4 7046e008 jam p8009 ,mem_config_sensor_type +02f5 da604ba2 arg mem_sensor_8009_init ,regc +02f6 202002de branch p_sensor_wr_seq p_mouse_p3065_init_param: -02f8 20400395 call p_mouse_sensor_poweron -02f9 6800c6de fetch 1 ,mem_sensor_id2 -02fa c03840e8 beq p3065_xy_id2 ,mouse_p3065xy_init_param -02fb 7046e001 jam p3065 ,mem_config_sensor_type -02fc 20600000 rtn +02f7 20400394 call p_mouse_sensor_poweron +02f8 6800c6de fetch 1 ,mem_sensor_id2 +02f9 c03840e8 beq p3065_xy_id2 ,mouse_p3065xy_init_param +02fa 7046e001 jam p3065 ,mem_config_sensor_type +02fb 20600000 rtn p_mouse_setting_config: -02fd 7011c680 jam zcode_80 ,mem_zcode_temp_param0 -02fe 20200679 branch p_zcode_entrance +02fc 7011c680 jam zcode_80 ,mem_zcode_temp_param0 +02fd 20200679 branch p_zcode_entrance p_flash_ncs_disable: -02ff 6808cb45 fetcht 1 ,mem_flash_ncs_gpio -0300 20206825 branch gpio_out_inactive +02fe 6808cb45 fetcht 1 ,mem_flash_ncs_gpio +02ff 20206825 branch gpio_out_inactive p_spid_init_flash: -0301 70808640 jam 0x40 ,core_spid_ctrl -0302 70808700 jam 0x0 ,core_spid_delay -0303 68108081 hfetch 1 ,core_gpio_sel1 -0304 793ffe00 set0 0 ,pdata -0305 793ffe01 set0 1 ,pdata -0306 79207e03 set1 3 ,pdata -0307 793ffe04 set0 4 ,pdata -0308 60108081 hstore 1 ,core_gpio_sel1 -0309 58000000 setarg 0 -030a 600201f5 store 4 ,mem_spid_tbuf -030b 6810807f hfetch 1 ,core_gpio_pd3 -030c 793ffe00 set0 0 ,pdata -030d 6010807f hstore 1 ,core_gpio_pd3 -030e 20600000 rtn +0300 70808640 jam 0x40 ,core_spid_ctrl +0301 70808700 jam 0x0 ,core_spid_delay +0302 68108081 hfetch 1 ,core_gpio_sel1 +0303 793ffe00 set0 0 ,pdata +0304 793ffe01 set0 1 ,pdata +0305 79207e03 set1 3 ,pdata +0306 793ffe04 set0 4 ,pdata +0307 60108081 hstore 1 ,core_gpio_sel1 +0308 58000000 setarg 0 +0309 600201f5 store 4 ,mem_spid_tbuf +030a 6810807f hfetch 1 ,core_gpio_pd3 +030b 793ffe00 set0 0 ,pdata +030c 6010807f hstore 1 ,core_gpio_pd3 +030d 20600000 rtn p_mouse_load_flash_info_check: -030f 2040035b call p_flash_release_deep_power_down -0310 20404423 call mouse_load_flash_flag -0311 68014778 fetch 2 ,mem_store_flag -0312 d840aa55 arg eeprom_init_flag ,temp -0313 98467c00 isub temp ,null -0314 2022834c branch p_mouse_load_flash_device_info ,zero -0315 60094778 storet 2 ,mem_store_flag -0316 2040441c call mouse_ble_init_address -0317 6800c6e1 fetch 1 ,mem_config_sensor_motion -0318 6000c77a store 1 ,mem_mouse_dpi -0319 68024b4c fetch 4 ,mem_mouse_24g_addr_init -031a 6002477b store 4 ,mem_mouse_24g_addr -031b 60024c6e store 4 ,mem_24g_addr +030e 2040035a call p_flash_release_deep_power_down +030f 20404423 call mouse_load_flash_flag +0310 68014778 fetch 2 ,mem_store_flag +0311 d840aa55 arg eeprom_init_flag ,temp +0312 98467c00 isub temp ,null +0313 2022834b branch p_mouse_load_flash_device_info ,zero +0314 60094778 storet 2 ,mem_store_flag +0315 2040441c call mouse_ble_init_address +0316 6800c6e1 fetch 1 ,mem_config_sensor_motion +0317 6000c77a store 1 ,mem_mouse_dpi +0318 68024b4c fetch 4 ,mem_mouse_24g_addr_init +0319 6002477b store 4 ,mem_mouse_24g_addr +031a 60024c6e store 4 ,mem_24g_addr p_mouse_store_flash_device_info: -031c 2040035b call p_flash_release_deep_power_down -031d 2040032c call p_flash_erase_sector -031e 20400343 call p_mouse_information_flash_parameters -031f 20400338 call p_spid_write_flash -0320 2040032f call p_wait_flash_done +031b 2040035a call p_flash_release_deep_power_down +031c 2040032b call p_flash_erase_sector +031d 20400342 call p_mouse_information_flash_parameters +031e 20400337 call p_spid_write_flash +031f 2040032e call p_wait_flash_done p_mouse_store_flash_user_data: -0321 20400301 call p_spid_init_flash -0322 d8400007 arg 7 ,temp -0323 da204b70 arg mem_mouse_flash_start_temp ,rega -0324 da40005f arg mouse_user_data_offect ,regb -0325 6801c700 fetch 3 ,mem_flash_base -0326 9a40fe00 iadd regb ,pdata -0327 20400338 call p_spid_write_flash -0328 2040032f call p_wait_flash_done -0329 20400353 call p_flash_deep_power_down +0320 20400300 call p_spid_init_flash +0321 d8400007 arg 7 ,temp +0322 da204b70 arg mem_mouse_flash_start_temp ,rega +0323 da40005f arg mouse_user_data_offect ,regb +0324 6801c700 fetch 3 ,mem_flash_base +0325 9a40fe00 iadd regb ,pdata +0326 20400337 call p_spid_write_flash +0327 2040032e call p_wait_flash_done +0328 20400352 call p_flash_deep_power_down p_mouse_spi_init: -032a 70421276 jam 0x76 ,mem_spi_init_clk -032b 20203d36 branch mouse_spi_init +0329 70421276 jam 0x76 ,mem_spi_init_clk +032a 20203d36 branch mouse_spi_init p_flash_erase_sector: -032c 6801c700 fetch 3 ,mem_flash_base -032d 6001c232 store 3 ,mem_spi_write_addr -032e 2040652a call flash_erase_sector + 2 +032b 6801c700 fetch 3 ,mem_flash_base +032c 6001c232 store 3 ,mem_spi_write_addr +032d 2040652a call flash_erase_sector + 2 p_wait_flash_done: -032f 580186a0 setarg 100000 -0330 20402a8f call sleep -0331 2040650b call spid_unlock_flash -0332 580001fa setarg mem_spid_rbuf -0333 6011008c hstore 2 ,core_spid_rxaddr -0334 58000005 setarg flash_read_satus -0335 204064f3 call spid_read_reg -0336 c280032f bbit1 flash_status_wip ,p_wait_flash_done -0337 20600000 rtn +032e 580186a0 setarg 100000 +032f 20402a8f call sleep +0330 2040650b call spid_unlock_flash +0331 580001fa setarg mem_spid_rbuf +0332 6011008c hstore 2 ,core_spid_rxaddr +0333 58000005 setarg flash_read_satus +0334 204064f3 call spid_read_reg +0335 c280032e bbit1 flash_status_wip ,p_wait_flash_done +0336 20600000 rtn p_spid_write_flash: -0338 1fe22600 copy pdata ,regc -0339 1a227e00 copy rega ,pdata -033a 1fe0fffc increase -4 ,pdata -033b 1fe22400 copy pdata ,regb -033c ea420000 ifetch 4 ,regb -033d 60024b47 store 4 ,mem_write_flash_head_temp -033e 1a627e00 copy regc ,pdata -033f 20406552 call spid_write_flash -0340 68024b47 fetch 4 ,mem_write_flash_head_temp -0341 e2420000 istore 4 ,regb -0342 20600000 rtn +0337 1fe22600 copy pdata ,regc +0338 1a227e00 copy rega ,pdata +0339 1fe0fffc increase -4 ,pdata +033a 1fe22400 copy pdata ,regb +033b ea420000 ifetch 4 ,regb +033c 60024b47 store 4 ,mem_write_flash_head_temp +033d 1a627e00 copy regc ,pdata +033e 20406552 call spid_write_flash +033f 68024b47 fetch 4 ,mem_write_flash_head_temp +0340 e2420000 istore 4 ,regb +0341 20600000 rtn p_mouse_information_flash_parameters: -0343 5800477f setarg mem_mouse_information_end -0344 d8404720 arg mem_mouse_information_start ,temp -0345 98460400 isub temp ,temp -0346 6801c700 fetch 3 ,mem_flash_base -0347 da204720 arg mem_mouse_information_start ,rega -0348 20600000 rtn +0342 5800477f setarg mem_mouse_information_end +0343 d8404720 arg mem_mouse_information_start ,temp +0344 98460400 isub temp ,temp +0345 6801c700 fetch 3 ,mem_flash_base +0346 da204720 arg mem_mouse_information_start ,rega +0347 20600000 rtn p_mouse_read_flash: -0349 2040035b call p_flash_release_deep_power_down -034a 20400343 call p_mouse_information_flash_parameters -034b 20206562 branch spid_read_flash +0348 2040035a call p_flash_release_deep_power_down +0349 20400342 call p_mouse_information_flash_parameters +034a 20206562 branch spid_read_flash p_mouse_load_flash_device_info: -034c 20400349 call p_mouse_read_flash -034d 20400365 call p_mouse_load_flash_user_data -034e 20404364 call mouse_select_btdevice -034f 2040431a call mouse_select_reconn_device -0350 6802477b fetch 4 ,mem_mouse_24g_addr -0351 60024c6e store 4 ,mem_24g_addr -0352 20600000 rtn +034b 20400348 call p_mouse_read_flash +034c 20400364 call p_mouse_load_flash_user_data +034d 20404364 call mouse_select_btdevice +034e 2040431a call mouse_select_reconn_device +034f 6802477b fetch 4 ,mem_mouse_24g_addr +0350 60024c6e store 4 ,mem_24g_addr +0351 20600000 rtn p_flash_deep_power_down: -0353 700aa2b9 jam flash_command_deep_power_down ,mem_temp +0352 700aa2b9 jam flash_command_deep_power_down ,mem_temp p_spid_write_flash_cmd: -0354 20400301 call p_spid_init_flash -0355 204069ac call delay_nop100 -0356 2040650b call spid_unlock_flash -0357 da204b47 arg mem_write_flash_head_temp ,rega -0358 68088aa2 fetcht 1 ,mem_temp -0359 20406556 call spid_write_flash_common -035a 202069ac branch delay_nop100 +0353 20400300 call p_spid_init_flash +0354 204069ac call delay_nop100 +0355 2040650b call spid_unlock_flash +0356 da204b47 arg mem_write_flash_head_temp ,rega +0357 68088aa2 fetcht 1 ,mem_temp +0358 20406556 call spid_write_flash_common +0359 202069ac branch delay_nop100 p_flash_release_deep_power_down: -035b 700aa2ab jam flash_command_release_deep_power_down ,mem_temp -035c 20200354 branch p_spid_write_flash_cmd +035a 700aa2ab jam flash_command_release_deep_power_down ,mem_temp +035b 20200353 branch p_spid_write_flash_cmd p_mouse_fast_conn_disable: -035d 704b755a jam 0x5a ,mem_mouse_fast_conn_flag -035e 20600000 rtn +035c 704b755a jam 0x5a ,mem_mouse_fast_conn_flag +035d 20600000 rtn p_mouse_fast_conn_le_switch_adv: -035f 704b6901 jam 1 ,mem_le_switch_adv_timer -0360 704b6801 jam 1 ,mem_le_switch_adv_flag +035e 704b6901 jam 1 ,mem_le_switch_adv_timer +035f 704b6801 jam 1 ,mem_le_switch_adv_flag p_mouse_fast_conn_init: -0361 704b75ff jam 0xff ,mem_mouse_fast_conn_flag -0362 68034d8b fetch 6 ,mem_24g_allpowerful_addr -0363 600344a0 store 6 ,mem_le_lap -0364 20600000 rtn +0360 704b75ff jam 0xff ,mem_mouse_fast_conn_flag +0361 68034d8b fetch 6 ,mem_24g_allpowerful_addr +0362 600344a0 store 6 ,mem_le_lap +0363 20600000 rtn p_mouse_load_flash_user_data: -0365 2040035b call p_flash_release_deep_power_down -0366 d8400007 arg 7 ,temp -0367 da204b70 arg mem_mouse_flash_start_temp ,rega -0368 da40005f arg mouse_user_data_offect ,regb -0369 6801c700 fetch 3 ,mem_flash_base -036a 9a40fe00 iadd regb ,pdata -036b 20206562 branch spid_read_flash +0364 2040035a call p_flash_release_deep_power_down +0365 d8400007 arg 7 ,temp +0366 da204b70 arg mem_mouse_flash_start_temp ,rega +0367 da40005f arg mouse_user_data_offect ,regb +0368 6801c700 fetch 3 ,mem_flash_base +0369 9a40fe00 iadd regb ,pdata +036a 20206562 branch spid_read_flash p_mouse_start_24g_mode: -036c 6800c241 fetch 1 ,mem_power_on_flag -036d c28101eb bbit1 2 ,p_g24_start_24g_mode +036b 6800c241 fetch 1 ,mem_power_on_flag +036c c28101eb bbit1 2 ,p_g24_start_24g_mode p_mouse_start_24g_pair: -036e 68024b4c fetch 4 ,mem_mouse_24g_addr_init -036f 60024c6e store 4 ,mem_24g_addr -0370 2040031c call p_mouse_store_flash_device_info -0371 202001ed branch p_g24_auto_pair_start +036d 68024b4c fetch 4 ,mem_mouse_24g_addr_init +036e 60024c6e store 4 ,mem_24g_addr +036f 2040031b call p_mouse_store_flash_device_info +0370 202001ed branch p_g24_auto_pair_start p_mouse_g24_package_data: -0372 20404401 call mouse_g24_package_data -0373 6801469f fetch 2 ,mem_mouse_z -0374 207a0000 rtn blank +0371 20404401 call mouse_g24_package_data +0372 6801469f fetch 2 ,mem_mouse_z +0373 207a0000 rtn blank p_g24_transmit_by_interrupt_enable: -0375 704d8601 jam g24_tx_timer_int_enable ,mem_24g_transmit_by_interrupt -0376 58000000 setarg 0 -0377 60014d87 store 2 ,mem_24g_transmit_by_interrupt_exit_count -0378 20600000 rtn +0374 704d8601 jam g24_tx_timer_int_enable ,mem_24g_transmit_by_interrupt +0375 58000000 setarg 0 +0376 60014d87 store 2 ,mem_24g_transmit_by_interrupt_exit_count +0377 20600000 rtn p_mouse_le_txbuff_save: -0379 d8c01800 arg mem_le_tx_buffer0 ,contr -037a d8a0480a arg mem_le_tx_buffer0_omemalloc ,contw -037b 20400381 call p_mouse_le_txbuff_copy -037c d8c01900 arg mem_le_tx_buffer1 ,contr -037d 20400381 call p_mouse_le_txbuff_copy -037e d8c01a00 arg mem_le_tx_buffer2 ,contr -037f 20400381 call p_mouse_le_txbuff_copy -0380 d8c01b00 arg mem_le_tx_buffer3 ,contr +0378 d8c01800 arg mem_le_tx_buffer0 ,contr +0379 d8a0480a arg mem_le_tx_buffer0_omemalloc ,contw +037a 20400380 call p_mouse_le_txbuff_copy +037b d8c01900 arg mem_le_tx_buffer1 ,contr +037c 20400380 call p_mouse_le_txbuff_copy +037d d8c01a00 arg mem_le_tx_buffer2 ,contr +037e 20400380 call p_mouse_le_txbuff_copy +037f d8c01b00 arg mem_le_tx_buffer3 ,contr p_mouse_le_txbuff_copy: -0381 df20001b arg 27 ,loopcnt -0382 20207f01 branch memcpy +0380 df20001b arg 27 ,loopcnt +0381 20207f01 branch memcpy p_mouse_le_txbuff_load: -0383 d8c0480a arg mem_le_tx_buffer0_omemalloc ,contr -0384 d8a01800 arg mem_le_tx_buffer0 ,contw -0385 20400381 call p_mouse_le_txbuff_copy -0386 d8a01900 arg mem_le_tx_buffer1 ,contw -0387 20400381 call p_mouse_le_txbuff_copy -0388 d8a01a00 arg mem_le_tx_buffer2 ,contw -0389 20400381 call p_mouse_le_txbuff_copy -038a d8a01b00 arg mem_le_tx_buffer3 ,contw -038b 20200381 branch p_mouse_le_txbuff_copy +0382 d8c0480a arg mem_le_tx_buffer0_omemalloc ,contr +0383 d8a01800 arg mem_le_tx_buffer0 ,contw +0384 20400380 call p_mouse_le_txbuff_copy +0385 d8a01900 arg mem_le_tx_buffer1 ,contw +0386 20400380 call p_mouse_le_txbuff_copy +0387 d8a01a00 arg mem_le_tx_buffer2 ,contw +0388 20400380 call p_mouse_le_txbuff_copy +0389 d8a01b00 arg mem_le_tx_buffer3 ,contw +038a 20200380 branch p_mouse_le_txbuff_copy p_mouse_le_current_mult_update: -038c 70417200 jam 0 ,mem_lpm_mult -038d 704b431e jam 30 ,mem_mouse_le_current_mult_timer -038e 20600000 rtn +038b 70417200 jam 0 ,mem_lpm_mult +038c 704b431e jam 30 ,mem_mouse_le_current_mult_timer +038d 20600000 rtn p_mouse_data_xy_release: -038f 6800cb42 fetch 1 ,mem_mouse_long_mult_flag -0390 c1808000 rtnne 1 -0391 58000000 setarg 0 -0392 6000cb42 store 1 ,mem_mouse_long_mult_flag -0393 6002469b store 4 ,mem_mouse_x -0394 202003cf branch p_mouse_init_sensor_reset +038e 6800cb42 fetch 1 ,mem_mouse_long_mult_flag +038f c1808000 rtnne 1 +0390 58000000 setarg 0 +0391 6000cb42 store 1 ,mem_mouse_long_mult_flag +0392 6002469b store 4 ,mem_mouse_x +0393 202003cf branch p_mouse_init_sensor_reset p_mouse_sensor_poweron: -0395 2040032a call p_mouse_spi_init -0396 da604bb2 arg mem_sensor_poweron_init ,regc -0397 204002de call p_sensor_wr_seq +0394 20400329 call p_mouse_spi_init +0395 da604bb2 arg mem_sensor_poweron_init ,regc +0396 204002de call p_sensor_wr_seq +0397 20402bfa call delays_5ms 0398 20200399 branch p_mouse_dpi_config p_mouse_dpi_config: @@ -1251,8 +1251,8 @@ 03a8 c282c179 bbit1 mouse_bt_discovery_button_down_flag ,mouse_le_send_empty_packet 03a9 20403f97 call mouse_motion 03aa 24740000 nrtn user -03ab 2040038c call p_mouse_le_current_mult_update -03ac 2040038f call p_mouse_data_xy_release +03ab 2040038b call p_mouse_le_current_mult_update +03ac 2040038e call p_mouse_data_xy_release 03ad 204003c8 call p_mouse_wheel_trigger p_mouse_data_push: @@ -1304,58 +1304,58 @@ p_mouse_init_sensor_reset: 03cf 704afe01 jam 1 ,mem_mouse_init_sensor_reset_flag -03d0 202002cb branch p_mouse_init_sunt +03d0 204002cb call p_mouse_init_sunt +03d1 20202bfa branch delays_5ms p_mouse_idle: -03d1 20407e34 call ui_check_paring_button -03d2 204003d4 call p_mouse_dpi_check -03d3 20203ee0 branch mouse_wheel_check +03d2 20407e34 call ui_check_paring_button +03d3 204003d5 call p_mouse_dpi_check +03d4 20203ee0 branch mouse_wheel_check p_mouse_dpi_check: -03d4 6808cb79 fetcht 1 ,mem_mouse_common_gpio -03d5 20400509 call p_gpio_set_input_pu -03d6 6808c6e7 fetcht 1 ,mem_dpi_button_gpio -03d7 2040050e call p_gpio_set_input_pd -03d8 6808c6e7 fetcht 1 ,mem_dpi_button_gpio -03d9 2040681d call gpio_get_bit -03da 202083e4 branch p_mouse_dpi_up ,true -03db 20400509 call p_gpio_set_input_pu +03d5 6808cb79 fetcht 1 ,mem_mouse_common_gpio +03d6 20400509 call p_gpio_set_input_pu +03d7 6808c6e7 fetcht 1 ,mem_dpi_button_gpio +03d8 2040050e call p_gpio_set_input_pd +03d9 6808c6e7 fetcht 1 ,mem_dpi_button_gpio +03da 2040681d call gpio_get_bit +03db 202083e5 branch p_mouse_dpi_up ,true +03dc 20400509 call p_gpio_set_input_pu p_mouse_dpi_down: -03dc 6800c6b6 fetch 1 ,mem_mouse_dpi_button_state -03dd c1000000 rtneq dpi_button_state_down -03de 7046b600 jam dpi_button_state_down ,mem_mouse_dpi_button_state -03df 6800c77a fetch 1 ,mem_mouse_dpi -03e0 1fe0fe01 increase 1 ,pdata -03e1 1fe17e03 and pdata ,0x03 ,pdata -03e2 6000c77a store 1 ,mem_mouse_dpi -03e3 20203d7e branch mouse_seting_dpi +03dd 6800c6b6 fetch 1 ,mem_mouse_dpi_button_state +03de c1000000 rtneq dpi_button_state_down +03df 7046b600 jam dpi_button_state_down ,mem_mouse_dpi_button_state +03e0 6800c77a fetch 1 ,mem_mouse_dpi +03e1 1fe0fe01 increase 1 ,pdata +03e2 1fe17e03 and pdata ,0x03 ,pdata +03e3 6000c77a store 1 ,mem_mouse_dpi +03e4 20203d7e branch mouse_seting_dpi p_mouse_dpi_up: -03e4 20400509 call p_gpio_set_input_pu -03e5 20203d62 branch mouse_dpi_up +03e5 20400509 call p_gpio_set_input_pu +03e6 20203d62 branch mouse_dpi_up p_mouse_priority_bb_event: -03e6 1a627e00 copy regc ,pdata -03e7 c00a03f0 beq bt_evt_le_connected ,p_mouse_le_bb_event_connected -03e8 c00a8404 beq bt_evt_le_disconnected ,p_mouse_le_bb_disconnected -03e9 c0148407 beq bt_evt_le_enc_info ,p_mouse_le_enc_info -03ea c0190409 beq bt_evt_le_start_enc ,p_mouse_le_ll_start_encryt -03eb c020040b beq bt_evt_le_parse_conn_papa_update_rsp ,p_mouse_le_conn_param_update_rsp_recieved -03ec c01c840d beq bt_evt_24g_pairing_complete ,p_mouse_24g_pairing_complete -03ed c01d0411 beq bt_evt_24g_attempt_fail ,p_mouse_24g_attempt_fail -03ee c01e0414 beq bt_evt_24g_attempt_success ,p_mouse_24g_attempt_success -03ef 2020417d branch mouse_priority_bb_event + 1 +03e7 1a627e00 copy regc ,pdata +03e8 c00a03f1 beq bt_evt_le_connected ,p_mouse_le_bb_event_connected +03e9 c00a8404 beq bt_evt_le_disconnected ,p_mouse_le_bb_disconnected +03ea c0148407 beq bt_evt_le_enc_info ,p_mouse_le_enc_info +03eb c0190409 beq bt_evt_le_start_enc ,p_mouse_le_ll_start_encryt +03ec c020040b beq bt_evt_le_parse_conn_papa_update_rsp ,p_mouse_le_conn_param_update_rsp_recieved +03ed c01c840d beq bt_evt_24g_pairing_complete ,p_mouse_24g_pairing_complete +03ee c01d0411 beq bt_evt_24g_attempt_fail ,p_mouse_24g_attempt_fail +03ef c01e0414 beq bt_evt_24g_attempt_success ,p_mouse_24g_attempt_success +03f0 2020417d branch mouse_priority_bb_event + 1 p_mouse_le_bb_event_connected: -03f0 204003cf call p_mouse_init_sensor_reset 03f1 204041c3 call mouse_le_bb_event_connected 03f2 58000000 setarg 0 03f3 6001cb68 store 3 ,mem_le_switch_adv_flag 03f4 68034b4c fetch 6 ,mem_mouse_24g_addr_init 03f5 680b4722 fetcht 6 ,mem_device1_addr 03f6 98467c00 isub temp ,null -03f7 2442835d ncall p_mouse_fast_conn_disable ,zero +03f7 2442835c ncall p_mouse_fast_conn_disable ,zero 03f8 20403410 call app_ble_store_reconn_info 03f9 704b7601 jam latest_mode_bt ,mem_mouse_latest_mode 03fa 6800c7a1 fetch 1 ,mem_mouse_le_reconnect_flag @@ -1391,7 +1391,7 @@ 040c 20200679 branch p_zcode_entrance p_mouse_24g_pairing_complete: -040d 20400375 call p_g24_transmit_by_interrupt_enable +040d 20400374 call p_g24_transmit_by_interrupt_enable 040e 204003cf call p_mouse_init_sensor_reset 040f 7011c650 jam zcode_50 ,mem_zcode_temp_param0 0410 20200679 branch p_zcode_entrance @@ -1489,7 +1489,7 @@ 044e 70438f00 jam 0 ,mem_le_scan_data_len 044f d8e00007 arg mouse_store_eeprom_flag ,queue 0450 204043d2 call mouse_disable_function_flag -0451 20200361 branch p_mouse_fast_conn_init +0451 20200360 branch p_mouse_fast_conn_init p_mouse_g24_long_sleep_param_update_timer: 0452 da604b44 arg mem_24g_long_sleep_param_update_timer ,regc @@ -2138,7 +2138,7 @@ p_mouse_unplug_clean_bdaddr: 0603 204042fb call mouse_before_store_reconn_info -0604 2020031c branch p_mouse_store_flash_device_info +0604 2020031b branch p_mouse_store_flash_device_info p_check_51cmd_ble_update_connect_param: 0605 20405890 call le_fifo_check_full @@ -2324,7 +2324,7 @@ 0685 9840fe00 iadd temp ,pdata 0686 1fe0fffb increase -5 ,pdata 0687 6001cb59 store 3 ,mem_flash_address -0688 2040035b call p_flash_release_deep_power_down +0688 2040035a call p_flash_release_deep_power_down p_zcode_read_loop: 0689 6801cb59 fetch 3 ,mem_flash_address @@ -2335,7 +2335,7 @@ 068e 680a4b5c fetcht 4 ,mem_zcode_head 068f 98467c00 isub temp ,null 0690 24228689 nbranch p_zcode_read_loop ,zero -0691 2040032a call p_mouse_spi_init +0691 20400329 call p_mouse_spi_init 0692 58001f00 setarg mem_zcode_buff 0693 60014199 store 2 ,mem_patch_ptr 0694 70419b40 jam zcode_code_size ,mem_patch_len @@ -6433,6 +6433,8 @@ 2bf7 20407f91 call ceiling 2bf8 6000c178 store 1 ,mem_lpm_xtalcnt 2bf9 20007530 nop 30000 + +delays_5ms: 2bfa 20007530 nop 30000 2bfb 20007530 nop 30000 2bfc 20600000 rtn @@ -35300,7 +35302,7 @@ z_mouse_start_discovery_norandom: 40008 68034b62 fetch 6 ,mem_le_normal_lap 40009 600344a0 store 6 ,mem_le_lap -4000a 2040035d call p_mouse_fast_conn_disable +4000a 2040035c call p_mouse_fast_conn_disable 4000b 20403418 call app_lpm_mult_disable 4000c 68014687 fetch 2 ,mem_discovery_timeout 4000d 600146ac store 2 ,mem_mouse_discovery_timer @@ -35396,7 +35398,7 @@ 6000a 704d8600 jam g24_tx_timer_int_disable ,mem_24g_transmit_by_interrupt 6000b 204002c6 call p_mouse_tx_power_init 6000c 204001ef call p_g24_check_51cmd_stop_24g -6000d 2040034c call p_mouse_load_flash_device_info +6000d 2040034b call p_mouse_load_flash_device_info 6000e 6800cb76 fetch 1 ,mem_mouse_latest_mode 6000f c1810000 rtnne latest_mode_24g 60010 2020340a branch app_enter_hibernate @@ -35414,7 +35416,7 @@ 6001a 6002477b store 4 ,mem_mouse_24g_addr 6001b 20404366 call mouse_cheak_select_24gdevice 6001c 704b7602 jam latest_mode_24g ,mem_mouse_latest_mode -6001d 2020031c branch p_mouse_store_flash_device_info +6001d 2020031b branch p_mouse_store_flash_device_info z_g24_auto_pair_timeout_clear: 6001e 58000000 setarg 0 @@ -35436,7 +35438,7 @@ 6002a 704b4200 jam 0 ,mem_mouse_long_mult_flag 6002b 20402f20 call g24_app_tx_attempt_success 6002c 204001a1 call p_g24_txbuf_clear -6002d 20200375 branch p_g24_transmit_by_interrupt_enable +6002d 20200374 branch p_g24_transmit_by_interrupt_enable z_g24_store_dongle_addr: 6002e 68024c26 fetch 4 ,mem_24g_rxpayload + 2 @@ -35493,7 +35495,7 @@ 70020 704b4200 jam 0 ,mem_mouse_long_mult_flag 70021 20402f20 call g24_app_tx_attempt_success 70022 204001a1 call p_g24_txbuf_clear -70023 20200375 branch p_g24_transmit_by_interrupt_enable +70023 20200374 branch p_g24_transmit_by_interrupt_enable z7_g24_store_dongle_addr: 70024 68024c26 fetch 4 ,mem_24g_rxpayload + 2 @@ -35547,7 +35549,7 @@ 80007 704b75ff jam 0xff ,mem_mouse_fast_conn_flag 80008 204042fb call mouse_before_store_reconn_info 80009 704721ff jam 0xff ,mem_device1_type -8000a 2020031c branch p_mouse_store_flash_device_info +8000a 2020031b branch p_mouse_store_flash_device_info z_g24_search_dongle: 8000b 6800cb42 fetch 1 ,mem_mouse_long_mult_flag @@ -35611,14 +35613,14 @@ 90009 793f8407 set0 gpio_active_bit ,temp 9000a 20406806 call gpio_set_high_impedance 9000b 20403e54 call mouse_adc_init -9000c 2040030f call p_mouse_load_flash_info_check +9000c 2040030e call p_mouse_load_flash_info_check 9000d 6800c720 fetch 1 ,mem_device_flag 9000e c1010000 rtneq mode_24g_device 9000f 68034b4c fetch 6 ,mem_mouse_24g_addr_init 90010 680b4722 fetcht 6 ,mem_device1_addr 90011 98467c00 isub temp ,null -90012 2422835d nbranch p_mouse_fast_conn_disable ,zero -90013 2020035f branch p_mouse_fast_conn_le_switch_adv +90012 2422835c nbranch p_mouse_fast_conn_disable ,zero +90013 2020035e branch p_mouse_fast_conn_le_switch_adv 90014 20600000 rtn z_mouse_set_gpio_control_sensor: @@ -35753,7 +35755,7 @@ b0021 204003b2 call p_mouse_data_init b0022 20405816 call le_clr_config_more_data b0023 204041d9 call mouse_bb_disconnected -b0024 2040031c call p_mouse_store_flash_device_info +b0024 2040031b call p_mouse_store_flash_device_info b0025 6800cb6b fetch 1 ,mem_mouse_start_discovery_enable b0026 207a0000 rtn blank @@ -35770,10 +35772,10 @@ b002e 20402c21 call lpm_write_ctrl b002f 204074bd call disable_authrom b0030 20404482 call mouse_devce_led_off -b0031 2040031c call p_mouse_store_flash_device_info +b0031 2040031b call p_mouse_store_flash_device_info b0032 20403e9f call mouse_before_hibernate_wheel_gpio_set b0033 204000de call p_mouse_setgpio_hibernate -b0034 20400353 call p_flash_deep_power_down +b0034 20400352 call p_flash_deep_power_down b0035 68108081 hfetch 1 ,core_gpio_sel1 b0036 1fe17ef7 and pdata ,0xf7 ,pdata b0037 60108081 hstore 1 ,core_gpio_sel1 @@ -35823,6 +35825,6 @@ c0019 704aff00 jam 0 ,mem_bt_rcvd_switch_req_accept c001a 704b0100 jam 0 ,mem_bt_send_lmp_setup_complete c001b 704b0a00 jam 0 ,mem_mouse_bt_send_first_package_flag -c001c 2040031c call p_mouse_store_flash_device_info +c001c 2040031b call p_mouse_store_flash_device_info c001d 202041d9 branch mouse_bb_disconnected branch mouse_bb_disconnected Index: output/romcode.rom =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/Standard_MingAo/output/romcode.rom (revision 2533) +++ /branch/mouse_project/YJX_Project/YJX_1059/Standard_MingAo/output/romcode.rom (working copy) @@ -24701,7 +24701,7 @@ 70479e00 68034b62 600344a0 -2040035d +2040035c 20403418 68014687 600146ac @@ -24773,7 +24773,7 @@ 704d8600 204002c6 204001ef -2040034c +2040034b 6800cb76 c1810000 2020340a @@ -24789,7 +24789,7 @@ 6002477b 20404366 704b7602 -2020031c +2020031b 58000000 6001cd91 20600000 @@ -24805,7 +24805,7 @@ 704b4200 20402f20 204001a1 -20200375 +20200374 68024c26 202001d5 70119eff @@ -24851,7 +24851,7 @@ 704b4200 20402f20 204001a1 -20200375 +20200374 68024c26 202001d5 6800cd84 @@ -24888,7 +24888,7 @@ 704b75ff 204042fb 704721ff -2020031c +2020031b 6800cb42 207a0000 6800cc72 @@ -24937,14 +24937,14 @@ 793f8407 20406806 20403e54 -2040030f +2040030e 6800c720 c1010000 68034b4c 680b4722 98467c00 -2422835d -2020035f +2422835c +2020035e 20600000 6810807b 793ffe05 @@ -25041,7 +25041,7 @@ 204003b2 20405816 204041d9 -2040031c +2040031b 6800cb6b 207a0000 68034b62 @@ -25054,10 +25054,10 @@ 20402c21 204074bd 20404482 -2040031c +2040031b 20403e9f 204000de -20400353 +20400352 68108081 1fe17ef7 60108081 @@ -25092,6 +25092,6 @@ 704aff00 704b0100 704b0a00 -2040031c +2040031b 202041d9 -0000e389 +0000b0f0 Index: program/bt.prog =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/Standard_MingAo/program/bt.prog (revision 2533) +++ /branch/mouse_project/YJX_Project/YJX_1059/Standard_MingAo/program/bt.prog (working copy) @@ -3961,6 +3961,7 @@ call ceiling store 1,mem_lpm_xtalcnt nop 30000 +delays_5ms: nop 30000 nop 30000 rtn Index: program/patch.prog =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/Standard_MingAo/program/patch.prog (revision 2533) +++ /branch/mouse_project/YJX_Project/YJX_1059/Standard_MingAo/program/patch.prog (working copy) @@ -1279,7 +1279,6 @@ isub temp,null rtn zero call twspi_write - nop 12000 increase 2,regc branch p_sensor_wr_seq @@ -1557,6 +1556,7 @@ call p_mouse_spi_init arg mem_sensor_poweron_init,regc call p_sensor_wr_seq + call delays_5ms branch p_mouse_dpi_config p_mouse_dpi_config: @@ -1668,7 +1668,8 @@ call le_set_config_more_data p_mouse_init_sensor_reset: jam 1,mem_mouse_init_sensor_reset_flag - branch p_mouse_init_sunt + call p_mouse_init_sunt + branch delays_5ms ifdef CLASSIC_BT p_mouse_bt: @@ -1772,7 +1773,7 @@ ifdef BLE p_mouse_le_bb_event_connected: - call p_mouse_init_sensor_reset +// call p_mouse_init_sensor_reset call mouse_le_bb_event_connected ifdef BLE_FAST_CONN_ENABLE setarg 0 @@ -1833,7 +1834,7 @@ p_mouse_bb_event_connected: call p_mouse_store_eeprom_enable - call p_mouse_init_sensor_reset +// call p_mouse_init_sensor_reset ifdef BLE_FAST_CONN_ENABLE setarg 0 store 3,mem_le_switch_adv_flag Index: sched/mouse.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/Standard_MingAo/sched/mouse.dat (revision 2533) +++ /branch/mouse_project/YJX_Project/YJX_1059/Standard_MingAo/sched/mouse.dat (working copy) @@ -302,7 +302,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:04 00 +mem_firmware_version:05 00 mem_device_flag: 01