Index: format/app_dongle.format =================================================================== --- /1306ac/branch/dongle/usb_1M_YeCai_LED/format/app_dongle.format (revision 452) +++ /1306ac/branch/dongle/usb_1M_YeCai_LED/format/app_dongle.format (working copy) @@ -36,6 +36,7 @@ 1 mem_led_state 1 mem_dongle_led_blink_enable 1 mem_dongle_nodata_count +1 mem_dongle_1min_out_and_bind ) Index: output/eeprom.dat =================================================================== --- /1306ac/branch/dongle/usb_1M_YeCai_LED/output/eeprom.dat (revision 452) +++ /1306ac/branch/dongle/usb_1M_YeCai_LED/output/eeprom.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -96 +ba 03 c2 84 @@ -19,11 +19,11 @@ c0 17 80 -5d +63 c0 61 80 -61 +68 20 20 3a @@ -35,27 +35,27 @@ c0 23 00 -9c +a5 c0 23 80 -a8 +b1 c0 24 80 -c6 +cf c0 26 80 -83 +8a c0 27 80 -52 +58 c0 28 00 -74 +7b 20 20 3a @@ -114,8 +114,8 @@ 7f 20 40 -4a -a5 +00 +8a 20 40 51 @@ -171,7 +171,7 @@ 20 40 00 -42 +48 24 7a 00 @@ -183,19 +183,19 @@ c0 00 80 -3a +40 20 40 00 -48 +4e 20 20 00 -3b +41 20 40 00 -42 +48 24 7a 00 @@ -207,19 +207,19 @@ c0 00 80 -3d +43 20 40 00 -48 +4e 20 20 00 -3e +44 20 40 00 -42 +48 24 7a 00 @@ -227,6 +227,14 @@ 6f e0 c5 +e4 +c0 +00 +00 +3c +6f +e0 +c5 e1 c1 00 @@ -235,11 +243,27 @@ 20 20 00 -4d +53 +6f +e0 +c5 +e1 +c0 +00 +80 +43 20 40 00 -4d +4e +20 +20 +00 +44 +20 +40 +00 +53 58 00 00 @@ -247,11 +271,11 @@ 20 20 00 -40 +46 20 40 00 -4d +53 58 00 03 @@ -259,7 +283,7 @@ 20 20 00 -40 +46 d8 e0 00 @@ -343,7 +367,7 @@ 20 40 00 -56 +5c 20 20 4a @@ -388,6 +412,10 @@ 45 15 00 +70 +45 +e4 +00 20 20 48 @@ -407,11 +435,11 @@ 20 40 00 -40 +46 20 40 00 -48 +4e 70 8c 00 @@ -479,7 +507,7 @@ 20 40 00 -7c +83 20 40 4b @@ -570,8 +598,8 @@ 03 20 20 -ca -c1 +80 +a3 20 40 48 @@ -602,8 +630,8 @@ 00 20 21 -4a -c1 +00 +a3 6f e0 c5 @@ -628,6 +656,14 @@ 20 4a bc +70 +45 +e4 +01 +20 +20 +4a +c1 20 40 4a @@ -647,7 +683,7 @@ 20 40 00 -a2 +ab 20 20 49 @@ -691,11 +727,11 @@ c0 11 00 -ae +b7 c0 7f 80 -db +e4 20 60 00 @@ -707,7 +743,7 @@ 20 3a 00 -b4 +bd 6f e2 45 @@ -731,11 +767,11 @@ c0 00 80 -b8 +c1 c0 01 00 -bf +c8 20 60 00 @@ -755,7 +791,7 @@ c0 01 00 -bd +c6 20 60 00 @@ -783,7 +819,7 @@ c0 80 00 -c4 +cd 20 60 00 @@ -803,7 +839,7 @@ c0 00 80 -cb +d4 c0 01 4a @@ -811,7 +847,7 @@ c0 7f 80 -d9 +e2 20 20 4a @@ -847,7 +883,7 @@ c0 00 80 -d4 +dd 20 20 4a @@ -879,7 +915,7 @@ 20 20 00 -db +e4 6f e0 c5 @@ -887,11 +923,11 @@ c0 00 80 -df +e8 c0 01 00 -e2 +eb 20 60 00 @@ -920,8 +956,8 @@ 20 4c 16 -d5 -77 +20 +79 aa 55 40 @@ -1239,5 +1275,5 @@ 55 ab 46 -05 -c8 +e5 +2f Index: output/memmap.format =================================================================== --- /1306ac/branch/dongle/usb_1M_YeCai_LED/output/memmap.format (revision 452) +++ /1306ac/branch/dongle/usb_1M_YeCai_LED/output/memmap.format (working copy) @@ -1328,6 +1328,7 @@ 0x45e1 mem_led_state 0x45e2 mem_dongle_led_blink_enable 0x45e3 mem_dongle_nodata_count +0x45e4 mem_dongle_1min_out_and_bind 0x451e mem_rssi_hex_received 0x451f mem_24g_pair_sm 0x4520 mem_24g_pair_no_ack Index: output/program.lis =================================================================== --- /1306ac/branch/dongle/usb_1M_YeCai_LED/output/program.lis (revision 452) +++ /1306ac/branch/dongle/usb_1M_YeCai_LED/output/program.lis (working copy) @@ -3,18 +3,18 @@ 0000 c2840006 bbit1 8 ,pf_patch_ext 0001 c000000e beq patch00_0 ,p_soft_reset 0002 c0380013 beq patch0e_0 ,p_app_init -0003 c017805d beq patch05_7 ,p_dongle_default_init -0004 c0618061 beq patch18_3 ,p_usb_init +0003 c0178063 beq patch05_7 ,p_dongle_default_init +0004 c0618068 beq patch18_3 ,p_usb_init 0005 20203a8a branch assert pf_patch_ext: 0006 c17f8000 rtneq patch3f_7 -0007 c023009c beq patch28_6 ,p_g24_bind_data_process -0008 c02380a8 beq patch28_7 ,p_g24_bind_data_parse_next -0009 c02480c6 beq patch29_1 ,p_g24_receive_packet_start_next -000a c0268083 beq patch29_5 ,p_g24_mode_switch_bind_search -000b c0278052 beq patch29_7 ,p_g24_bind_mode_auto -000c c0280074 beq patch2a_0 ,p_g24_search_mode_auto +0007 c02300a5 beq patch28_6 ,p_g24_bind_data_process +0008 c02380b1 beq patch28_7 ,p_g24_bind_data_parse_next +0009 c02480cf beq patch29_1 ,p_g24_receive_packet_start_next +000a c026808a beq patch29_5 ,p_g24_mode_switch_bind_search +000b c0278058 beq patch29_7 ,p_g24_bind_mode_auto +000c c028007b beq patch2a_0 ,p_g24_search_mode_auto 000d 20203a8a branch assert p_soft_reset: @@ -39,7 +39,7 @@ p_dongle_auto_bind_loop: 001a 20404a7f call g24_mode_switch_bind_work -001b 20404aa5 call g24_mode_switch_bind_search +001b 2040008a call p_g24_mode_switch_bind_search 001c 20405183 call dongle_work_mode_auto 001d 20404adf call g24_bind_mode_auto 001e 20404afc call g24_search_mode_auto @@ -57,264 +57,277 @@ p_dongle_work_led_blink_timer_check: 0027 6fe0c535 fetch 1 ,mem_24g_rxdata_temp + 2 0028 207a0000 rtn blank -0029 20400042 call p_timer_check +0029 20400048 call p_timer_check 002a 247a0000 nrtn blank 002b 6fe0c5e1 fetch 1 ,mem_led_state -002c c000803a beq on ,p_dongle_work_led_off -002d 20400048 call p_led_on -002e 2020003b branch p_dongle_work_led_blink_timer_init +002c c0008040 beq on ,p_dongle_work_led_off +002d 2040004e call p_led_on +002e 20200041 branch p_dongle_work_led_blink_timer_init p_dongle_bind_led_blink_timer_check: -002f 20400042 call p_timer_check +002f 20400048 call p_timer_check 0030 247a0000 nrtn blank 0031 6fe0c5e1 fetch 1 ,mem_led_state -0032 c000803d beq on ,p_dongle_bind_led_off -0033 20400048 call p_led_on -0034 2020003e branch p_dongle_bind_led_blink_timer_init +0032 c0008043 beq on ,p_dongle_bind_led_off +0033 2040004e call p_led_on +0034 20200044 branch p_dongle_bind_led_blink_timer_init p_dongle_search_led_blink_timer_check: -0035 20400042 call p_timer_check +0035 20400048 call p_timer_check 0036 247a0000 nrtn blank -0037 6fe0c5e1 fetch 1 ,mem_led_state -0038 c1000000 rtneq off -0039 2020004d branch p_led_off +0037 6fe0c5e4 fetch 1 ,mem_dongle_1min_out_and_bind +0038 c000003c beq 0 ,p_dongle_search_led_blink +0039 6fe0c5e1 fetch 1 ,mem_led_state +003a c1000000 rtneq off +003b 20200053 branch p_led_off + +p_dongle_search_led_blink: +003c 6fe0c5e1 fetch 1 ,mem_led_state +003d c0008043 beq on ,p_dongle_bind_led_off +003e 2040004e call p_led_on +003f 20200044 branch p_dongle_bind_led_blink_timer_init p_dongle_work_led_off: -003a 2040004d call p_led_off +0040 20400053 call p_led_off p_dongle_work_led_blink_timer_init: -003b 58000050 setarg timer_50ms -003c 20200040 branch p_timer_init +0041 58000050 setarg timer_50ms +0042 20200046 branch p_timer_init p_dongle_bind_led_off: -003d 2040004d call p_led_off +0043 20400053 call p_led_off p_dongle_bind_led_blink_timer_init: -003e 58000320 setarg timer_500ms -003f 20200040 branch p_timer_init +0044 58000320 setarg timer_500ms +0045 20200046 branch p_timer_init p_timer_init: -0040 d8e00006 arg dongle_led_blink_timer ,queue -0041 20207420 branch timer_init +0046 d8e00006 arg dongle_led_blink_timer ,queue +0047 20207420 branch timer_init p_timer_check: -0042 d8e00006 arg dongle_led_blink_timer ,queue -0043 2020742e branch timer_check +0048 d8e00006 arg dongle_led_blink_timer ,queue +0049 2020742e branch timer_check p_dongle_disconnected_timer_init: -0044 d8e0000a arg ui_led_blink2 ,queue -0045 20207420 branch timer_init +004a d8e0000a arg ui_led_blink2 ,queue +004b 20207420 branch timer_init p_dongle_disconnected_timer_check: -0046 d8e0000a arg ui_led_blink2 ,queue -0047 2020742e branch timer_check +004c d8e0000a arg ui_led_blink2 ,queue +004d 2020742e branch timer_check p_led_on: -0048 7045e101 jam on ,mem_led_state -0049 6848c5e0 fetcht 1 ,mem_usb_state_led_gpio -004a 20406b96 call gpio_config_output -004b 6848c5e0 fetcht 1 ,mem_usb_state_led_gpio -004c 20206b92 branch gpio_out_inactive +004e 7045e101 jam on ,mem_led_state +004f 6848c5e0 fetcht 1 ,mem_usb_state_led_gpio +0050 20406b96 call gpio_config_output +0051 6848c5e0 fetcht 1 ,mem_usb_state_led_gpio +0052 20206b92 branch gpio_out_inactive p_led_off: -004d 7045e100 jam off ,mem_led_state -004e 6848c5e0 fetcht 1 ,mem_usb_state_led_gpio -004f 20406b96 call gpio_config_output -0050 6848c5e0 fetcht 1 ,mem_usb_state_led_gpio -0051 20206b96 branch gpio_out_active +0053 7045e100 jam off ,mem_led_state +0054 6848c5e0 fetcht 1 ,mem_usb_state_led_gpio +0055 20406b96 call gpio_config_output +0056 6848c5e0 fetcht 1 ,mem_usb_state_led_gpio +0057 20206b96 branch gpio_out_active p_g24_bind_mode_auto: -0052 6fe0c561 fetch 1 ,mem_24g_work_mode -0053 c1808000 rtnne dongle_bind -0054 20400056 call p_g24_bind_init -0055 20204ae3 branch g24_bind_mode_auto + 4 +0058 6fe0c561 fetch 1 ,mem_24g_work_mode +0059 c1808000 rtnne dongle_bind +005a 2040005c call p_g24_bind_init +005b 20204ae3 branch g24_bind_mode_auto + 4 p_g24_bind_init: -0056 6fe0c560 fetch 1 ,mem_24g_mode_init -0057 c3808000 rtnbit1 dongle_bind -0058 79207e01 set1 dongle_bind ,pdata -0059 67e0c560 store 1 ,mem_24g_mode_init -005a 58000000 setarg 0 -005b 67e1c51e store 3 ,mem_24g_device1_bind_step -005c 20204980 branch g24_bind_init + 8 +005c 6fe0c560 fetch 1 ,mem_24g_mode_init +005d c3808000 rtnbit1 dongle_bind +005e 79207e01 set1 dongle_bind ,pdata +005f 67e0c560 store 1 ,mem_24g_mode_init +0060 58000000 setarg 0 +0061 67e1c51e store 3 ,mem_24g_device1_bind_step +0062 20204980 branch g24_bind_init + 8 p_dongle_default_init: -005d 204050c4 call dongle_default_init + 1 -005e 70451c94 jam tx_power_f20db ,mem_24g_pair_tx_power -005f 70451500 jam off ,mem_24g_disable_fec1 -0060 202048fa branch g24_enable_1m +0063 204050c4 call dongle_default_init + 1 +0064 70451c94 jam tx_power_f20db ,mem_24g_pair_tx_power +0065 70451500 jam off ,mem_24g_disable_fec1 +0066 7045e400 jam 0 ,mem_dongle_1min_out_and_bind +0067 202048fa branch g24_enable_1m p_usb_init: -0061 20406eb3 call enable_authrom -0062 20407056 call usb_init_param -0063 58000320 setarg timer_500ms -0064 20400040 call p_timer_init -0065 20400048 call p_led_on -0066 708c0000 jam 0x00 ,core_usb_config -0067 20002710 nop 10000 -0068 708c1800 jam 0x00 ,core_usb_trig -0069 6ff10050 fetch 2 ,core_clkoff -006a 793ffe0a set0 clock_off_usb ,pdata -006b 67f10050 store 2 ,core_clkoff -006c 708c1100 jam 0x00 ,core_usb_hmode -006d 708c003c jam 0x3c ,core_usb_config -006e 58000d00 setarg mem_usb_rxbuf_new -006f 67f10c03 store 2 ,core_usb_rx_saddr -0070 67f10c07 store 2 ,core_usb_rxptr -0071 58000d44 setarg mem_usb_rxbuf_new_end -0072 67f10c05 store 2 ,core_usb_rx_eaddr -0073 2020704f branch usb_init + 16 +0068 20406eb3 call enable_authrom +0069 20407056 call usb_init_param +006a 58000320 setarg timer_500ms +006b 20400046 call p_timer_init +006c 2040004e call p_led_on +006d 708c0000 jam 0x00 ,core_usb_config +006e 20002710 nop 10000 +006f 708c1800 jam 0x00 ,core_usb_trig +0070 6ff10050 fetch 2 ,core_clkoff +0071 793ffe0a set0 clock_off_usb ,pdata +0072 67f10050 store 2 ,core_clkoff +0073 708c1100 jam 0x00 ,core_usb_hmode +0074 708c003c jam 0x3c ,core_usb_config +0075 58000d00 setarg mem_usb_rxbuf_new +0076 67f10c03 store 2 ,core_usb_rx_saddr +0077 67f10c07 store 2 ,core_usb_rxptr +0078 58000d44 setarg mem_usb_rxbuf_new_end +0079 67f10c05 store 2 ,core_usb_rx_eaddr +007a 2020704f branch usb_init + 16 p_g24_search_mode_auto: -0074 6fe0c561 fetch 1 ,mem_24g_work_mode -0075 c1838000 rtnne dongle_search -0076 2040007c call p_g24_search_mode_init -0077 20404b22 call g24_auto_addr_ch_search -0078 20404a69 call g24_receive_transmit_ack -0079 2437ca39 nbranch g24_rx_interrupt_clear ,user3 -007a 7045e300 jam 0 ,mem_dongle_nodata_count -007b 20204b03 branch g24_search_mode_auto + 7 +007b 6fe0c561 fetch 1 ,mem_24g_work_mode +007c c1838000 rtnne dongle_search +007d 20400083 call p_g24_search_mode_init +007e 20404b22 call g24_auto_addr_ch_search +007f 20404a69 call g24_receive_transmit_ack +0080 2437ca39 nbranch g24_rx_interrupt_clear ,user3 +0081 7045e300 jam 0 ,mem_dongle_nodata_count +0082 20204b03 branch g24_search_mode_auto + 7 p_g24_search_mode_init: -007c 6fe0c560 fetch 1 ,mem_24g_mode_init -007d c3838000 rtnbit1 dongle_search -007e 79207e07 set1 dongle_search ,pdata -007f 67e0c560 store 1 ,mem_24g_mode_init -0080 6fe0c56e fetch 1 ,mem_tx_power_temp -0081 67e0c116 store 1 ,mem_tx_power -0082 20204af0 branch g24_search_mode_init + 4 +0083 6fe0c560 fetch 1 ,mem_24g_mode_init +0084 c3838000 rtnbit1 dongle_search +0085 79207e07 set1 dongle_search ,pdata +0086 67e0c560 store 1 ,mem_24g_mode_init +0087 6fe0c56e fetch 1 ,mem_tx_power_temp +0088 67e0c116 store 1 ,mem_tx_power +0089 20204af0 branch g24_search_mode_init + 4 p_g24_mode_switch_bind_search: -0083 6fe0c561 fetch 1 ,mem_24g_work_mode -0084 c1000000 rtneq dongle_work -0085 6fe0c575 fetch 1 ,mem_24g_b_s_mode_switch_disable -0086 247a0000 nrtn blank -0087 6fe0c573 fetch 1 ,mem_24g_mode_b_s_switch_exit -0088 247a0000 nrtn blank -0089 6fe0c56f fetch 1 ,mem_24g_mode_b_s_switch -008a 207a0000 rtn blank -008b 6fe0c576 fetch 1 ,mem_24g_bind_device_living -008c 2fe00603 compare 3 ,pdata ,3 -008d 2020cac1 branch g24_mode_b_s_switch_exit ,true -008e 204048be call g24_timer_check -008f 24740000 nrtn user -0090 6fe14571 fetch 2 ,mem_24g_mode_b_s_switch_cnt -0091 1fe0fe01 increase 1 ,pdata -0092 67e14571 store 2 ,mem_24g_mode_b_s_switch_cnt -0093 d84007d0 arg 0x7d0 ,temp -0094 98467c00 isub temp ,null -0095 20214ac1 branch g24_mode_b_s_switch_exit ,positive -0096 6fe0c574 fetch 1 ,mem_24g_b_s_time_slice -0097 1fe0fe01 increase 1 ,pdata -0098 1fe17e01 and_into 1 ,pdata -0099 67e0c574 store 1 ,mem_24g_b_s_time_slice -009a c0004b88 beq 0 ,g24_search_mode_enable -009b 20204abc branch g24_mode_switch_bind_search_next + 1 +008a 6fe0c561 fetch 1 ,mem_24g_work_mode +008b c1000000 rtneq dongle_work +008c 6fe0c575 fetch 1 ,mem_24g_b_s_mode_switch_disable +008d 247a0000 nrtn blank +008e 6fe0c573 fetch 1 ,mem_24g_mode_b_s_switch_exit +008f 247a0000 nrtn blank +0090 6fe0c56f fetch 1 ,mem_24g_mode_b_s_switch +0091 207a0000 rtn blank +0092 6fe0c576 fetch 1 ,mem_24g_bind_device_living +0093 2fe00603 compare 3 ,pdata ,3 +0094 202080a3 branch p_g24_mode_b_s_switch_exit ,true +0095 204048be call g24_timer_check +0096 24740000 nrtn user +0097 6fe14571 fetch 2 ,mem_24g_mode_b_s_switch_cnt +0098 1fe0fe01 increase 1 ,pdata +0099 67e14571 store 2 ,mem_24g_mode_b_s_switch_cnt +009a d84007d0 arg 0x7d0 ,temp +009b 98467c00 isub temp ,null +009c 202100a3 branch p_g24_mode_b_s_switch_exit ,positive +009d 6fe0c574 fetch 1 ,mem_24g_b_s_time_slice +009e 1fe0fe01 increase 1 ,pdata +009f 1fe17e01 and_into 1 ,pdata +00a0 67e0c574 store 1 ,mem_24g_b_s_time_slice +00a1 c0004b88 beq 0 ,g24_search_mode_enable +00a2 20204abc branch g24_mode_switch_bind_search_next + 1 + +p_g24_mode_b_s_switch_exit: +00a3 7045e401 jam 1 ,mem_dongle_1min_out_and_bind +00a4 20204ac1 branch g24_mode_b_s_switch_exit p_g24_bind_data_process: -009c 20404a39 call g24_rx_interrupt_clear -009d 20404792 call g24_receive_packet -009e 2437ca39 nbranch g24_rx_interrupt_clear ,user3 -009f 20404997 call g24_bind_data_parse -00a0 204000a2 call p_g24_bind_transmit_ack -00a1 2020498e branch g24_bind_data_process + 6 +00a5 20404a39 call g24_rx_interrupt_clear +00a6 20404792 call g24_receive_packet +00a7 2437ca39 nbranch g24_rx_interrupt_clear ,user3 +00a8 20404997 call g24_bind_data_parse +00a9 204000ab call p_g24_bind_transmit_ack +00aa 2020498e branch g24_bind_data_process + 6 p_g24_bind_transmit_ack: -00a2 6fe0c442 fetch 1 ,mem_24g_rxbuf -00a3 67e0c4d4 store 1 ,mem_24g_data_type -00a4 2040488d call g24_read_len_pid_crc -00a5 20404a20 call g24_ackpayload_prep -00a6 2437c7fc nbranch g24_end_of_packet ,user3 -00a7 20204a73 branch g24tx_with_ack + 1 +00ab 6fe0c442 fetch 1 ,mem_24g_rxbuf +00ac 67e0c4d4 store 1 ,mem_24g_data_type +00ad 2040488d call g24_read_len_pid_crc +00ae 20404a20 call g24_ackpayload_prep +00af 2437c7fc nbranch g24_end_of_packet ,user3 +00b0 20204a73 branch g24tx_with_ack + 1 p_g24_bind_data_parse_next: -00a8 6fe0c535 fetch 1 ,mem_24g_rxdata_temp + 2 -00a9 c05549a2 beq datatype_bind ,g24_bind_first_step -00aa c02ac9b3 beq datatype_config ,g24_bind_second_step -00ab c01100ae beq datatype_ok ,p_g24_bind_third_step -00ac c07f80db beq datatype_attemp ,p_g24_data_attemp -00ad 20600000 rtn +00b1 6fe0c535 fetch 1 ,mem_24g_rxdata_temp + 2 +00b2 c05549a2 beq datatype_bind ,g24_bind_first_step +00b3 c02ac9b3 beq datatype_config ,g24_bind_second_step +00b4 c01100b7 beq datatype_ok ,p_g24_bind_third_step +00b5 c07f80e4 beq datatype_attemp ,p_g24_data_attemp +00b6 20600000 rtn p_g24_bind_third_step: -00ae 6fe0c4f9 fetch 1 ,mem_24g_pair_switch -00af 203a00b4 branch p_g24_bind_third_step_skip ,blank -00b0 6fe24537 fetch 4 ,mem_24g_rxdata_temp + 4 -00b1 684a4577 fetcht 4 ,mem_24g_transmitter_addr -00b2 98467c00 isub temp ,null -00b3 24628000 nrtn zero +00b7 6fe0c4f9 fetch 1 ,mem_24g_pair_switch +00b8 203a00bd branch p_g24_bind_third_step_skip ,blank +00b9 6fe24537 fetch 4 ,mem_24g_rxdata_temp + 4 +00ba 684a4577 fetcht 4 ,mem_24g_transmitter_addr +00bb 98467c00 isub temp ,null +00bc 24628000 nrtn zero p_g24_bind_third_step_skip: -00b4 6fe0c536 fetch 1 ,mem_24g_rxdata_temp + 3 -00b5 c00080b8 beq datatype_device1 ,p_g24_bind_third_step_device1 -00b6 c00100bf beq datatype_device2 ,p_g24_bind_third_step_device2 -00b7 20600000 rtn +00bd 6fe0c536 fetch 1 ,mem_24g_rxdata_temp + 3 +00be c00080c1 beq datatype_device1 ,p_g24_bind_third_step_device1 +00bf c00100c8 beq datatype_device2 ,p_g24_bind_third_step_device2 +00c0 20600000 rtn p_g24_bind_third_step_device1: -00b8 6fe0c529 fetch 1 ,mem_24g_device1_bind_disable -00b9 247a0000 nrtn blank -00ba 6fe0c51e fetch 1 ,mem_24g_device1_bind_step -00bb c00100bd beq 2 ,p_g24_bind_dvc1_step_success -00bc 20600000 rtn +00c1 6fe0c529 fetch 1 ,mem_24g_device1_bind_disable +00c2 247a0000 nrtn blank +00c3 6fe0c51e fetch 1 ,mem_24g_device1_bind_step +00c4 c00100c6 beq 2 ,p_g24_bind_dvc1_step_success +00c5 20600000 rtn p_g24_bind_dvc1_step_success: -00bd 70452901 jam 1 ,mem_24g_device1_bind_disable -00be 202049e5 branch g24_bind_dvc1_step_success + 2 +00c6 70452901 jam 1 ,mem_24g_device1_bind_disable +00c7 202049e5 branch g24_bind_dvc1_step_success + 2 p_g24_bind_third_step_device2: -00bf 6fe0c52a fetch 1 ,mem_24g_device2_bind_disable -00c0 247a0000 nrtn blank -00c1 6fe0c51f fetch 1 ,mem_24g_device2_bind_step -00c2 c08000c4 bne 0 ,p_g24_bind_dvc2_step_success -00c3 20600000 rtn +00c8 6fe0c52a fetch 1 ,mem_24g_device2_bind_disable +00c9 247a0000 nrtn blank +00ca 6fe0c51f fetch 1 ,mem_24g_device2_bind_step +00cb c08000cd bne 0 ,p_g24_bind_dvc2_step_success +00cc 20600000 rtn p_g24_bind_dvc2_step_success: -00c4 70452a01 jam 1 ,mem_24g_device2_bind_disable -00c5 202049f3 branch g24_bind_dvc2_step_success + 2 +00cd 70452a01 jam 1 ,mem_24g_device2_bind_disable +00ce 202049f3 branch g24_bind_dvc2_step_success + 2 p_g24_receive_packet_start_next: -00c6 6fe0c535 fetch 1 ,mem_24g_rxdata_temp + 2 -00c7 c00080cb beq datatype_device1 ,p_g24_data_device1 -00c8 c0014a4e beq datatype_device2 ,g24_data_device2 -00c9 c07f80d9 beq datatype_attemp ,p_g24_data_receive_attemp -00ca 20204a39 branch g24_rx_interrupt_clear +00cf 6fe0c535 fetch 1 ,mem_24g_rxdata_temp + 2 +00d0 c00080d4 beq datatype_device1 ,p_g24_data_device1 +00d1 c0014a4e beq datatype_device2 ,g24_data_device2 +00d2 c07f80e2 beq datatype_attemp ,p_g24_data_receive_attemp +00d3 20204a39 branch g24_rx_interrupt_clear p_g24_data_device1: -00cb 20404a08 call g24_binding_dvc1_living -00cc 20404ba2 call g24_ch_timer_reinit -00cd 6fe0c555 fetch 1 ,mem_24g_abort_packet -00ce 6848c533 fetcht 1 ,mem_24g_rxdata_temp -00cf 284ffe03 isolate1 bit_abort ,temp -00d0 7920fe00 setflag true ,0 ,pdata -00d1 67e0c555 store 1 ,mem_24g_abort_packet -00d2 c00080d4 beq 1 ,p_g24_data_attemp_device1_abort -00d3 20204a47 branch g24_data_device1 + 8 +00d4 20404a08 call g24_binding_dvc1_living +00d5 20404ba2 call g24_ch_timer_reinit +00d6 6fe0c555 fetch 1 ,mem_24g_abort_packet +00d7 6848c533 fetcht 1 ,mem_24g_rxdata_temp +00d8 284ffe03 isolate1 bit_abort ,temp +00d9 7920fe00 setflag true ,0 ,pdata +00da 67e0c555 store 1 ,mem_24g_abort_packet +00db c00080dd beq 1 ,p_g24_data_attemp_device1_abort +00dc 20204a47 branch g24_data_device1 + 8 p_g24_data_attemp_device1_abort: -00d4 6fe0c529 fetch 1 ,mem_24g_device1_bind_disable -00d5 247a0000 nrtn blank -00d6 70452901 jam 1 ,mem_24g_device1_bind_disable -00d7 6fe2453d fetch 4 ,mem_24g_rxdata_temp + 10 -00d8 20204c14 branch g24_store_device1_addr +00dd 6fe0c529 fetch 1 ,mem_24g_device1_bind_disable +00de 247a0000 nrtn blank +00df 70452901 jam 1 ,mem_24g_device1_bind_disable +00e0 6fe2453d fetch 4 ,mem_24g_rxdata_temp + 10 +00e1 20204c14 branch g24_store_device1_addr p_g24_data_receive_attemp: -00d9 20404a16 call g24_bind_device_status -00da 202000db branch p_g24_data_attemp +00e2 20404a16 call g24_bind_device_status +00e3 202000e4 branch p_g24_data_attemp p_g24_data_attemp: -00db 6fe0c536 fetch 1 ,mem_24g_rxdata_temp + 3 -00dc c00080df beq datatype_device1 ,p_g24_data_attemp_device1 -00dd c00100e2 beq datatype_device2 ,p_g24_data_attemp_device2 -00de 20600000 rtn +00e4 6fe0c536 fetch 1 ,mem_24g_rxdata_temp + 3 +00e5 c00080e8 beq datatype_device1 ,p_g24_data_attemp_device1 +00e6 c00100eb beq datatype_device2 ,p_g24_data_attemp_device2 +00e7 20600000 rtn p_g24_data_attemp_device1: -00df 6fe0c529 fetch 1 ,mem_24g_device1_bind_disable -00e0 247a0000 nrtn blank -00e1 20204c12 branch g24_data_attemp_device1 +00e8 6fe0c529 fetch 1 ,mem_24g_device1_bind_disable +00e9 247a0000 nrtn blank +00ea 20204c12 branch g24_data_attemp_device1 p_g24_data_attemp_device2: -00e2 6fe0c52a fetch 1 ,mem_24g_device2_bind_disable -00e3 247a0000 nrtn blank -00e4 20204c16 branch g24_data_attemp_device2 +00eb 6fe0c52a fetch 1 ,mem_24g_device2_bind_disable +00ec 247a0000 nrtn blank +00ed 20204c16 branch g24_data_attemp_device2 org 0x3800 start: Index: program/patch.prog =================================================================== --- /1306ac/branch/dongle/usb_1M_YeCai_LED/program/patch.prog (revision 452) +++ /1306ac/branch/dongle/usb_1M_YeCai_LED/program/patch.prog (working copy) @@ -42,7 +42,7 @@ call g24_mode_switch_init p_dongle_auto_bind_loop: call g24_mode_switch_bind_work - call g24_mode_switch_bind_search + call p_g24_mode_switch_bind_search call dongle_work_mode_auto call g24_bind_mode_auto call g24_search_mode_auto @@ -78,9 +78,18 @@ p_dongle_search_led_blink_timer_check: call p_timer_check nrtn blank - fetch 1,mem_led_state + fetch 1,mem_dongle_1min_out_and_bind + beq 0,p_dongle_search_led_blink + fetch 1,mem_led_state //search time out or bind ok rtneq OFF branch p_led_off + +p_dongle_search_led_blink: + fetch 1,mem_led_state + beq ON,p_dongle_bind_led_off + call p_led_on + branch p_dongle_bind_led_blink_timer_init + p_dongle_work_led_off: call p_led_off @@ -143,6 +152,7 @@ call dongle_default_init+1 jam TX_POWER_F20DB,mem_24g_pair_tx_power jam OFF,mem_24g_disable_fec1 + jam 0,mem_dongle_1min_out_and_bind branch g24_enable_1M /* fetch 1,mem_dg_sys_config @@ -241,7 +251,7 @@ rtn blank fetch 1,mem_24g_bind_device_living compare 3,pdata,3 - branch g24_mode_B_S_switch_exit,true + branch p_g24_mode_B_S_switch_exit,true call g24_timer_check nrtn user fetch 2,mem_24g_mode_B_S_switch_cnt @@ -249,7 +259,7 @@ store 2,mem_24g_mode_B_S_switch_cnt arg 0x7d0,temp //1min isub temp,null - branch g24_mode_B_S_switch_exit,positive + branch p_g24_mode_B_S_switch_exit,positive fetch 1,mem_24g_B_S_time_slice increase 1,pdata and_into 1,pdata @@ -259,6 +269,10 @@ //beq 1,g24_bind_mode_enable //rtn +p_g24_mode_B_S_switch_exit: + jam 1,mem_dongle_1min_out_and_bind + branch g24_mode_B_S_switch_exit + p_g24_bind_data_process: call g24_rx_interrupt_clear call g24_receive_packet