Index: output/flash.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_BH-G600-Desktop/output/flash.dat (revision 2533) +++ /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_BH-G600-Desktop/output/flash.dat (working copy) @@ -39,7 +39,7 @@ 20 40 03 -2e +2d 20 40 06 @@ -82,12 +82,12 @@ 1e 20 20 -03 -00 +02 +ff 58 00 03 -77 +76 60 01 4c @@ -119,7 +119,7 @@ 58 00 03 -fc +fd 60 01 41 @@ -127,7 +127,7 @@ 58 00 03 -e9 +ea 60 01 41 @@ -435,7 +435,7 @@ 20 40 03 -88 +87 20 40 6a @@ -631,7 +631,7 @@ c0 00 83 -7a +79 68 00 c6 @@ -639,7 +639,7 @@ c2 80 83 -7a +79 20 40 00 @@ -663,7 +663,7 @@ 20 40 03 -7a +79 20 40 01 @@ -927,7 +927,7 @@ 20 40 03 -02 +01 68 12 00 @@ -1511,7 +1511,7 @@ 20 40 03 -94 +93 20 40 01 @@ -2791,7 +2791,7 @@ 20 40 03 -7e +7d 20 40 00 @@ -2867,7 +2867,7 @@ c0 01 03 -70 +6f 20 40 05 @@ -2911,7 +2911,7 @@ 20 20 03 -2e +2d 68 00 cc @@ -2943,7 +2943,7 @@ 20 40 03 -2e +2d 20 40 40 @@ -2959,7 +2959,7 @@ c0 18 82 -fb +fa 20 40 40 @@ -2975,7 +2975,7 @@ 20 40 03 -9a +99 68 00 c6 @@ -2987,7 +2987,7 @@ c0 2a 02 -f8 +f7 20 20 40 @@ -3032,10 +3032,6 @@ 40 64 13 -20 -00 -2e -e0 1a 60 a6 @@ -3059,7 +3055,7 @@ 20 40 03 -9a +99 68 00 c6 @@ -3151,7 +3147,7 @@ 20 40 03 -5f +5e 20 40 44 @@ -3171,7 +3167,7 @@ 20 22 83 -50 +4f 60 09 47 @@ -3207,27 +3203,27 @@ 20 40 03 -5f +5e 20 40 03 -30 +2f 20 40 03 -47 +46 20 40 03 -3c +3b 20 40 03 -33 +32 20 40 03 -04 +03 d8 40 00 @@ -3251,15 +3247,15 @@ 20 40 03 -3c +3b 20 40 03 -33 +32 20 40 03 -57 +56 70 42 12 @@ -3311,7 +3307,7 @@ c2 80 03 -33 +32 20 60 00 @@ -3387,11 +3383,11 @@ 20 40 03 -5f +5e 20 40 03 -47 +46 20 20 65 @@ -3399,11 +3395,11 @@ 20 40 03 -4d +4c 20 40 03 -69 +68 20 40 02 @@ -3431,7 +3427,7 @@ 20 40 03 -04 +03 20 40 69 @@ -3463,7 +3459,7 @@ 20 20 03 -58 +57 70 4a c7 @@ -3499,7 +3495,7 @@ 20 40 03 -5f +5e d8 40 00 @@ -3547,7 +3543,7 @@ 20 40 03 -20 +1f 20 20 02 @@ -3591,7 +3587,7 @@ 20 40 03 -86 +85 d8 c0 19 @@ -3599,7 +3595,7 @@ 20 40 03 -86 +85 d8 c0 1a @@ -3607,7 +3603,7 @@ 20 40 03 -86 +85 d8 c0 1b @@ -3631,7 +3627,7 @@ 20 40 03 -86 +85 d8 a0 19 @@ -3639,7 +3635,7 @@ 20 40 03 -86 +85 d8 a0 1a @@ -3647,7 +3643,7 @@ 20 40 03 -86 +85 d8 a0 1b @@ -3655,7 +3651,7 @@ 20 20 03 -86 +85 70 41 72 @@ -3695,7 +3691,7 @@ 20 40 03 -2e +2d da 60 4a @@ -3705,6 +3701,10 @@ 02 f0 20 +40 +2b +fa +20 20 03 9e @@ -3791,11 +3791,11 @@ 20 40 03 -91 +90 20 40 03 -94 +93 20 40 03 @@ -4005,17 +4005,21 @@ 51 01 20 -20 +40 02 de 20 +20 +2b +fa +20 40 7e 34 20 40 03 -ec +ed 20 20 3e @@ -4039,7 +4043,7 @@ 20 20 83 -fa +fb 20 40 05 @@ -4091,7 +4095,7 @@ c0 0a 04 -06 +07 c0 0a 84 @@ -4124,10 +4128,6 @@ 20 41 7d -20 -40 -03 -e7 58 00 00 @@ -4151,7 +4151,7 @@ 24 42 83 -61 +60 20 40 34 @@ -4531,7 +4531,7 @@ 20 20 03 -65 +64 da 60 4a @@ -6339,7 +6339,7 @@ 20 20 03 -20 +1f 20 40 58 @@ -6867,7 +6867,7 @@ 20 40 03 -5f +5e 68 01 ca @@ -6903,7 +6903,7 @@ 20 40 03 -2e +2d 58 00 1f @@ -7404,8 +7404,8 @@ 20 07 35 -9d -83 +b5 +38 aa 55 08 @@ -8812,7 +8812,7 @@ 00 14 4b -04 +05 00 aa 55 @@ -9044,7 +9044,7 @@ 20 40 03 -20 +1f 20 20 41 @@ -9324,7 +9324,7 @@ 20 40 03 -20 +1f 68 00 ca @@ -9376,7 +9376,7 @@ 20 40 03 -20 +1f 20 40 3e @@ -9400,7 +9400,7 @@ 20 40 03 -57 +56 68 10 80 @@ -9760,7 +9760,7 @@ 20 40 03 -12 +11 68 00 c7 @@ -9784,11 +9784,11 @@ 24 22 83 -61 +60 20 20 03 -63 +62 20 60 00 @@ -9996,7 +9996,7 @@ 20 20 03 -20 +1f 68 00 ca @@ -10352,7 +10352,7 @@ 20 20 03 -7a +79 68 02 4b @@ -10564,7 +10564,7 @@ 20 20 03 -20 +1f 58 00 00 @@ -10628,7 +10628,7 @@ 20 20 03 -7a +79 68 02 4b @@ -11020,7 +11020,7 @@ 20 40 03 -61 +60 20 40 34 @@ -11060,7 +11060,7 @@ 20 40 03 -50 +4f 68 00 c2 @@ -12005,5 +12005,5 @@ 55 00 00 -73 -f7 +d3 +fb Index: output/program.lis =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_BH-G600-Desktop/output/program.lis (revision 2533) +++ /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_BH-G600-Desktop/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 204004a4 call p_mouse_bt_discovery_button_up_init -0008 2040032e call p_mouse_spi_init +0008 2040032d call p_mouse_spi_init 0009 204006d1 call p_drawing_optima_init 000a 20400014 call p_mouse_cb_fuction 000b 20400025 call p_mouse_wakeup_from_power @@ -25,10 +25,10 @@ 0010 2040582c call le_set_fixed_ltk 0011 20405818 call le_set_config_read_authentication 0012 20403e1e call mouse_param_init -0013 20200300 branch p_mouse_setting_config +0013 202002ff branch p_mouse_setting_config p_mouse_cb_fuction: -0014 58000377 setarg p_mouse_g24_package_data +0014 58000376 setarg p_mouse_g24_package_data 0015 60014ccf store 2 ,mem_cb_24g_data 0016 580003a3 setarg p_mouse_le 0017 600141ef store 2 ,mem_cb_le_process @@ -36,9 +36,9 @@ 0019 600141f9 store 2 ,mem_cb_att_write 001a 580002b7 setarg p_mouse_before_lpm 001b 600141ed store 2 ,mem_cb_before_lpm -001c 580003fc setarg p_mouse_priority_bb_event +001c 580003fd setarg p_mouse_priority_bb_event 001d 600141f5 store 2 ,mem_cb_bb_event_process -001e 580003e9 setarg p_mouse_idle +001e 580003ea setarg p_mouse_idle 001f 600141f3 store 2 ,mem_cb_idle_process 0020 58000429 setarg p_mouse_before_hibernate 0021 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 20400388 call p_mouse_le_txbuff_load +006b 20400387 call p_mouse_le_txbuff_load 006c 20406a03 call rfcomm_init 006d 20405cf6 call init_lmp 006e 2455ac65 ncall lpm_disable_exen_output ,wake @@ -192,9 +192,9 @@ 0099 6800cb11 fetch 1 ,mem_customer_data_trigger 009a c00080a4 beq 1 ,p_g24_transmit_customer_data 009b 6800ca79 fetch 1 ,mem_mouse_multi_led_state -009c c000837a beq on ,p_g24_transmit_by_interrupt_enable +009c c0008379 beq on ,p_g24_transmit_by_interrupt_enable 009d 6800c69a fetch 1 ,mem_mouse_key -009e c280837a bbit1 1 ,p_g24_transmit_by_interrupt_enable +009e c2808379 bbit1 1 ,p_g24_transmit_by_interrupt_enable p_g24_short_sleep: 009f 204000db call p_g24_lpm_wait @@ -204,7 +204,7 @@ 00a3 20202b93 branch lpm_dispatch_sleep p_g24_transmit_customer_data: -00a4 2040037a call p_g24_transmit_by_interrupt_enable +00a4 20400379 call p_g24_transmit_by_interrupt_enable 00a5 20400191 call p_g24_accumulate_customer_data 00a6 2040016c call p_g24_txdata_enable_tx 00a7 2040019c call p_g24_transmit_packet @@ -298,7 +298,7 @@ p_mouse_setgpio_hibernate: 00e5 20403ebf call mouse_lpm_before_common -00e6 20400302 call p_flash_ncs_disable +00e6 20400301 call p_flash_ncs_disable 00e7 68120070 hfetch 4 ,core_gpio_oe0 00e8 681a0078 hfetcht 4 ,core_gpio_pu0 00e9 98418400 ior temp ,temp @@ -496,7 +496,7 @@ 0175 6800cb10 fetch 1 ,mem_normal_data_trigger 0176 203a0191 branch p_g24_accumulate_customer_data ,blank 0177 704b9f01 jam type_ms ,mem_24g_data_type -0178 20400394 call p_mouse_data_xy_release +0178 20400393 call p_mouse_data_xy_release 0179 2040018b call p_g24_accumulate_data_head 017a e8a88000 ifetcht 1 ,contw 017b ea408000 ifetch 1 ,regb @@ -912,7 +912,7 @@ p_mouse_before_lpm: 02b7 c6130000 rtnmark1 mark_24g -02b8 2040037e call p_mouse_le_txbuff_save +02b8 2040037d call p_mouse_le_txbuff_save 02b9 204000e3 call p_mouse_setgpio_lpm 02ba 6800c040 fetch 1 ,mem_context 02bb c30002be bbit0 state_inconn ,p_clear_wake @@ -941,7 +941,7 @@ p_mouse_check_reconn_target: 02c9 204002d7 call p_mouse_tx_power_init 02ca 6800c720 fetch 1 ,mem_device_flag -02cb c0010370 beq mode_24g_device ,p_mouse_connect_24g_mode +02cb c001036f beq mode_24g_device ,p_mouse_connect_24g_mode 02cc 20400509 call p_mouse_mode_bt_device1_multi_led_on 02cd 6800c210 fetch 1 ,mem_xrecord_mode 02ce c01a02dc beq rec_4_mode ,p_mouse4_0_check_reconn_target @@ -954,7 +954,7 @@ 02d5 20600000 rtn p_device_wake_from_lpm: -02d6 2020032e branch p_mouse_spi_init +02d6 2020032d branch p_mouse_spi_init p_mouse_tx_power_init: 02d7 6800cc55 fetch 1 ,mem_tx_power_temp @@ -970,22 +970,22 @@ 02dd 202006a4 branch p_zcode_entrance p_mouse_init_sunt: -02de 2040032e call p_mouse_spi_init +02de 2040032d call p_mouse_spi_init 02df 204040c0 call mouse_spi_sdio_gpio_pollup p_mouse_init_sensor: 02e0 204040d9 call mouse_read_sensor_id 02e1 c01802e6 beq p32xx_id1 ,p_mouse_init_p32xx_id2_judge -02e2 c01882fb beq p3065_id1 ,p_mouse_p3065_init_param +02e2 c01882fa beq p3065_id1 ,p_mouse_p3065_init_param 02e3 204040d1 call mouse_twspi_reset 02e4 200003e8 nop 1000 02e5 202002e0 branch p_mouse_init_sensor p_mouse_init_p32xx_id2_judge: -02e6 2040039a call p_mouse_sensor_poweron +02e6 20400399 call p_mouse_sensor_poweron 02e7 6800c6de fetch 1 ,mem_sensor_id2 02e8 c02d02eb beq p_mx8650 ,p_mouse_mx8650_init_param -02e9 c02a02f8 beq pka8_id2 ,p_mouse_ka8_init_param +02e9 c02a02f7 beq pka8_id2 ,p_mouse_ka8_init_param 02ea 202040e0 branch mouse_init_p32xx_id2_judge p_mouse_mx8650_init_param: @@ -1001,238 +1001,238 @@ 02f2 98467c00 isub temp ,null 02f3 20628000 rtn zero 02f4 20406413 call twspi_write -02f5 20002ee0 nop 12000 -02f6 1a60a602 increase 2 ,regc -02f7 202002f0 branch p_sensor_wr_seq +02f5 1a60a602 increase 2 ,regc +02f6 202002f0 branch p_sensor_wr_seq p_mouse_ka8_init_param: -02f8 7046e002 jam ka8 ,mem_config_sensor_type -02f9 da604ae4 arg mem_sensor_ka8_init ,regc -02fa 202002f0 branch p_sensor_wr_seq +02f7 7046e002 jam ka8 ,mem_config_sensor_type +02f8 da604ae4 arg mem_sensor_ka8_init ,regc +02f9 202002f0 branch p_sensor_wr_seq p_mouse_p3065_init_param: -02fb 2040039a call p_mouse_sensor_poweron -02fc 6800c6de fetch 1 ,mem_sensor_id2 -02fd c03840e8 beq p3065_xy_id2 ,mouse_p3065xy_init_param -02fe 7046e001 jam p3065 ,mem_config_sensor_type -02ff 20600000 rtn +02fa 20400399 call p_mouse_sensor_poweron +02fb 6800c6de fetch 1 ,mem_sensor_id2 +02fc c03840e8 beq p3065_xy_id2 ,mouse_p3065xy_init_param +02fd 7046e001 jam p3065 ,mem_config_sensor_type +02fe 20600000 rtn p_mouse_setting_config: -0300 7011c680 jam zcode_80 ,mem_zcode_temp_param0 -0301 202006a4 branch p_zcode_entrance +02ff 7011c680 jam zcode_80 ,mem_zcode_temp_param0 +0300 202006a4 branch p_zcode_entrance p_flash_ncs_disable: -0302 6808ca97 fetcht 1 ,mem_flash_ncs_gpio -0303 20206825 branch gpio_out_inactive +0301 6808ca97 fetcht 1 ,mem_flash_ncs_gpio +0302 20206825 branch gpio_out_inactive p_spid_init_flash: -0304 70808640 jam 0x40 ,core_spid_ctrl -0305 70808700 jam 0x0 ,core_spid_delay -0306 68108081 hfetch 1 ,core_gpio_sel1 -0307 793ffe00 set0 0 ,pdata -0308 793ffe01 set0 1 ,pdata -0309 79207e03 set1 3 ,pdata -030a 793ffe04 set0 4 ,pdata -030b 60108081 hstore 1 ,core_gpio_sel1 -030c 58000000 setarg 0 -030d 600201f5 store 4 ,mem_spid_tbuf -030e 6810807f hfetch 1 ,core_gpio_pd3 -030f 793ffe00 set0 0 ,pdata -0310 6010807f hstore 1 ,core_gpio_pd3 -0311 20600000 rtn +0303 70808640 jam 0x40 ,core_spid_ctrl +0304 70808700 jam 0x0 ,core_spid_delay +0305 68108081 hfetch 1 ,core_gpio_sel1 +0306 793ffe00 set0 0 ,pdata +0307 793ffe01 set0 1 ,pdata +0308 79207e03 set1 3 ,pdata +0309 793ffe04 set0 4 ,pdata +030a 60108081 hstore 1 ,core_gpio_sel1 +030b 58000000 setarg 0 +030c 600201f5 store 4 ,mem_spid_tbuf +030d 6810807f hfetch 1 ,core_gpio_pd3 +030e 793ffe00 set0 0 ,pdata +030f 6010807f hstore 1 ,core_gpio_pd3 +0310 20600000 rtn p_mouse_load_flash_info_check: -0312 2040035f call p_flash_release_deep_power_down -0313 20404423 call mouse_load_flash_flag -0314 68014778 fetch 2 ,mem_store_flag -0315 d840aa55 arg eeprom_init_flag ,temp -0316 98467c00 isub temp ,null -0317 20228350 branch p_mouse_load_flash_device_info ,zero -0318 60094778 storet 2 ,mem_store_flag -0319 244282da ncall p_mouse_check_select_device_by_switch ,zero -031a 2040441c call mouse_ble_init_address -031b 6800c6e1 fetch 1 ,mem_config_sensor_motion -031c 6000c77a store 1 ,mem_mouse_dpi -031d 68024a9e fetch 4 ,mem_mouse_24g_addr_init -031e 6002477b store 4 ,mem_mouse_24g_addr -031f 60024bc6 store 4 ,mem_24g_addr +0311 2040035e call p_flash_release_deep_power_down +0312 20404423 call mouse_load_flash_flag +0313 68014778 fetch 2 ,mem_store_flag +0314 d840aa55 arg eeprom_init_flag ,temp +0315 98467c00 isub temp ,null +0316 2022834f branch p_mouse_load_flash_device_info ,zero +0317 60094778 storet 2 ,mem_store_flag +0318 244282da ncall p_mouse_check_select_device_by_switch ,zero +0319 2040441c call mouse_ble_init_address +031a 6800c6e1 fetch 1 ,mem_config_sensor_motion +031b 6000c77a store 1 ,mem_mouse_dpi +031c 68024a9e fetch 4 ,mem_mouse_24g_addr_init +031d 6002477b store 4 ,mem_mouse_24g_addr +031e 60024bc6 store 4 ,mem_24g_addr p_mouse_store_flash_device_info: -0320 2040035f call p_flash_release_deep_power_down -0321 20400330 call p_flash_erase_sector -0322 20400347 call p_mouse_information_flash_parameters -0323 2040033c call p_spid_write_flash -0324 20400333 call p_wait_flash_done +031f 2040035e call p_flash_release_deep_power_down +0320 2040032f call p_flash_erase_sector +0321 20400346 call p_mouse_information_flash_parameters +0322 2040033b call p_spid_write_flash +0323 20400332 call p_wait_flash_done p_mouse_store_flash_user_data: -0325 20400304 call p_spid_init_flash -0326 d8400007 arg 7 ,temp -0327 da204ac2 arg mem_mouse_flash_start_temp ,rega -0328 da40005f arg mouse_user_data_offect ,regb -0329 6801c700 fetch 3 ,mem_flash_base -032a 9a40fe00 iadd regb ,pdata -032b 2040033c call p_spid_write_flash -032c 20400333 call p_wait_flash_done -032d 20400357 call p_flash_deep_power_down +0324 20400303 call p_spid_init_flash +0325 d8400007 arg 7 ,temp +0326 da204ac2 arg mem_mouse_flash_start_temp ,rega +0327 da40005f arg mouse_user_data_offect ,regb +0328 6801c700 fetch 3 ,mem_flash_base +0329 9a40fe00 iadd regb ,pdata +032a 2040033b call p_spid_write_flash +032b 20400332 call p_wait_flash_done +032c 20400356 call p_flash_deep_power_down p_mouse_spi_init: -032e 70421276 jam 0x76 ,mem_spi_init_clk -032f 20203d36 branch mouse_spi_init +032d 70421276 jam 0x76 ,mem_spi_init_clk +032e 20203d36 branch mouse_spi_init p_flash_erase_sector: -0330 6801c700 fetch 3 ,mem_flash_base -0331 6001c232 store 3 ,mem_spi_write_addr -0332 2040652a call flash_erase_sector + 2 +032f 6801c700 fetch 3 ,mem_flash_base +0330 6001c232 store 3 ,mem_spi_write_addr +0331 2040652a call flash_erase_sector + 2 p_wait_flash_done: -0333 580186a0 setarg 100000 -0334 20402a8f call sleep -0335 2040650b call spid_unlock_flash -0336 580001fa setarg mem_spid_rbuf -0337 6011008c hstore 2 ,core_spid_rxaddr -0338 58000005 setarg flash_read_satus -0339 204064f3 call spid_read_reg -033a c2800333 bbit1 flash_status_wip ,p_wait_flash_done -033b 20600000 rtn +0332 580186a0 setarg 100000 +0333 20402a8f call sleep +0334 2040650b call spid_unlock_flash +0335 580001fa setarg mem_spid_rbuf +0336 6011008c hstore 2 ,core_spid_rxaddr +0337 58000005 setarg flash_read_satus +0338 204064f3 call spid_read_reg +0339 c2800332 bbit1 flash_status_wip ,p_wait_flash_done +033a 20600000 rtn p_spid_write_flash: -033c 1fe22600 copy pdata ,regc -033d 1a227e00 copy rega ,pdata -033e 1fe0fffc increase -4 ,pdata -033f 1fe22400 copy pdata ,regb -0340 ea420000 ifetch 4 ,regb -0341 60024a99 store 4 ,mem_write_flash_head_temp -0342 1a627e00 copy regc ,pdata -0343 20406552 call spid_write_flash -0344 68024a99 fetch 4 ,mem_write_flash_head_temp -0345 e2420000 istore 4 ,regb -0346 20600000 rtn +033b 1fe22600 copy pdata ,regc +033c 1a227e00 copy rega ,pdata +033d 1fe0fffc increase -4 ,pdata +033e 1fe22400 copy pdata ,regb +033f ea420000 ifetch 4 ,regb +0340 60024a99 store 4 ,mem_write_flash_head_temp +0341 1a627e00 copy regc ,pdata +0342 20406552 call spid_write_flash +0343 68024a99 fetch 4 ,mem_write_flash_head_temp +0344 e2420000 istore 4 ,regb +0345 20600000 rtn p_mouse_information_flash_parameters: -0347 5800477f setarg mem_mouse_information_end -0348 d8404720 arg mem_mouse_information_start ,temp -0349 98460400 isub temp ,temp -034a 6801c700 fetch 3 ,mem_flash_base -034b da204720 arg mem_mouse_information_start ,rega -034c 20600000 rtn +0346 5800477f setarg mem_mouse_information_end +0347 d8404720 arg mem_mouse_information_start ,temp +0348 98460400 isub temp ,temp +0349 6801c700 fetch 3 ,mem_flash_base +034a da204720 arg mem_mouse_information_start ,rega +034b 20600000 rtn p_mouse_read_flash: -034d 2040035f call p_flash_release_deep_power_down -034e 20400347 call p_mouse_information_flash_parameters -034f 20206562 branch spid_read_flash +034c 2040035e call p_flash_release_deep_power_down +034d 20400346 call p_mouse_information_flash_parameters +034e 20206562 branch spid_read_flash p_mouse_load_flash_device_info: -0350 2040034d call p_mouse_read_flash -0351 20400369 call p_mouse_load_flash_user_data -0352 204002da call p_mouse_check_select_device_by_switch -0353 2040431a call mouse_select_reconn_device -0354 6802477b fetch 4 ,mem_mouse_24g_addr -0355 60024bc6 store 4 ,mem_24g_addr -0356 20600000 rtn +034f 2040034c call p_mouse_read_flash +0350 20400368 call p_mouse_load_flash_user_data +0351 204002da call p_mouse_check_select_device_by_switch +0352 2040431a call mouse_select_reconn_device +0353 6802477b fetch 4 ,mem_mouse_24g_addr +0354 60024bc6 store 4 ,mem_24g_addr +0355 20600000 rtn p_flash_deep_power_down: -0357 700aa2b9 jam flash_command_deep_power_down ,mem_temp +0356 700aa2b9 jam flash_command_deep_power_down ,mem_temp p_spid_write_flash_cmd: -0358 20400304 call p_spid_init_flash -0359 204069ac call delay_nop100 -035a 2040650b call spid_unlock_flash -035b da204a99 arg mem_write_flash_head_temp ,rega -035c 68088aa2 fetcht 1 ,mem_temp -035d 20406556 call spid_write_flash_common -035e 202069ac branch delay_nop100 +0357 20400303 call p_spid_init_flash +0358 204069ac call delay_nop100 +0359 2040650b call spid_unlock_flash +035a da204a99 arg mem_write_flash_head_temp ,rega +035b 68088aa2 fetcht 1 ,mem_temp +035c 20406556 call spid_write_flash_common +035d 202069ac branch delay_nop100 p_flash_release_deep_power_down: -035f 700aa2ab jam flash_command_release_deep_power_down ,mem_temp -0360 20200358 branch p_spid_write_flash_cmd +035e 700aa2ab jam flash_command_release_deep_power_down ,mem_temp +035f 20200357 branch p_spid_write_flash_cmd p_mouse_fast_conn_disable: -0361 704ac75a jam 0x5a ,mem_mouse_fast_conn_flag -0362 20600000 rtn +0360 704ac75a jam 0x5a ,mem_mouse_fast_conn_flag +0361 20600000 rtn p_mouse_fast_conn_le_switch_adv: -0363 704abb01 jam 1 ,mem_le_switch_adv_timer -0364 704aba01 jam 1 ,mem_le_switch_adv_flag +0362 704abb01 jam 1 ,mem_le_switch_adv_timer +0363 704aba01 jam 1 ,mem_le_switch_adv_flag p_mouse_fast_conn_init: -0365 704ac7ff jam 0xff ,mem_mouse_fast_conn_flag -0366 68034ce3 fetch 6 ,mem_24g_allpowerful_addr -0367 600344a0 store 6 ,mem_le_lap -0368 20600000 rtn +0364 704ac7ff jam 0xff ,mem_mouse_fast_conn_flag +0365 68034ce3 fetch 6 ,mem_24g_allpowerful_addr +0366 600344a0 store 6 ,mem_le_lap +0367 20600000 rtn p_mouse_load_flash_user_data: -0369 2040035f call p_flash_release_deep_power_down -036a d8400007 arg 7 ,temp -036b da204ac2 arg mem_mouse_flash_start_temp ,rega -036c da40005f arg mouse_user_data_offect ,regb -036d 6801c700 fetch 3 ,mem_flash_base -036e 9a40fe00 iadd regb ,pdata -036f 20206562 branch spid_read_flash +0368 2040035e call p_flash_release_deep_power_down +0369 d8400007 arg 7 ,temp +036a da204ac2 arg mem_mouse_flash_start_temp ,rega +036b da40005f arg mouse_user_data_offect ,regb +036c 6801c700 fetch 3 ,mem_flash_base +036d 9a40fe00 iadd regb ,pdata +036e 20206562 branch spid_read_flash p_mouse_connect_24g_mode: -0370 20400509 call p_mouse_mode_24g_device_multi_led_on +036f 20400509 call p_mouse_mode_24g_device_multi_led_on p_mouse_start_24g_mode: -0371 6800c241 fetch 1 ,mem_power_on_flag -0372 c2810200 bbit1 2 ,p_g24_start_24g_mode -0373 68024a9e fetch 4 ,mem_mouse_24g_addr_init -0374 60024bc6 store 4 ,mem_24g_addr -0375 20400320 call p_mouse_store_flash_device_info -0376 20200202 branch p_g24_auto_pair_start +0370 6800c241 fetch 1 ,mem_power_on_flag +0371 c2810200 bbit1 2 ,p_g24_start_24g_mode +0372 68024a9e fetch 4 ,mem_mouse_24g_addr_init +0373 60024bc6 store 4 ,mem_24g_addr +0374 2040031f call p_mouse_store_flash_device_info +0375 20200202 branch p_g24_auto_pair_start p_mouse_g24_package_data: -0377 20404401 call mouse_g24_package_data -0378 6801469f fetch 2 ,mem_mouse_z -0379 207a0000 rtn blank +0376 20404401 call mouse_g24_package_data +0377 6801469f fetch 2 ,mem_mouse_z +0378 207a0000 rtn blank p_g24_transmit_by_interrupt_enable: -037a 704cde01 jam g24_tx_timer_int_enable ,mem_24g_transmit_by_interrupt -037b 58000000 setarg 0 -037c 60014cdf store 2 ,mem_24g_transmit_by_interrupt_exit_count -037d 20600000 rtn +0379 704cde01 jam g24_tx_timer_int_enable ,mem_24g_transmit_by_interrupt +037a 58000000 setarg 0 +037b 60014cdf store 2 ,mem_24g_transmit_by_interrupt_exit_count +037c 20600000 rtn p_mouse_le_txbuff_save: -037e d8c01800 arg mem_le_tx_buffer0 ,contr -037f d8a049e3 arg mem_le_tx_buffer0_omemalloc ,contw -0380 20400386 call p_mouse_le_txbuff_copy -0381 d8c01900 arg mem_le_tx_buffer1 ,contr -0382 20400386 call p_mouse_le_txbuff_copy -0383 d8c01a00 arg mem_le_tx_buffer2 ,contr -0384 20400386 call p_mouse_le_txbuff_copy -0385 d8c01b00 arg mem_le_tx_buffer3 ,contr +037d d8c01800 arg mem_le_tx_buffer0 ,contr +037e d8a049e3 arg mem_le_tx_buffer0_omemalloc ,contw +037f 20400385 call p_mouse_le_txbuff_copy +0380 d8c01900 arg mem_le_tx_buffer1 ,contr +0381 20400385 call p_mouse_le_txbuff_copy +0382 d8c01a00 arg mem_le_tx_buffer2 ,contr +0383 20400385 call p_mouse_le_txbuff_copy +0384 d8c01b00 arg mem_le_tx_buffer3 ,contr p_mouse_le_txbuff_copy: -0386 df20001b arg 27 ,loopcnt -0387 20207f01 branch memcpy +0385 df20001b arg 27 ,loopcnt +0386 20207f01 branch memcpy p_mouse_le_txbuff_load: -0388 d8c049e3 arg mem_le_tx_buffer0_omemalloc ,contr -0389 d8a01800 arg mem_le_tx_buffer0 ,contw -038a 20400386 call p_mouse_le_txbuff_copy -038b d8a01900 arg mem_le_tx_buffer1 ,contw -038c 20400386 call p_mouse_le_txbuff_copy -038d d8a01a00 arg mem_le_tx_buffer2 ,contw -038e 20400386 call p_mouse_le_txbuff_copy -038f d8a01b00 arg mem_le_tx_buffer3 ,contw -0390 20200386 branch p_mouse_le_txbuff_copy +0387 d8c049e3 arg mem_le_tx_buffer0_omemalloc ,contr +0388 d8a01800 arg mem_le_tx_buffer0 ,contw +0389 20400385 call p_mouse_le_txbuff_copy +038a d8a01900 arg mem_le_tx_buffer1 ,contw +038b 20400385 call p_mouse_le_txbuff_copy +038c d8a01a00 arg mem_le_tx_buffer2 ,contw +038d 20400385 call p_mouse_le_txbuff_copy +038e d8a01b00 arg mem_le_tx_buffer3 ,contw +038f 20200385 branch p_mouse_le_txbuff_copy p_mouse_le_current_mult_update: -0391 70417200 jam 0 ,mem_lpm_mult -0392 704a951e jam 30 ,mem_mouse_le_current_mult_timer -0393 20600000 rtn +0390 70417200 jam 0 ,mem_lpm_mult +0391 704a951e jam 30 ,mem_mouse_le_current_mult_timer +0392 20600000 rtn p_mouse_data_xy_release: -0394 6800ca94 fetch 1 ,mem_mouse_long_mult_flag -0395 c1808000 rtnne 1 -0396 58000000 setarg 0 -0397 6000ca94 store 1 ,mem_mouse_long_mult_flag -0398 6002469b store 4 ,mem_mouse_x -0399 202003e7 branch p_mouse_init_sensor_reset +0393 6800ca94 fetch 1 ,mem_mouse_long_mult_flag +0394 c1808000 rtnne 1 +0395 58000000 setarg 0 +0396 6000ca94 store 1 ,mem_mouse_long_mult_flag +0397 6002469b store 4 ,mem_mouse_x +0398 202003e7 branch p_mouse_init_sensor_reset p_mouse_sensor_poweron: -039a 2040032e call p_mouse_spi_init -039b da604af2 arg mem_sensor_poweron_init ,regc -039c 204002f0 call p_sensor_wr_seq +0399 2040032d call p_mouse_spi_init +039a da604af2 arg mem_sensor_poweron_init ,regc +039b 204002f0 call p_sensor_wr_seq +039c 20402bfa call delays_5ms 039d 2020039e branch p_mouse_dpi_config p_mouse_dpi_config: @@ -1262,8 +1262,8 @@ 03af c00083c6 beq 1 ,p_mouse_le_release_customer_data 03b0 20403f97 call mouse_motion 03b1 24740000 nrtn user -03b2 20400391 call p_mouse_le_current_mult_update -03b3 20400394 call p_mouse_data_xy_release +03b2 20400390 call p_mouse_le_current_mult_update +03b3 20400393 call p_mouse_data_xy_release 03b4 204003e0 call p_mouse_wheel_trigger 03b5 6800cb11 fetch 1 ,mem_customer_data_trigger 03b6 c00083bb beq 1 ,p_mouse_le_send_customer_packet @@ -1338,55 +1338,55 @@ p_mouse_init_sensor_reset: 03e7 704a5101 jam 1 ,mem_mouse_init_sensor_reset_flag -03e8 202002de branch p_mouse_init_sunt +03e8 204002de call p_mouse_init_sunt +03e9 20202bfa branch delays_5ms p_mouse_idle: -03e9 20407e34 call ui_check_paring_button -03ea 204003ec call p_mouse_dpi_check -03eb 20203ee0 branch mouse_wheel_check +03ea 20407e34 call ui_check_paring_button +03eb 204003ed call p_mouse_dpi_check +03ec 20203ee0 branch mouse_wheel_check p_mouse_dpi_check: -03ec 6808c6e7 fetcht 1 ,mem_dpi_button_gpio -03ed 20400552 call p_gpio_set_input_pd -03ee 6808c6e7 fetcht 1 ,mem_dpi_button_gpio -03ef 2040681d call gpio_get_bit -03f0 202083fa branch p_mouse_dpi_up ,true -03f1 2040054d call p_gpio_set_input_pu +03ed 6808c6e7 fetcht 1 ,mem_dpi_button_gpio +03ee 20400552 call p_gpio_set_input_pd +03ef 6808c6e7 fetcht 1 ,mem_dpi_button_gpio +03f0 2040681d call gpio_get_bit +03f1 202083fb branch p_mouse_dpi_up ,true +03f2 2040054d call p_gpio_set_input_pu p_mouse_dpi_down: -03f2 6800c6b6 fetch 1 ,mem_mouse_dpi_button_state -03f3 c1000000 rtneq dpi_button_state_down -03f4 7046b600 jam dpi_button_state_down ,mem_mouse_dpi_button_state -03f5 6800c77a fetch 1 ,mem_mouse_dpi -03f6 1fe0fe01 increase 1 ,pdata -03f7 1fe17e03 and pdata ,0x03 ,pdata -03f8 6000c77a store 1 ,mem_mouse_dpi -03f9 20203d7e branch mouse_seting_dpi +03f3 6800c6b6 fetch 1 ,mem_mouse_dpi_button_state +03f4 c1000000 rtneq dpi_button_state_down +03f5 7046b600 jam dpi_button_state_down ,mem_mouse_dpi_button_state +03f6 6800c77a fetch 1 ,mem_mouse_dpi +03f7 1fe0fe01 increase 1 ,pdata +03f8 1fe17e03 and pdata ,0x03 ,pdata +03f9 6000c77a store 1 ,mem_mouse_dpi +03fa 20203d7e branch mouse_seting_dpi p_mouse_dpi_up: -03fa 2040054d call p_gpio_set_input_pu -03fb 20203d62 branch mouse_dpi_up +03fb 2040054d call p_gpio_set_input_pu +03fc 20203d62 branch mouse_dpi_up p_mouse_priority_bb_event: -03fc 1a627e00 copy regc ,pdata -03fd c00a0406 beq bt_evt_le_connected ,p_mouse_le_bb_event_connected -03fe c00a8417 beq bt_evt_le_disconnected ,p_mouse_le_bb_disconnected -03ff c014841a beq bt_evt_le_enc_info ,p_mouse_le_enc_info -0400 c019041c beq bt_evt_le_start_enc ,p_mouse_le_ll_start_encryt -0401 c020041e beq bt_evt_le_parse_conn_papa_update_rsp ,p_mouse_le_conn_param_update_rsp_recieved -0402 c01c8420 beq bt_evt_24g_pairing_complete ,p_mouse_24g_pairing_complete -0403 c01d0423 beq bt_evt_24g_attempt_fail ,p_mouse_24g_attempt_fail -0404 c01e0426 beq bt_evt_24g_attempt_success ,p_mouse_24g_attempt_success -0405 2020417d branch mouse_priority_bb_event + 1 +03fd 1a627e00 copy regc ,pdata +03fe c00a0407 beq bt_evt_le_connected ,p_mouse_le_bb_event_connected +03ff c00a8417 beq bt_evt_le_disconnected ,p_mouse_le_bb_disconnected +0400 c014841a beq bt_evt_le_enc_info ,p_mouse_le_enc_info +0401 c019041c beq bt_evt_le_start_enc ,p_mouse_le_ll_start_encryt +0402 c020041e beq bt_evt_le_parse_conn_papa_update_rsp ,p_mouse_le_conn_param_update_rsp_recieved +0403 c01c8420 beq bt_evt_24g_pairing_complete ,p_mouse_24g_pairing_complete +0404 c01d0423 beq bt_evt_24g_attempt_fail ,p_mouse_24g_attempt_fail +0405 c01e0426 beq bt_evt_24g_attempt_success ,p_mouse_24g_attempt_success +0406 2020417d branch mouse_priority_bb_event + 1 p_mouse_le_bb_event_connected: -0406 204003e7 call p_mouse_init_sensor_reset 0407 58000000 setarg 0 0408 6001caba store 3 ,mem_le_switch_adv_flag 0409 68034a9e fetch 6 ,mem_mouse_24g_addr_init 040a 680b4722 fetcht 6 ,mem_device1_addr 040b 98467c00 isub temp ,null -040c 24428361 ncall p_mouse_fast_conn_disable ,zero +040c 24428360 ncall p_mouse_fast_conn_disable ,zero 040d 20403410 call app_ble_store_reconn_info 040e 704ac101 jam 1 ,mem_mouse_le_bb_connected_flag 040f 6800c7a1 fetch 1 ,mem_mouse_le_reconnect_flag @@ -1529,7 +1529,7 @@ 0468 70438f00 jam 0 ,mem_le_scan_data_len 0469 d8e00007 arg mouse_store_eeprom_flag ,queue 046a 204043d2 call mouse_disable_function_flag -046b 20200365 branch p_mouse_fast_conn_init +046b 20200364 branch p_mouse_fast_conn_init p_mouse_g24_long_sleep_param_update_timer: 046c da604a96 arg mem_24g_long_sleep_param_update_timer ,regc @@ -2209,7 +2209,7 @@ p_mouse_unplug_clean_bdaddr: 062e 204042fb call mouse_before_store_reconn_info -062f 20200320 branch p_mouse_store_flash_device_info +062f 2020031f branch p_mouse_store_flash_device_info p_check_51cmd_ble_update_connect_param: 0630 20405890 call le_fifo_check_full @@ -2395,7 +2395,7 @@ 06b0 9840fe00 iadd temp ,pdata 06b1 1fe0fffb increase -5 ,pdata 06b2 6001caab store 3 ,mem_flash_address -06b3 2040035f call p_flash_release_deep_power_down +06b3 2040035e call p_flash_release_deep_power_down p_zcode_read_loop: 06b4 6801caab fetch 3 ,mem_flash_address @@ -2406,7 +2406,7 @@ 06b9 680a4aae fetcht 4 ,mem_zcode_head 06ba 98467c00 isub temp ,null 06bb 242286b4 nbranch p_zcode_read_loop ,zero -06bc 2040032e call p_mouse_spi_init +06bc 2040032d call p_mouse_spi_init 06bd 58001f00 setarg mem_zcode_buff 06be 60014199 store 2 ,mem_patch_ptr 06bf 70419b40 jam zcode_code_size ,mem_patch_len @@ -6515,6 +6515,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 @@ -35382,7 +35384,7 @@ z_mouse_start_discovery_norandom: 40008 68034ab4 fetch 6 ,mem_le_normal_lap 40009 600344a0 store 6 ,mem_le_lap -4000a 20400361 call p_mouse_fast_conn_disable +4000a 20400360 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 @@ -35392,7 +35394,7 @@ 40011 600146ae store 2 ,mem_mouse_direct_timer 40012 20400465 call p_mouse_store_eeprom_enable 40013 204043ca call mouse_bt_discovery_button_down_disable -40014 20400350 call p_mouse_load_flash_device_info +40014 2040034f call p_mouse_load_flash_device_info 40015 6800c210 fetch 1 ,mem_xrecord_mode 40016 1fe67c33 sub pdata ,rec_3_mode ,null 40017 2042801c call z3_check_51cmd_adv ,zero @@ -35496,7 +35498,7 @@ 60015 68024bc6 fetch 4 ,mem_24g_addr 60016 6002477b store 4 ,mem_mouse_24g_addr 60017 20404366 call mouse_cheak_select_24gdevice -60018 20200320 branch p_mouse_store_flash_device_info +60018 2020031f branch p_mouse_store_flash_device_info z_g24_auto_pair_timeout_clear: 60019 58000000 setarg 0 @@ -35518,7 +35520,7 @@ 60025 704a9400 jam 0 ,mem_mouse_long_mult_flag 60026 20402f20 call g24_app_tx_attempt_success 60027 204001b5 call p_g24_txbuf_clear -60028 2020037a branch p_g24_transmit_by_interrupt_enable +60028 20200379 branch p_g24_transmit_by_interrupt_enable z_g24_store_dongle_addr: 60029 68024b7e fetch 4 ,mem_24g_rxpayload + 2 @@ -35575,7 +35577,7 @@ 70020 704a9400 jam 0 ,mem_mouse_long_mult_flag 70021 20402f20 call g24_app_tx_attempt_success 70022 204001b5 call p_g24_txbuf_clear -70023 2020037a branch p_g24_transmit_by_interrupt_enable +70023 20200379 branch p_g24_transmit_by_interrupt_enable z7_g24_store_dongle_addr: 70024 68024b7e fetch 4 ,mem_24g_rxpayload + 2 @@ -35630,7 +35632,7 @@ 80007 704ac7ff jam 0xff ,mem_mouse_fast_conn_flag 80008 204042fb call mouse_before_store_reconn_info 80009 704721ff jam 0xff ,mem_device1_type -8000a 20200320 branch p_mouse_store_flash_device_info +8000a 2020031f branch p_mouse_store_flash_device_info z_g24_search_dongle: 8000b 6800ca94 fetch 1 ,mem_mouse_long_mult_flag @@ -35697,14 +35699,14 @@ 9000c 60014154 store 2 ,mem_lpm_interval 9000d 204068a2 call load_adc_init 9000e 20403e54 call mouse_adc_init -9000f 20400312 call p_mouse_load_flash_info_check +9000f 20400311 call p_mouse_load_flash_info_check 90010 6800c720 fetch 1 ,mem_device_flag 90011 c1010000 rtneq mode_24g_device 90012 68034a9e fetch 6 ,mem_mouse_24g_addr_init 90013 680b4722 fetcht 6 ,mem_device1_addr 90014 98467c00 isub temp ,null -90015 24228361 nbranch p_mouse_fast_conn_disable ,zero -90016 20200363 branch p_mouse_fast_conn_le_switch_adv +90015 24228360 nbranch p_mouse_fast_conn_disable ,zero +90016 20200362 branch p_mouse_fast_conn_le_switch_adv 90017 20600000 rtn org 0xa0001 @@ -35820,7 +35822,7 @@ b001f 204003ca call p_mouse_data_init b0020 20405816 call le_clr_config_more_data b0021 204041d9 call mouse_bb_disconnected -b0022 20400320 call p_mouse_store_flash_device_info +b0022 2040031f call p_mouse_store_flash_device_info b0023 6800cabd fetch 1 ,mem_mouse_start_discovery_enable b0024 207a0000 rtn blank @@ -35837,13 +35839,13 @@ b002c 20402c21 call lpm_write_ctrl b002d 204074bd call disable_authrom b002e 20404482 call mouse_devce_led_off -b002f 20400320 call p_mouse_store_flash_device_info +b002f 2040031f call p_mouse_store_flash_device_info b0030 20403e9f call mouse_before_hibernate_wheel_gpio_set b0031 204000e5 call p_mouse_setgpio_hibernate b0032 6800c720 fetch 1 ,mem_device_flag b0033 1fe67c02 sub pdata ,mode_24g_device ,null b0034 2042803e call z_mouse_select_device_button_gpio_set_suspend ,zero -b0035 20400357 call p_flash_deep_power_down +b0035 20400356 call p_flash_deep_power_down b0036 68108081 hfetch 1 ,core_gpio_sel1 b0037 1fe17ef7 and pdata ,0xf7 ,pdata b0038 60108081 hstore 1 ,core_gpio_sel1 @@ -35898,6 +35900,6 @@ c0019 704a5200 jam 0 ,mem_bt_rcvd_switch_req_accept c001a 704a5400 jam 0 ,mem_bt_send_lmp_setup_complete c001b 704a5d00 jam 0 ,mem_mouse_bt_send_first_package_flag -c001c 20400320 call p_mouse_store_flash_device_info +c001c 2040031f 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/SlideSwitch_BH-G600-Desktop/output/romcode.rom (revision 2533) +++ /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_BH-G600-Desktop/output/romcode.rom (working copy) @@ -24701,7 +24701,7 @@ 70479e00 68034ab4 600344a0 -20400361 +20400360 20403418 68014687 600146ac @@ -24711,7 +24711,7 @@ 600146ae 20400465 204043ca -20400350 +2040034f 6800c210 1fe67c33 2042801c @@ -24789,7 +24789,7 @@ 68024bc6 6002477b 20404366 -20200320 +2020031f 58000000 6001cce9 20600000 @@ -24805,7 +24805,7 @@ 704a9400 20402f20 204001b5 -2020037a +20200379 68024b7e 202001ea 70119eff @@ -24851,7 +24851,7 @@ 704a9400 20402f20 204001b5 -2020037a +20200379 68024b7e 202001ea 704b9f01 @@ -24889,7 +24889,7 @@ 704ac7ff 204042fb 704721ff -20200320 +2020031f 6800ca94 207a0000 6800cbca @@ -24941,14 +24941,14 @@ 60014154 204068a2 20403e54 -20400312 +20400311 6800c720 c1010000 68034a9e 680b4722 98467c00 -24228361 -20200363 +24228360 +20200362 20600000 c0480004 c048801e @@ -25028,7 +25028,7 @@ 204003ca 20405816 204041d9 -20400320 +2040031f 6800cabd 207a0000 68034ab4 @@ -25041,13 +25041,13 @@ 20402c21 204074bd 20404482 -20400320 +2040031f 20403e9f 204000e5 6800c720 1fe67c02 2042803e -20400357 +20400356 68108081 1fe17ef7 60108081 @@ -25085,6 +25085,6 @@ 704a5200 704a5400 704a5d00 -20400320 +2040031f 202041d9 -0000e56f +0000bb90 Index: program/bt.prog =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_BH-G600-Desktop/program/bt.prog (revision 2533) +++ /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_BH-G600-Desktop/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/SlideSwitch_BH-G600-Desktop/program/patch.prog (revision 2533) +++ /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_BH-G600-Desktop/program/patch.prog (working copy) @@ -1303,7 +1303,6 @@ isub temp,null rtn zero call twspi_write - nop 12000 increase 2,regc branch p_sensor_wr_seq @@ -1565,6 +1564,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: @@ -1700,7 +1700,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: @@ -1802,7 +1803,7 @@ ifdef BLE p_mouse_le_bb_event_connected: - 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 @@ -1859,7 +1860,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/SlideSwitch_BH-G600-Desktop/sched/mouse.dat (revision 2533) +++ /branch/mouse_project/YJX_Project/YJX_1059/SlideSwitch_BH-G600-Desktop/sched/mouse.dat (working copy) @@ -468,7 +468,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: 02