Index: output/eeprom.dat =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/SlideSwitch_3m_3ch_272/output/eeprom.dat (revision 4672) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/SlideSwitch_3m_3ch_272/output/eeprom.dat (working copy) @@ -43,7 +43,7 @@ c0 52 00 -6d +6e c0 57 01 @@ -55,7 +55,7 @@ c0 62 00 -75 +76 c0 63 82 @@ -143,7 +143,7 @@ c0 0c 00 -57 +58 c0 0d 05 @@ -151,7 +151,7 @@ c0 0f 80 -61 +62 c0 10 00 @@ -159,7 +159,7 @@ c0 15 80 -3c +3d c0 19 80 @@ -191,7 +191,7 @@ c0 6c 80 -44 +45 c0 71 03 @@ -240,6 +240,10 @@ 40 12 4a +70 +47 +8f +14 20 20 08 @@ -291,7 +295,7 @@ c0 06 00 -49 +4a 20 20 20 @@ -323,7 +327,7 @@ 20 20 00 -50 +51 18 00 22 @@ -363,7 +367,7 @@ c0 09 80 -5b +5c 20 20 54 @@ -415,7 +419,7 @@ c0 02 00 -68 +69 20 20 5a @@ -472,10 +476,6 @@ 20 14 e3 -20 -40 -04 -16 da 20 49 @@ -3515,7 +3515,7 @@ 20 20 00 -75 +76 20 40 3d @@ -6460,8 +6460,8 @@ 60 00 00 -1f -17 +53 +7b aa 55 40 @@ -6708,7 +6708,7 @@ 45 4c 02 -14 +0a aa 55 03 @@ -7823,10 +7823,10 @@ aa aa 55 -58 +4e 99 -26 -8e +73 +52 ff ff ff Index: output/program.lis =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/SlideSwitch_3m_3ch_272/output/program.lis (revision 4672) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/SlideSwitch_3m_3ch_272/output/program.lis (working copy) @@ -9,10 +9,10 @@ 0006 c045814b beq patch11_3 ,p_initialize_radio_cont 0007 c04600b8 beq patch11_4 ,p_save_rssi 0008 c04f815f beq patch13_7 ,p_init_param -0009 c052006d beq patch14_4 ,p_lpm_dispatch +0009 c052006e beq patch14_4 ,p_lpm_dispatch 000a c0570161 beq patch15_6 ,p_app_init 000b c0618364 beq patch18_3 ,p_mouse_start_work -000c c0620075 beq patch18_4 ,p_mouse_start_reconnect_device +000c c0620076 beq patch18_4 ,p_mouse_start_reconnect_device 000d c0638271 beq patch18_7 ,p_mouse_app_enter_hibernate 000e c0648277 beq patch19_1 ,p_mouse_setgpio_hibernate 000f c06502a9 beq patch19_2 ,p_mouse_lpm_before_common @@ -36,11 +36,11 @@ 0021 2020137c branch loop pf_patch_ext: -0022 c00c0057 beq patch23_0 ,p_parse_lmp_accepted +0022 c00c0058 beq patch23_0 ,p_parse_lmp_accepted 0023 c00d0509 beq patch23_2 ,p_send_lmp -0024 c00f8061 beq patch23_7 ,p_process_conn_sm +0024 c00f8062 beq patch23_7 ,p_process_conn_sm 0025 c0100081 beq patch24_0 ,p_twspi_reset -0026 c015803c beq patch25_3 ,p_efuse_vdd_off +0026 c015803d beq patch25_3 ,p_efuse_vdd_off 0027 c01980da beq patch26_3 ,p_adc_init_data 0028 c01a00df beq patch26_4 ,p_enable_adc 0029 c04384f1 beq patch30_7 ,p_ui_timer_check @@ -48,7 +48,7 @@ 002b c051851d beq patch34_3 ,p_le_slave_unsync 002c c05a851f beq patch36_5 ,p_le_transmit 002d c0600529 beq patch38_0 ,p_le_parse_l2cap -002e c06c8044 beq patch3b_1 ,p_le_pairing_sm +002e c06c8045 beq patch3b_1 ,p_le_pairing_sm 002f c071032b beq patch3c_2 ,p_g24_pair_dispatch 0030 c0748333 beq patch3d_1 ,p_g24_reconn_dispatch 0031 c075020f beq patch3d_2 ,p_g24_transmit_no_interrupt @@ -63,87 +63,87 @@ 0038 24558089 ncall p_led_num_check ,wake 0039 20403bfd call mouse_xtal_init 003a 2040124a call initialize_radio -003b 20200805 branch soft_reset + 4 +003b 70478f14 jam 0x14 ,mem_ui_button_timeout +003c 20200805 branch soft_reset + 4 p_efuse_vdd_off: -003c 6ff08a0b fetch 1 ,core_rf_ldo_en1 -003d 793ffe05 set0 5 ,pdata -003e 793ffe04 set0 4 ,pdata -003f 793ffe00 set0 0 ,pdata -0040 67f08a0b store 1 ,core_rf_ldo_en1 -0041 20000018 nop 24 -0042 793ffe03 set0 3 ,pdata -0043 20205ea4 branch efuse_vdd_off + 6 +003d 6ff08a0b fetch 1 ,core_rf_ldo_en1 +003e 793ffe05 set0 5 ,pdata +003f 793ffe04 set0 4 ,pdata +0040 793ffe00 set0 0 ,pdata +0041 67f08a0b store 1 ,core_rf_ldo_en1 +0042 20000018 nop 24 +0043 793ffe03 set0 3 ,pdata +0044 20205ea4 branch efuse_vdd_off + 6 p_le_pairing_sm: -0044 20401b77 call le_fifo_check_nearly_full -0045 247a0000 nrtn blank -0046 6fe0c39b fetch 1 ,mem_le_pairing_state -0047 c0060049 beq flag_le_paring_send_master_identification ,p_le_pairng_sm_send_master_indentification -0048 20202081 branch le_pairing_sm + 4 +0045 20401b77 call le_fifo_check_nearly_full +0046 247a0000 nrtn blank +0047 6fe0c39b fetch 1 ,mem_le_pairing_state +0048 c006004a beq flag_le_paring_send_master_identification ,p_le_pairng_sm_send_master_indentification +0049 20202081 branch le_pairing_sm + 4 p_le_pairng_sm_send_master_indentification: -0049 6fe0c34f fetch 1 ,mem_le_preq_resp_key_distribution -004a 6848c356 fetcht 1 ,mem_le_pres_resp_key_distribution -004b 98417e00 iand temp ,pdata -004c 2fec0001 isolate0 le_initator_irk_bit ,pdata -004d 2020a0b1 branch le_parse_start_enc_rsp_after_auth_end ,true -004e 70439b0d jam flag_le_paring_send_indentity_information ,mem_le_pairing_state -004f 20200050 branch p_le_send_smp_identity_information +004a 6fe0c34f fetch 1 ,mem_le_preq_resp_key_distribution +004b 6848c356 fetcht 1 ,mem_le_pres_resp_key_distribution +004c 98417e00 iand temp ,pdata +004d 2fec0001 isolate0 le_initator_irk_bit ,pdata +004e 2020a0b1 branch le_parse_start_enc_rsp_after_auth_end ,true +004f 70439b0d jam flag_le_paring_send_indentity_information ,mem_le_pairing_state +0050 20200051 branch p_le_send_smp_identity_information p_le_send_smp_identity_information: -0050 18002211 force 17 ,rega -0051 20402109 call le_fifo_malloc_tx_l2cap_smp -0052 58000008 setarg smp_identity_information -0053 e7e08005 istore 1 ,contw -0054 df200010 arg 16 ,loopcnt -0055 d8c04316 arg mem_le_ltk ,contr -0056 20207d5f branch memcpy +0051 18002211 force 17 ,rega +0052 20402109 call le_fifo_malloc_tx_l2cap_smp +0053 58000008 setarg smp_identity_information +0054 e7e08005 istore 1 ,contw +0055 df200010 arg 16 ,loopcnt +0056 d8c04316 arg mem_le_ltk ,contr +0057 20207d5f branch memcpy p_parse_lmp_accepted: -0057 6fe080d0 fetch 1 ,mem_rxbuf + 1 -0058 67e0839d store 1 ,mem_lmi_accepted_opcode -0059 c009805b beq lmp_switch_req ,p_parse_lmp_accepted_switch -005a 20205465 branch parse_lmp_accepted + 3 +0058 6fe080d0 fetch 1 ,mem_rxbuf + 1 +0059 67e0839d store 1 ,mem_lmi_accepted_opcode +005a c009805c beq lmp_switch_req ,p_parse_lmp_accepted_switch +005b 20205465 branch parse_lmp_accepted + 3 p_parse_lmp_accepted_switch: -005b 6fe080bd fetch 1 ,mem_connection_options -005c 793ffe02 set0 connection_switch ,pdata -005d 67e080bd store 1 ,mem_connection_options -005e 70095b20 jam bt_evt_switch_accept ,mem_fifo_temp -005f 20407871 call ui_ipc_send_event -0060 202009df branch role_switch_prepare0 +005c 6fe080bd fetch 1 ,mem_connection_options +005d 793ffe02 set0 connection_switch ,pdata +005e 67e080bd store 1 ,mem_connection_options +005f 70095b20 jam bt_evt_switch_accept ,mem_fifo_temp +0060 20407871 call ui_ipc_send_event +0061 202009df branch role_switch_prepare0 p_process_conn_sm: -0061 204059e1 call lmo_fifo_check -0062 247a0000 nrtn blank +0062 204059e1 call lmo_fifo_check +0063 247a0000 nrtn blank p_process_conn_sm_continue: -0063 6fe08056 fetch 1 ,mem_conn_sm -0064 207a0000 rtn blank -0065 6fe08056 fetch 1 ,mem_conn_sm -0066 c0020068 beq conn_sm_send_conn_req ,p_host_create_conn_send_conn_req -0067 20205a45 branch process_conn_sm_continue + 2 +0064 6fe08056 fetch 1 ,mem_conn_sm +0065 207a0000 rtn blank +0066 6fe08056 fetch 1 ,mem_conn_sm +0067 c0020069 beq conn_sm_send_conn_req ,p_host_create_conn_send_conn_req +0068 20205a45 branch process_conn_sm_continue + 2 p_host_create_conn_send_conn_req: -0068 70005605 jam conn_sm_wait_conn_accept ,mem_conn_sm -0069 7003a6ff jam 0xfff ,mem_soft_timer -006a 793f8022 set0 mark_reconn_recieve_switch ,mark -006b 70007d33 jam lmp_host_connection_req ,mem_lmo_opcode2 -006c 20205390 branch init_lmp_reinit +0069 70005605 jam conn_sm_wait_conn_accept ,mem_conn_sm +006a 7003a6ff jam 0xfff ,mem_soft_timer +006b 793f8022 set0 mark_reconn_recieve_switch ,mark +006c 70007d33 jam lmp_host_connection_req ,mem_lmo_opcode2 +006d 20205390 branch init_lmp_reinit p_lpm_dispatch: -006d 20401465 call lpo_calibration -006e 6fe1c174 fetch 3 ,mem_clks_per_lpo -006f 207a0000 rtn blank -0070 6fe0c099 fetch 1 ,mem_lpm_mode -0071 207a0000 rtn blank -0072 6fe0cc41 fetch 1 ,mem_mouse_multi_led_blink_enable -0073 247a0000 nrtn blank -0074 202014e3 branch lpm_dispatch + 6 +006e 20401465 call lpo_calibration +006f 6fe1c174 fetch 3 ,mem_clks_per_lpo +0070 207a0000 rtn blank +0071 6fe0c099 fetch 1 ,mem_lpm_mode +0072 207a0000 rtn blank +0073 6fe0cc41 fetch 1 ,mem_mouse_multi_led_blink_enable +0074 247a0000 nrtn blank +0075 202014e3 branch lpm_dispatch + 6 p_mouse_start_reconnect_device: -0075 20400416 call p_mouse_device_le_reconn_led_config 0076 da204939 arg mem_device1_type ,rega 0077 6fe0c938 fetch 1 ,mem_device_flag 0078 1fe0ffff increase -1 ,pdata @@ -1149,7 +1149,7 @@ 036a 684b4974 fetcht 6 ,mem_mouse_compare_addr_ff 036b 98467c00 isub temp ,null 036c 2022c2eb branch mouse_buletooth_fast_conn_init ,zero -036d 20200075 branch p_mouse_start_reconnect_device +036d 20200076 branch p_mouse_start_reconnect_device p_mouse_24g_first_start_auto_pair_mode: 036e 20403d65 call mouse_wakeup_from_power_check Index: program/patch.prog =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/SlideSwitch_3m_3ch_272/program/patch.prog (revision 4672) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/SlideSwitch_3m_3ch_272/program/patch.prog (working copy) @@ -90,6 +90,7 @@ and rega,0x07,pdata beq MOUSE_LMR_BUTTON,p_mouse_freq_test_mode endif + jam 0x14,mem_ui_button_timeout branch soft_reset+4 p_efuse_vdd_off: @@ -166,7 +167,7 @@ branch lpm_dispatch+6 p_mouse_start_reconnect_device: - call p_mouse_device_le_reconn_led_config +// call p_mouse_device_le_reconn_led_config arg mem_device1_type,rega fetch 1,mem_device_flag increase -1,pdata Index: sched/mouse.dat =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/SlideSwitch_3m_3ch_272/sched/mouse.dat (revision 4672) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/SlideSwitch_3m_3ch_272/sched/mouse.dat (working copy) @@ -154,7 +154,7 @@ #1io2led multi start #time parm mem_mouse_led_multi_type:02 #00:no multi 01:low+led 02:dpi+led 03:low+dpi_led -mem_mouse_multi_led_powon_timer_init:14 #2s +mem_mouse_multi_led_powon_timer_init:0a #2s mem_mouse_multi_24gled_blink_timer_init:05 #24gled blink time 500ms on,500ms off mem_mouse_multi_le_discovery_blink_timer_init:02 #le discovery blink time 500ms on,500ms off mem_mouse_multi_le_reconn_blink_timer_init:05 #le reconn blink time 500ms on,500ms off