Index: format/app_mouse.format =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Only2.4G/MingAo_Only2.4G_LRpair/format/app_mouse.format (revision 663) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Only2.4G/MingAo_Only2.4G_LRpair/format/app_mouse.format (working copy) @@ -438,6 +438,8 @@ //byte 8 0x38 MOUSE_ENABLE_SMOOTHER 0x39 MOUSE_ENABLE_XY_OFFSET +0x3a MOUSE_ENABLE_24G_AUTO_PAIR_NERVER_BEEN_PAIRED +0x3b MOUSE_ENABLE_LE_BATTERY_SERVICE_CANCEL //mouse dpi level 0x00 MOUSE_DPI_LEVEL1 Index: output/eeprom.dat =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Only2.4G/MingAo_Only2.4G_LRpair/output/eeprom.dat (revision 663) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Only2.4G/MingAo_Only2.4G_LRpair/output/eeprom.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -06 +3a 04 c2 84 @@ -14,8 +14,8 @@ 11 c0 45 -00 -fb +01 +08 c0 45 80 @@ -31,7 +31,7 @@ c0 61 80 -8d +9a c0 64 80 @@ -43,11 +43,11 @@ c0 67 00 -9c +a9 c0 68 00 -b6 +c3 c0 6b 00 @@ -55,19 +55,19 @@ c0 6c 80 -c7 +d4 20 20 13 7c c0 10 -80 -f9 +81 +06 c0 43 -80 -f5 +81 +02 20 20 13 @@ -366,8 +366,8 @@ 03 20 40 -00 -fe +01 +0b 20 20 12 @@ -431,7 +431,7 @@ 20 40 00 -d9 +e6 20 20 3e @@ -531,7 +531,11 @@ c0 1e 00 -85 +86 +c0 +1d +00 +8c 20 20 43 @@ -540,18 +544,6 @@ e2 48 3c -68 -4a -48 -8d -98 -46 -7c -00 -20 -22 -80 -8b 67 e2 48 @@ -562,6 +554,10 @@ 93 20 40 +25 +7e +20 +40 48 c6 20 @@ -569,6 +565,62 @@ 48 4e 6f +e0 +c8 +a5 +24 +3a +47 +e1 +6f +e0 +c8 +8b +c0 +01 +00 +91 +20 +20 +48 +37 +6f +e4 +4b +ab +c2 +97 +c8 +11 +c2 +98 +48 +11 +c3 +1d +48 +06 +6f +e2 +49 +93 +68 +4a +49 +74 +98 +46 +7c +00 +20 +22 +c8 +27 +20 +20 +48 +06 +6f e4 4b ab @@ -583,7 +635,7 @@ c0 00 00 -92 +9f 20 20 3d @@ -675,7 +727,7 @@ 24 34 00 -ab +b8 20 40 47 @@ -683,7 +735,7 @@ 20 40 00 -ae +bb 20 20 45 @@ -739,7 +791,7 @@ 20 40 00 -b9 +c6 20 20 40 @@ -791,7 +843,7 @@ 20 3a 00 -e0 +ed 67 e0 cb @@ -827,11 +879,11 @@ 20 40 00 -dd +ea 20 40 00 -d0 +dd 20 20 44 @@ -867,7 +919,7 @@ da 40 00 -d9 +e6 20 20 31 @@ -895,7 +947,7 @@ da 40 00 -e0 +ed 20 20 31 @@ -951,11 +1003,11 @@ 20 41 00 -ef +fc 24 41 +01 00 -f3 20 20 48 @@ -1014,8 +1066,8 @@ e8 c0 4f -80 -fe +81 +0b 20 20 12 @@ -1032,8 +1084,8 @@ 20 12 2a -e2 -54 +47 +90 aa 55 40 @@ -1183,7 +1235,7 @@ 00 00 02 -03 +07 aa 55 0c @@ -2206,62 +2258,10 @@ aa aa 55 -09 +0d 5a -a5 -37 -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff +76 +3f ff ff ff @@ -8188,5 +8188,5 @@ ff ff ff -03 -3c +13 +0b Index: output/program.lis =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Only2.4G/MingAo_Only2.4G_LRpair/output/program.lis (revision 663) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Only2.4G/MingAo_Only2.4G_LRpair/output/program.lis (working copy) @@ -2,22 +2,22 @@ org 0x0000 0000 c284000e bbit1 8 ,pf_patch_ext 0001 c0000011 beq patch00_0 ,p_soft_reset -0002 c04500fb beq patch11_2 ,p_txon +0002 c0450108 beq patch11_2 ,p_txon 0003 c0458049 beq patch11_3 ,p_initialize_radio_cont 0004 c04f8047 beq patch13_7 ,p_init_param 0005 c0570015 beq patch15_6 ,p_app_init -0006 c061808d beq patch18_3 ,p_mouse_start_work +0006 c061809a beq patch18_3 ,p_mouse_start_work 0007 c064805c beq patch19_1 ,p_mouse_setgpio_hibernate 0008 c065006c beq patch19_2 ,p_mouse_lpm_before_common -0009 c067009c beq patch19_6 ,p_mouse_motion -000a c06800b6 beq patch1a_0 ,p_mouse_seting_dpi +0009 c06700a9 beq patch19_6 ,p_mouse_motion +000a c06800c3 beq patch1a_0 ,p_mouse_seting_dpi 000b c06b0082 beq patch1a_6 ,p_mouse_priority_bb_event -000c c06c80c7 beq patch1b_1 ,p_mouse_bb_event_timer +000c c06c80d4 beq patch1b_1 ,p_mouse_bb_event_timer 000d 2020137c branch loop pf_patch_ext: -000e c01080f9 beq patch24_1 ,p_spid_init -000f c04380f5 beq patch30_7 ,p_ui_timer_check +000e c0108106 beq patch24_1 ,p_spid_init +000f c0438102 beq patch30_7 ,p_ui_timer_check 0010 2020137c branch loop p_soft_reset: @@ -114,7 +114,7 @@ 0057 20000064 nop 100 0058 708a020e jam 0x0e ,core_clkpll_ctrl2 0059 708a0003 jam 0x03 ,core_clkpll_ctrl0 -005a 204000fe call p_set_tx_power_pair +005a 2040010b call p_set_tx_power_pair 005b 20201265 branch initialize_radio_cont_next2 p_mouse_setgpio_hibernate: @@ -134,7 +134,7 @@ 0067 6fe0c920 fetch 1 ,mem_mouse_sensor_sdio_gpio 0068 d840003f arg gpcfg_output_high ,temp 0069 20406093 call gpio_config_function_int -006a 204000d9 call p_mouse_logo_led_on_timeout +006a 204000e6 call p_mouse_logo_led_on_timeout 006b 20203e36 branch mouse_setgpio_hibernate + 3 p_mouse_lpm_before_common: @@ -163,174 +163,189 @@ p_mouse_priority_bb_event: 0082 1a627e00 copy regc ,pdata -0083 c01e0085 beq bt_evt_24g_attempt_success ,p_mouse_24g_attempt_success -0084 20204336 branch mouse_priority_bb_event + 2 +0083 c01e0086 beq bt_evt_24g_attempt_success ,p_mouse_24g_attempt_success +0084 c01d008c beq bt_evt_24g_attempt_fail ,p_mouse_24g_attempt_fail +0085 20204336 branch mouse_priority_bb_event + 2 p_mouse_24g_attempt_success: -0085 6fe2483c fetch 4 ,mem_24g_addr -0086 684a488d fetcht 4 ,mem_24g_fast_conn_addr -0087 98467c00 isub temp ,null -0088 2022808b branch p_mouse_24g_attempt_success_skip_store_addr ,zero -0089 67e24891 store 4 ,mem_24g_receiver_addr -008a 67e24993 store 4 ,mem_mouse_24g_addr - -p_mouse_24g_attempt_success_skip_store_addr: -008b 204048c6 call mouse_device_poweron_timer_init -008c 2020484e branch mouse_24g_attempt_success +0086 6fe2483c fetch 4 ,mem_24g_addr +0087 67e24891 store 4 ,mem_24g_receiver_addr +0088 67e24993 store 4 ,mem_mouse_24g_addr +0089 2040257e call g24_ch_syncword_crc8_init +008a 204048c6 call mouse_device_poweron_timer_init +008b 2020484e branch mouse_24g_attempt_success + +p_mouse_24g_attempt_fail: +008c 6fe0c8a5 fetch 1 ,mem_24g_attempt_fail_flag +008d 243a47e1 nbranch mouse_24g_hibernate_set ,blank +008e 6fe0c88b fetch 1 ,mem_24g_reconn_type +008f c0010091 beq fast_conn_and_3_0_addr ,p_mouse_24g_fast_conn_attempt_fail +0090 20204837 branch mouse_24g_attempt_fail + 4 + +p_mouse_24g_fast_conn_attempt_fail: +0091 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +0092 c297c811 bbit1 mouse_enable_24g_first_auto_pairing ,mouse_24g_start_auto_pair +0093 c2984811 bbit1 mouse_enable_auto_24g_paring ,mouse_24g_start_auto_pair +0094 c31d4806 bbit0 mouse_enable_24g_auto_pair_nerver_been_paired ,mouse_24g_reconn_dongle_start +0095 6fe24993 fetch 4 ,mem_mouse_24g_addr +0096 684a4974 fetcht 4 ,mem_mouse_compare_addr_ff +0097 98467c00 isub temp ,null +0098 2022c827 branch mouse_24g_start_pair_mode ,zero +0099 20204806 branch mouse_24g_reconn_dongle_start p_mouse_start_work: -008d 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -008e c297c80a bbit1 mouse_enable_24g_first_auto_pairing ,mouse_24g_first_start_auto_pair_mode -008f 6fe0c938 fetch 1 ,mem_device_flag -0090 c0000092 beq mode_24g_device ,p_mouse_24g_start_mode -0091 20203d57 branch mouse_start_work + 5 +009a 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +009b c297c80a bbit1 mouse_enable_24g_first_auto_pairing ,mouse_24g_first_start_auto_pair_mode +009c 6fe0c938 fetch 1 ,mem_device_flag +009d c000009f beq mode_24g_device ,p_mouse_24g_start_mode +009e 20203d57 branch mouse_start_work + 5 p_mouse_24g_start_mode: -0092 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -0093 c308c803 bbit0 mouse_enable_24g ,mouse_24g_mode_setup_error -0094 20403d65 call mouse_wakeup_from_power_check -0095 20344806 branch mouse_24g_reconn_dongle_start ,user -0096 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -0097 c298480c bbit1 mouse_enable_auto_24g_paring ,mouse_24g_reconn_general_dongle -0098 c318c80c bbit0 mouse_enable_24g_power_on_pairing ,mouse_24g_reconn_general_dongle -0099 20404110 call mouse_key_check_once -009a 1a217e07 and rega ,0x07 ,pdata -009b 202047ff branch mouse_24g_start_mode + 9 +009f 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +00a0 c308c803 bbit0 mouse_enable_24g ,mouse_24g_mode_setup_error +00a1 20403d65 call mouse_wakeup_from_power_check +00a2 20344806 branch mouse_24g_reconn_dongle_start ,user +00a3 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +00a4 c298480c bbit1 mouse_enable_auto_24g_paring ,mouse_24g_reconn_general_dongle +00a5 c318c80c bbit0 mouse_enable_24g_power_on_pairing ,mouse_24g_reconn_general_dongle +00a6 20404110 call mouse_key_check_once +00a7 1a217e07 and rega ,0x07 ,pdata +00a8 202047ff branch mouse_24g_start_mode + 9 p_mouse_motion: -009c 78547c00 disable user -009d 58000000 setarg 0 -009e 67e348d1 store 6 ,mem_mouse_x -009f 20404240 call mouse_check_sensor_data -00a0 2040408e call mouse_dpi_config -00a1 20403f7e call mouse_zwheel -00a2 20403f83 call mouse_t_zwheel -00a3 204040dc call mouse_key -00a4 6fe0c8d0 fetch 1 ,mem_mouse_key -00a5 1fe17e1f and_into 0x1f ,pdata -00a6 67e0c8d0 store 1 ,mem_mouse_key -00a7 243400ab nbranch p_mouse_motion_nodata ,user -00a8 2040471a call mouse_drawing_optima -00a9 204000ae call p_mouse_logo_led_on_check -00aa 20204544 branch mouse_no_data_timer_init +00a9 78547c00 disable user +00aa 58000000 setarg 0 +00ab 67e348d1 store 6 ,mem_mouse_x +00ac 20404240 call mouse_check_sensor_data +00ad 2040408e call mouse_dpi_config +00ae 20403f7e call mouse_zwheel +00af 20403f83 call mouse_t_zwheel +00b0 204040dc call mouse_key +00b1 6fe0c8d0 fetch 1 ,mem_mouse_key +00b2 1fe17e1f and_into 0x1f ,pdata +00b3 67e0c8d0 store 1 ,mem_mouse_key +00b4 243400b8 nbranch p_mouse_motion_nodata ,user +00b5 2040471a call mouse_drawing_optima +00b6 204000bb call p_mouse_logo_led_on_check +00b7 20204544 branch mouse_no_data_timer_init p_mouse_motion_nodata: -00ab 20404728 call mouse_drawing_optima_init -00ac 704be400 jam 0 ,mem_mouse_logo_led_on_check_count -00ad 20600000 rtn +00b8 20404728 call mouse_drawing_optima_init +00b9 704be400 jam 0 ,mem_mouse_logo_led_on_check_count +00ba 20600000 rtn p_mouse_logo_led_on_check: -00ae 6fe0cbe4 fetch 1 ,mem_mouse_logo_led_on_check_count -00af 1fe0fe01 increase 1 ,pdata -00b0 67e0cbe4 store 1 ,mem_mouse_logo_led_on_check_count -00b1 1fe67c08 sub pdata ,low_voltage_led_count ,null -00b2 20610000 rtn positive +00bb 6fe0cbe4 fetch 1 ,mem_mouse_logo_led_on_check_count +00bc 1fe0fe01 increase 1 ,pdata +00bd 67e0cbe4 store 1 ,mem_mouse_logo_led_on_check_count +00be 1fe67c08 sub pdata ,low_voltage_led_count ,null +00bf 20610000 rtn positive p_mouse_logo_led_on: -00b3 58000258 setarg 0x0258 -00b4 67e14be5 store 2 ,mem_mouse_logo_led_on_timer -00b5 20600000 rtn +00c0 58000258 setarg 0x0258 +00c1 67e14be5 store 2 ,mem_mouse_logo_led_on_timer +00c2 20600000 rtn p_mouse_seting_dpi: -00b6 2040408f call mouse_setting_dpi_4_level -00b7 204000b9 call p_mouse_dpi_led_blink_delay -00b8 20204098 branch mouse_seting_sensor_type +00c3 2040408f call mouse_setting_dpi_4_level +00c4 204000c6 call p_mouse_dpi_led_blink_delay +00c5 20204098 branch mouse_seting_sensor_type p_mouse_dpi_led_blink_delay: -00b9 6fe0c923 fetch 1 ,mem_dpi_led_gpio -00ba c17f8000 rtneq gpio_disable -00bb 6fe14ac2 fetch 2 ,mem_mouse_discovery_timer -00bc 247a0000 nrtn blank -00bd 6fe14883 fetch 2 ,mem_24g_pair_timeout -00be 247a0000 nrtn blank -00bf 6fe14887 fetch 2 ,mem_24g_reconn_timeout -00c0 247a0000 nrtn blank -00c1 6fe0cba7 fetch 1 ,mem_mouse_device_poweron_timer_count -00c2 247a0000 nrtn blank -00c3 6fe0cbc1 fetch 1 ,mem_mouse_dpi_led_delay_count_init -00c4 203a00e0 branch p_mouse_dpi_led_blink_init ,blank -00c5 67e0cba8 store 1 ,mem_mouse_dpi_led_delay_count -00c6 20600000 rtn +00c6 6fe0c923 fetch 1 ,mem_dpi_led_gpio +00c7 c17f8000 rtneq gpio_disable +00c8 6fe14ac2 fetch 2 ,mem_mouse_discovery_timer +00c9 247a0000 nrtn blank +00ca 6fe14883 fetch 2 ,mem_24g_pair_timeout +00cb 247a0000 nrtn blank +00cc 6fe14887 fetch 2 ,mem_24g_reconn_timeout +00cd 247a0000 nrtn blank +00ce 6fe0cba7 fetch 1 ,mem_mouse_device_poweron_timer_count +00cf 247a0000 nrtn blank +00d0 6fe0cbc1 fetch 1 ,mem_mouse_dpi_led_delay_count_init +00d1 203a00ed branch p_mouse_dpi_led_blink_init ,blank +00d2 67e0cba8 store 1 ,mem_mouse_dpi_led_delay_count +00d3 20600000 rtn p_mouse_bb_event_timer: -00c7 20403e9b call mouse_adc_read -00c8 20404956 call mouse_low_voltage_led_timer -00c9 2040232b call g24_pair_timeout_timer -00ca 20402556 call g24_reconn_timeout_timer -00cb 204047cd call mouse_24g_long_sleep_param_update_timer -00cc 204048be call mouse_device_poweron_timer -00cd 204000dd call p_mouse_dpi_led_blink_delay_timer -00ce 204000d0 call p_mouse_logo_led_on_timer -00cf 202044bd branch mouse_bb_event_timer + 8 +00d4 20403e9b call mouse_adc_read +00d5 20404956 call mouse_low_voltage_led_timer +00d6 2040232b call g24_pair_timeout_timer +00d7 20402556 call g24_reconn_timeout_timer +00d8 204047cd call mouse_24g_long_sleep_param_update_timer +00d9 204048be call mouse_device_poweron_timer +00da 204000ea call p_mouse_dpi_led_blink_delay_timer +00db 204000dd call p_mouse_logo_led_on_timer +00dc 202044bd branch mouse_bb_event_timer + 8 p_mouse_logo_led_on_timer: -00d0 6fe0cbe3 fetch 1 ,mem_mouse_logo_led_gpio -00d1 c17f8000 rtneq gpio_disable -00d2 6fe14be5 fetch 2 ,mem_mouse_logo_led_on_timer -00d3 207a0000 rtn blank -00d4 6848cbe3 fetcht 1 ,mem_mouse_logo_led_gpio -00d5 20406069 call gpio_out_active -00d6 da604be5 arg mem_mouse_logo_led_on_timer ,regc -00d7 da4000d9 arg p_mouse_logo_led_on_timeout ,regb -00d8 20203191 branch timer_single_step_2b +00dd 6fe0cbe3 fetch 1 ,mem_mouse_logo_led_gpio +00de c17f8000 rtneq gpio_disable +00df 6fe14be5 fetch 2 ,mem_mouse_logo_led_on_timer +00e0 207a0000 rtn blank +00e1 6848cbe3 fetcht 1 ,mem_mouse_logo_led_gpio +00e2 20406069 call gpio_out_active +00e3 da604be5 arg mem_mouse_logo_led_on_timer ,regc +00e4 da4000e6 arg p_mouse_logo_led_on_timeout ,regb +00e5 20203191 branch timer_single_step_2b p_mouse_logo_led_on_timeout: -00d9 58000000 setarg 0 -00da 67e14be5 store 2 ,mem_mouse_logo_led_on_timer -00db 6848cbe3 fetcht 1 ,mem_mouse_logo_led_gpio -00dc 20206065 branch gpio_out_inactive +00e6 58000000 setarg 0 +00e7 67e14be5 store 2 ,mem_mouse_logo_led_on_timer +00e8 6848cbe3 fetcht 1 ,mem_mouse_logo_led_gpio +00e9 20206065 branch gpio_out_inactive p_mouse_dpi_led_blink_delay_timer: -00dd da604ba8 arg mem_mouse_dpi_led_delay_count ,regc -00de da4000e0 arg p_mouse_dpi_led_blink_init ,regb -00df 2020318a branch timer_single_step +00ea da604ba8 arg mem_mouse_dpi_led_delay_count ,regc +00eb da4000ed arg p_mouse_dpi_led_blink_init ,regb +00ec 2020318a branch timer_single_step p_mouse_dpi_led_blink_init: -00e0 6fe0c927 fetch 1 ,mem_config_sensor_type -00e1 c001c8f2 beq p3212 ,mouse_dpi_led_blink_init -00e2 c005c8f2 beq ka8g2 ,mouse_dpi_led_blink_init -00e3 6fe0c923 fetch 1 ,mem_dpi_led_gpio -00e4 67e0c92f store 1 ,mem_mouse_struct_led_gpio -00e5 6fe14bc2 fetch 2 ,mem_mouse_dpi_led_blink_time -00e6 67e14930 store 2 ,mem_mouse_on_time -00e7 67e14932 store 2 ,mem_mouse_off_time -00e8 da200000 arg 0 ,rega -00e9 6848c992 fetcht 1 ,mem_mouse_dpi -00ea 18408402 increase 2 ,temp -00eb 18467c03 sub temp ,3 ,null -00ec 204100ef call p_mouse_dpi_led_blink_init_level_4 ,positive -00ed 244100f3 ncall p_mouse_dpi_led_blink_count_clean ,positive -00ee 202048ff branch mouse_dpi_led_blink_init_end +00ed 6fe0c927 fetch 1 ,mem_config_sensor_type +00ee c001c8f2 beq p3212 ,mouse_dpi_led_blink_init +00ef c005c8f2 beq ka8g2 ,mouse_dpi_led_blink_init +00f0 6fe0c923 fetch 1 ,mem_dpi_led_gpio +00f1 67e0c92f store 1 ,mem_mouse_struct_led_gpio +00f2 6fe14bc2 fetch 2 ,mem_mouse_dpi_led_blink_time +00f3 67e14930 store 2 ,mem_mouse_on_time +00f4 67e14932 store 2 ,mem_mouse_off_time +00f5 da200000 arg 0 ,rega +00f6 6848c992 fetcht 1 ,mem_mouse_dpi +00f7 18408402 increase 2 ,temp +00f8 18467c03 sub temp ,3 ,null +00f9 204100fc call p_mouse_dpi_led_blink_init_level_4 ,positive +00fa 24410100 ncall p_mouse_dpi_led_blink_count_clean ,positive +00fb 202048ff branch mouse_dpi_led_blink_init_end p_mouse_dpi_led_blink_init_level_4: -00ef 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -00f0 c40e0000 rtnbit0 mouse_enable_dpi_level_4 -00f1 18408401 increase 1 ,temp -00f2 20600000 rtn +00fc 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +00fd c40e0000 rtnbit0 mouse_enable_dpi_level_4 +00fe 18408401 increase 1 ,temp +00ff 20600000 rtn p_mouse_dpi_led_blink_count_clean: -00f3 184085fd increase -3 ,temp -00f4 20600000 rtn +0100 184085fd increase -3 ,temp +0101 20600000 rtn p_ui_timer_check: -00f5 6fe0cbe7 fetch 1 ,mem_power_on_flag -00f6 245a7861 ncall ui_timer_init ,blank -00f7 704be700 jam 0 ,mem_power_on_flag -00f8 20207851 branch ui_timer_check + 1 +0102 6fe0cbe7 fetch 1 ,mem_power_on_flag +0103 245a7861 ncall ui_timer_init ,blank +0104 704be700 jam 0 ,mem_power_on_flag +0105 20207851 branch ui_timer_check + 1 p_spid_init: -00f9 70448476 jam 0x76 ,mem_spi_init_clk -00fa 20205cb6 branch spid_init_common +0106 70448476 jam 0x76 ,mem_spi_init_clk +0107 20205cb6 branch spid_init_common p_txon: -00fb 6fe0c1e8 fetch 1 ,mem_tx_power -00fc c04f80fe beq tx_power_pair ,p_set_tx_power_pair -00fd 2020121f branch txon_next +0108 6fe0c1e8 fetch 1 ,mem_tx_power +0109 c04f810b beq tx_power_pair ,p_set_tx_power_pair +010a 2020121f branch txon_next p_set_tx_power_pair: -00fe 708a3905 jam 0x05 ,core_tx_pwr_ctrl0 -00ff 708a3a00 jam 0x00 ,core_tx_pwr_ctrl1 -0100 2020122a branch set_rf_ldo_cfg89 +010b 708a3905 jam 0x05 ,core_tx_pwr_ctrl0 +010c 708a3a00 jam 0x00 ,core_tx_pwr_ctrl1 +010d 2020122a branch set_rf_ldo_cfg89 org 0x800 start: Index: program/patch.prog =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Only2.4G/MingAo_Only2.4G_LRpair/program/patch.prog (revision 663) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Only2.4G/MingAo_Only2.4G_LRpair/program/patch.prog (working copy) @@ -1,6 +1,4 @@ -//define G24_AUTO_PAIR_NERVER_BEEN_PAIRED - bbit1 8,pf_patch_ext beq patch00_0,p_soft_reset @@ -182,24 +180,19 @@ p_mouse_priority_bb_event: copy regc,pdata -ifdef define G24_AUTO_PAIR_NERVER_BEEN_PAIRED - beq BT_EVT_24G_ATTEMPT_FAIL,p_mouse_24g_attempt_fail -endif beq BT_EVT_24G_ATTEMPT_SUCCESS,p_mouse_24g_attempt_success + beq BT_EVT_24G_ATTEMPT_FAIL,p_mouse_24g_attempt_fail branch mouse_priority_bb_event+2 p_mouse_24g_attempt_success: fetch 4,mem_24g_addr - fetcht 4,mem_24g_fast_conn_addr - isub temp,null - branch p_mouse_24g_attempt_success_skip_store_addr,zero store 4,mem_24g_receiver_addr store 4,mem_mouse_24g_addr // if need store 24g address to eeprom/flash,need get mem_24g_addr -p_mouse_24g_attempt_success_skip_store_addr: + call g24_ch_syncword_crc8_init call mouse_device_poweron_timer_init branch mouse_24g_attempt_success -ifdef define G24_AUTO_PAIR_NERVER_BEEN_PAIRED + p_mouse_24g_attempt_fail: fetch 1,mem_24g_attempt_fail_flag nbranch mouse_24g_hibernate_set,blank @@ -211,12 +204,12 @@ fetch MOUSE_FLAG_LEN,mem_mouse_flag bbit1 MOUSE_ENABLE_24G_FIRST_AUTO_PAIRING,mouse_24g_start_auto_pair bbit1 MOUSE_ENABLE_AUTO_24G_PARING,mouse_24g_start_auto_pair + bbit0 MOUSE_ENABLE_24G_AUTO_PAIR_NERVER_BEEN_PAIRED,mouse_24g_reconn_dongle_start fetch 4,mem_mouse_24g_addr // auto pair first time fetcht 4,mem_mouse_compare_addr_ff isub temp,null branch mouse_24g_start_pair_mode,zero branch mouse_24g_reconn_dongle_start -endif p_mouse_start_work: Index: sched/mouse.dat =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Only2.4G/MingAo_Only2.4G_LRpair/sched/mouse.dat (revision 663) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Only2.4G/MingAo_Only2.4G_LRpair/sched/mouse.dat (working copy) @@ -83,7 +83,8 @@ #mouse flag byte8 #bit0 MOUSE_ENABLE_SMOOTHER #bit1 MOUSE_ENABLE_XY_OFFSET - +#bit2 MOUSE_ENABLE_24G_AUTO_PAIR_NERVER_BEEN_PAIRED +#bit3 MOUSE_ENABLE_LE_BATTERY_SERVICE_CANCEL mem_mouse_flag: @@ -105,7 +106,7 @@ 00 02 #dip(matrix)+2.4 first #updata 1byte -03 +07 mem_mouse_discovery_timeout:b0 04 #2min mem_mouse_24g_pair_timeout_init:58 02 #1min 24g reconn timer&pair timer