Index: format/utility.format =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/LXL-186_Dongle_24M_New_Process_Gan/format/utility.format (revision 4123) +++ /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/LXL-186_Dongle_24M_New_Process_Gan/format/utility.format (working copy) @@ -156,6 +156,7 @@ 3 mem_usb_kb_system_last_data 3 mem_firmware_version +1 mem_24g_disable_fec1 ) Index: output/eeprom.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/LXL-186_Dongle_24M_New_Process_Gan/output/eeprom.dat (revision 4123) +++ /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/LXL-186_Dongle_24M_New_Process_Gan/output/eeprom.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -66 +a6 13 c2 84 @@ -3071,11 +3071,11 @@ 20 40 04 -b9 +c2 20 20 04 -b1 +b9 70 48 36 @@ -4627,7 +4627,23 @@ 24 2c 04 -b4 +bd +68 +00 +93 +d5 +24 +3a +04 +88 +78 +46 +fc +00 +78 +25 +fc +00 78 23 fc @@ -4659,7 +4675,7 @@ 24 22 84 -b1 +b9 09 80 00 @@ -4683,7 +4699,7 @@ 20 22 84 -96 +9a 68 00 c7 @@ -4699,7 +4715,7 @@ 24 20 84 -b1 +b9 09 80 00 @@ -4723,7 +4739,7 @@ 20 22 84 -a0 +a4 09 80 00 @@ -4739,7 +4755,7 @@ c2 00 04 -9c +a0 09 80 00 @@ -4764,8 +4780,16 @@ a1 80 00 +68 +00 +93 +d5 +24 +3a +04 +b7 78 -46 +45 fc 00 20 @@ -4775,7 +4799,7 @@ 20 23 04 -b1 +b9 78 37 fc @@ -4809,6 +4833,14 @@ 00 00 78 +46 +fc +00 +20 +20 +04 +ad +78 4d fc 00 @@ -4817,17 +4849,21 @@ fc 00 20 -20 +40 26 4d 20 +60 +00 +00 +20 40 04 24 20 20 04 -b1 +b9 20 40 29 @@ -4859,7 +4895,7 @@ 20 40 04 -b6 +bf 79 20 2a @@ -4892,6 +4928,22 @@ 00 86 28 +68 +00 +93 +d5 +24 +3a +04 +d3 +78 +4e +fc +00 +78 +2d +fc +00 78 23 fc @@ -4931,7 +4983,7 @@ c2 00 04 -cd +da 68 00 c8 @@ -4964,12 +5016,24 @@ 4e fc 00 +68 +00 +93 +d5 +24 +7a +00 +00 +78 +4d +fc +00 20 60 00 00 -77 -fd +25 +76 aa 55 01 @@ -5381,6 +5445,13 @@ 55 01 00 +d5 +13 +00 +aa +55 +01 +00 de 41 02 @@ -5434,21 +5505,21 @@ 47 48 00 -1e -00 -4e -03 -23 -03 +13 +2c 42 06 -25 -06 +15 +36 +48 +0f +1a +3a 4c -09 -27 -09 -3c +11 +23 +31 +4d aa 55 04 @@ -5499,7 +5570,7 @@ 00 d2 13 -04 +05 00 24 aa @@ -5546,79 +5617,8 @@ 42 00 84 -44 -53 -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 -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff +e0 +83 ff ff ff @@ -8188,5 +8188,5 @@ ff ff ff -72 -fc +9f +a9 Index: output/memmap.format =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/LXL-186_Dongle_24M_New_Process_Gan/output/memmap.format (revision 4123) +++ /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/LXL-186_Dongle_24M_New_Process_Gan/output/memmap.format (working copy) @@ -608,6 +608,7 @@ 0x13cc mem_usb_kb_system_sta_data 0x13cf mem_usb_kb_system_last_data 0x13d2 mem_firmware_version +0x13d5 mem_24g_disable_fec1 0x4000 mem_patch00 0x4001 mem_patch01 0x4002 mem_patch02 Index: output/program.lis =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/LXL-186_Dongle_24M_New_Process_Gan/output/program.lis (revision 4123) +++ /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/LXL-186_Dongle_24M_New_Process_Gan/output/program.lis (working copy) @@ -1036,10 +1036,10 @@ p_g24tx_with_ack: 02fc 20400300 call p_g24_ackpayload_prep 02fd 20400445 call p_g24_transmit_prep -02fe 204004b9 call p_g24_transmit +02fe 204004c2 call p_g24_transmit p_g24tx_no_ack: -02ff 202004b1 branch p_g24_end_of_packet +02ff 202004b9 branch p_g24_end_of_packet p_g24_ackpayload_prep: 0300 70483600 jam 0 ,mem_24g_datalen @@ -1547,108 +1547,132 @@ 0480 68014839 fetch 2 ,mem_24g_rx_window 0481 98003600 iforce stop_watch 0482 37c18400 correlate null ,timeout -0483 242c04b4 nbranch p_g24_sync_timeout ,sync -0484 7823fc00 enable enable_white -0485 7824fc00 enable enable_crc -0486 09800008 parse demod ,bucket ,8 -0487 19897e00 rshift3 pwindow ,pdata -0488 6000c8ea store 1 ,mem_24g_get_syncword_crc8 -0489 6808c8e9 fetcht 1 ,mem_24g_syncword_crc8 -048a 98467c00 isub temp ,null -048b 242284b1 nbranch p_g24_end_of_packet ,zero -048c 09800008 parse demod ,bucket ,8 -048d 19897e00 rshift3 pwindow ,pdata -048e 6000c7b0 store 1 ,mem_24g_rxbuf -048f 6800c87c fetch 1 ,mem_24g_mode -0490 1fe67c02 sub pdata ,rx_24g ,null -0491 20228496 branch p_g24_receive_skip ,zero -0492 6800c7b0 fetch 1 ,mem_24g_rxbuf -0493 6808c837 fetcht 1 ,mem_24g_data_type -0494 a8400e00 icompare bits_data ,temp -0495 242084b1 nbranch p_g24_end_of_packet ,true +0483 242c04bd nbranch p_g24_sync_timeout ,sync +0484 680093d5 fetch 1 ,mem_24g_disable_fec1 +0485 243a0488 nbranch p_g24_receive_skip_fec1 ,blank +0486 7846fc00 disable decode_fec0 +0487 7825fc00 enable decode_fec1 + +p_g24_receive_skip_fec1: +0488 7823fc00 enable enable_white +0489 7824fc00 enable enable_crc +048a 09800008 parse demod ,bucket ,8 +048b 19897e00 rshift3 pwindow ,pdata +048c 6000c8ea store 1 ,mem_24g_get_syncword_crc8 +048d 6808c8e9 fetcht 1 ,mem_24g_syncword_crc8 +048e 98467c00 isub temp ,null +048f 242284b9 nbranch p_g24_end_of_packet ,zero +0490 09800008 parse demod ,bucket ,8 +0491 19897e00 rshift3 pwindow ,pdata +0492 6000c7b0 store 1 ,mem_24g_rxbuf +0493 6800c87c fetch 1 ,mem_24g_mode +0494 1fe67c02 sub pdata ,rx_24g ,null +0495 2022849a branch p_g24_receive_skip ,zero +0496 6800c7b0 fetch 1 ,mem_24g_rxbuf +0497 6808c837 fetcht 1 ,mem_24g_data_type +0498 a8400e00 icompare bits_data ,temp +0499 242084b9 nbranch p_g24_end_of_packet ,true p_g24_receive_skip: -0496 09800008 parse demod ,bucket ,8 -0497 19897e00 rshift3 pwindow ,pdata -0498 e0a08000 istore 1 ,contw -0499 1fe97e00 rshift3 pdata ,pdata -049a 1fe1721f and pdata ,0x1f ,loopcnt -049b 202284a0 branch p_g24rx_nopayload ,zero +049a 09800008 parse demod ,bucket ,8 +049b 19897e00 rshift3 pwindow ,pdata +049c e0a08000 istore 1 ,contw +049d 1fe97e00 rshift3 pdata ,pdata +049e 1fe1721f and pdata ,0x1f ,loopcnt +049f 202284a4 branch p_g24rx_nopayload ,zero p_g24rx_loop: -049c 09800008 parse demod ,bucket ,8 -049d 19897e00 rshift3 pwindow ,pdata -049e e0a08000 istore 1 ,contw -049f c200049c loop p_g24rx_loop +04a0 09800008 parse demod ,bucket ,8 +04a1 19897e00 rshift3 pwindow ,pdata +04a2 e0a08000 istore 1 ,contw +04a3 c20004a0 loop p_g24rx_loop p_g24rx_nopayload: -04a0 09800018 parse demod ,bucket ,24 -04a1 78287c00 enable swfine -04a2 db600664 arg param_sifs ,stop_watch -04a3 1fef7e00 rshift32 pdata ,pdata -04a4 1ff17e00 rshift16 pdata ,pdata -04a5 e0a18000 istore 3 ,contw -04a6 7846fc00 disable decode_fec0 -04a7 204029bb call save_rssi -04a8 202304b1 branch p_g24_end_of_packet ,crc_failed -04a9 7837fc00 enable user3 -04aa 68008017 fetch 1 ,mem_last_freq -04ab 1fe0a200 add pdata ,0 ,rega -04ac 20402981 call rf_write_freq -04ad 7846fc00 disable decode_fec0 -04ae 20402918 call set_sync_on -04af 20600000 rtn -04b0 20600000 rtn +04a4 09800018 parse demod ,bucket ,24 +04a5 78287c00 enable swfine +04a6 db600664 arg param_sifs ,stop_watch +04a7 1fef7e00 rshift32 pdata ,pdata +04a8 1ff17e00 rshift16 pdata ,pdata +04a9 e0a18000 istore 3 ,contw +04aa 680093d5 fetch 1 ,mem_24g_disable_fec1 +04ab 243a04b7 nbranch p_g24_receive_skip_disable_fec1 ,blank +04ac 7845fc00 disable decode_fec1 + +p_g24_receive_skip_next: +04ad 204029bb call save_rssi +04ae 202304b9 branch p_g24_end_of_packet ,crc_failed +04af 7837fc00 enable user3 +04b0 68008017 fetch 1 ,mem_last_freq +04b1 1fe0a200 add pdata ,0 ,rega +04b2 20402981 call rf_write_freq +04b3 7846fc00 disable decode_fec0 +04b4 20402918 call set_sync_on +04b5 20600000 rtn +04b6 20600000 rtn + +p_g24_receive_skip_disable_fec1: +04b7 7846fc00 disable decode_fec0 +04b8 202004ad branch p_g24_receive_skip_next p_g24_end_of_packet: -04b1 784dfc00 disable encode_fec1 -04b2 7845fc00 disable decode_fec1 -04b3 2020264d branch end_of_packet +04b9 784dfc00 disable encode_fec1 +04ba 7845fc00 disable decode_fec1 +04bb 2040264d call end_of_packet +04bc 20600000 rtn p_g24_sync_timeout: -04b4 20400424 call p_rssi_noise -04b5 202004b1 branch p_g24_end_of_packet +04bd 20400424 call p_rssi_noise +04be 202004b9 branch p_g24_end_of_packet p_g24_set_freq_tx: -04b6 20402918 call set_sync_on -04b7 6808c840 fetcht 1 ,mem_24g_ch -04b8 20202933 branch set_freq_tx +04bf 20402918 call set_sync_on +04c0 6808c840 fetcht 1 ,mem_24g_ch +04c1 20202933 branch set_freq_tx p_g24_transmit: -04b9 204053c4 call le_enable -04ba 6802485e fetch 4 ,mem_24g_addr -04bb 98001200 iforce access -04bc 20400468 call p_g24_prep -04bd 204004b6 call p_g24_set_freq_tx -04be 79202a00 set1 txgfsk ,radio_ctrl -04bf 782efc00 enable encode_fec0 -04c0 78307c00 enable is_tx -04c1 7850fc00 disable is_rx -04c2 19317e00 rshift16 access ,pdata -04c3 1fecfe00 rshift8 pdata ,pdata -04c4 1ff1fe00 rshift4 pdata ,pdata -04c5 08008628 inject mod ,40 -04c6 7823fc00 enable enable_white -04c7 7824fc00 enable enable_crc -04c8 6800c8e9 fetch 1 ,mem_24g_syncword_crc8 -04c9 08008608 inject mod ,8 -04ca 6800c838 fetch 1 ,mem_24g_txlen -04cb 98007200 iforce loopcnt -04cc d8c047f2 arg mem_24g_txpayload ,contr +04c2 204053c4 call le_enable +04c3 6802485e fetch 4 ,mem_24g_addr +04c4 98001200 iforce access +04c5 20400468 call p_g24_prep +04c6 204004bf call p_g24_set_freq_tx +04c7 79202a00 set1 txgfsk ,radio_ctrl +04c8 782efc00 enable encode_fec0 +04c9 78307c00 enable is_tx +04ca 7850fc00 disable is_rx +04cb 19317e00 rshift16 access ,pdata +04cc 1fecfe00 rshift8 pdata ,pdata +04cd 1ff1fe00 rshift4 pdata ,pdata +04ce 08008628 inject mod ,40 +04cf 680093d5 fetch 1 ,mem_24g_disable_fec1 +04d0 243a04d3 nbranch p_g24_transmit_next ,blank +04d1 784efc00 disable encode_fec0 +04d2 782dfc00 enable encode_fec1 + +p_g24_transmit_next: +04d3 7823fc00 enable enable_white +04d4 7824fc00 enable enable_crc +04d5 6800c8e9 fetch 1 ,mem_24g_syncword_crc8 +04d6 08008608 inject mod ,8 +04d7 6800c838 fetch 1 ,mem_24g_txlen +04d8 98007200 iforce loopcnt +04d9 d8c047f2 arg mem_24g_txpayload ,contr p_g24tr_loop: -04cd e8c08000 ifetch 1 ,contr -04ce 08008608 inject mod ,8 -04cf c20004cd loop p_g24tr_loop -04d0 6800c8ee fetch 1 ,mem_rssi_hex -04d1 08008608 inject mod ,8 -04d2 78247c00 enable enable_parity -04d3 08008618 inject mod ,24 -04d4 78447c00 disable enable_parity -04d5 37d38200 until null ,tx_clear -04d6 20000064 nop 100 -04d7 784efc00 disable encode_fec0 -04d8 20600000 rtn +04da e8c08000 ifetch 1 ,contr +04db 08008608 inject mod ,8 +04dc c20004da loop p_g24tr_loop +04dd 6800c8ee fetch 1 ,mem_rssi_hex +04de 08008608 inject mod ,8 +04df 78247c00 enable enable_parity +04e0 08008618 inject mod ,24 +04e1 78447c00 disable enable_parity +04e2 37d38200 until null ,tx_clear +04e3 20000064 nop 100 +04e4 784efc00 disable encode_fec0 +04e5 680093d5 fetch 1 ,mem_24g_disable_fec1 +04e6 247a0000 nrtn blank +04e7 784dfc00 disable encode_fec1 +04e8 20600000 rtn org 0x2000 start: Index: program/patch.prog =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/LXL-186_Dongle_24M_New_Process_Gan/program/patch.prog (revision 4123) +++ /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/LXL-186_Dongle_24M_New_Process_Gan/program/patch.prog (working copy) @@ -1,5 +1,6 @@ define DONGLE //define MOUSE +//define RF_DEBUG ifdef PATCH bbit1 8,pf_patch_ext @@ -189,6 +190,9 @@ call p_g24_queue_init call p_dongle_iic_init call p_dongle_firmware_version_store +ifdef RF_DEBUG + call test_gpio2_init +endif fetch 1,mem_24g_pair_mode beq 0x00,p_dongle_auto_bind beq 0x01,p_dongle_pc_bind @@ -1016,6 +1020,16 @@ store 1,mem_24g_sta_pid rtn +ifdef RF_DEBUG +p_g24_current_ch_index: + fetch 1,mem_24g_current_ch_number + beq 0,test_h_l_index_1 + beq 1,test_h_l_h_l_index_2 + beq 2,test_h_l_h_l_h_l_index_3 + beq 3,test_h_l_h_l_h_l_h_l_index_4 + rtn +endif + p_g24_transmit_ack: //data type fetch 1,mem_24g_rxbuf @@ -1475,6 +1489,9 @@ branch soft_reset+3 p_shutdown_radio: +ifdef RF_DEBUG + call test_gpio_low +endif force 8,radio_ctrl branch shutdown_radio+1 @@ -1622,6 +1639,9 @@ call sleep call rf_rx_enable p_g24_receive_rxon: +ifdef RF_DEBUG + call test_h_l_h +endif call p_g24_prep disable user3 enable decode_fec0 @@ -1632,8 +1652,16 @@ iforce stop_watch correlate null,timeout nbranch p_g24_sync_timeout,sync -// disable decode_fec0 -// enable decode_fec1 + +ifdef RF_DEBUG + call test_gpio_low + call test_gpio_high +endif + fetch 1,mem_24g_disable_fec1 + nbranch p_g24_receive_skip_fec1,blank + disable decode_fec0 + enable decode_fec1 +p_g24_receive_skip_fec1: enable enable_white enable enable_crc parse demod,bucket,8 @@ -1679,11 +1707,20 @@ rshift32 pdata,pdata rshift16 pdata,pdata istore 3,contw - disable decode_fec0 + fetch 1,mem_24g_disable_fec1 + nbranch p_g24_receive_skip_disable_fec1,blank + disable decode_fec1 +p_g24_receive_skip_next: ifdef DONGLE call save_rssi endif branch p_g24_end_of_packet,crc_failed + +ifdef RF_DEBUG + call test_gpio_low + call test_gpio_high +endif + enable user3 fetch 1,mem_last_freq add pdata,0,rega @@ -1699,11 +1736,19 @@ call p_rssi_signal endif rtn + +p_g24_receive_skip_disable_fec1: + disable decode_fec0 + branch p_g24_receive_skip_next p_g24_end_of_packet: disable encode_fec1 disable decode_fec1 - branch end_of_packet + call end_of_packet +ifdef RF_DEBUG + call test_gpio_low +endif + rtn p_g24_sync_timeout: ifdef DONGLE @@ -1726,12 +1771,21 @@ enable encode_fec0 enable is_tx disable is_rx + +ifdef RF_DEBUG + call test_gpio_high + call p_g24_current_ch_index +endif + rshift16 access,pdata rshift8 pdata,pdata rshift4 pdata,pdata inject mod,40 - //disable encode_fec0 - //enable encode_fec1 + fetch 1,mem_24g_disable_fec1 + nbranch p_g24_transmit_next,blank + disable encode_fec0 + enable encode_fec1 +p_g24_transmit_next: enable enable_white enable enable_crc fetch 1,mem_24g_syncword_crc8 @@ -1753,8 +1807,69 @@ until null,tx_clear nop 100 disable encode_fec0 - //disable encode_fec1 + fetch 1,mem_24g_disable_fec1 + nrtn blank + disable encode_fec1 + rtn + +endif + +ifdef RF_DEBUG +test_gpio_low: + arg 6,temp + call gpio_config_output + arg 6,temp + call gpio_out_active + nop 10 + rtn +test_gpio_high: + arg 6,temp + call gpio_config_output + arg 6,temp + call gpio_out_inactive + nop 10 rtn +test_gpio2_init: + arg 27,temp + call gpio_config_output +test_gpio2_low: + arg 27,temp + call gpio_out_active + nop 10 + rtn +test_gpio2_high: + arg 27,temp + call gpio_out_inactive + nop 10 + rtn + +test_h_l: + call test_gpio_high + branch test_gpio_low +test_h_l_h: + call test_gpio_high + call test_gpio_low + branch test_gpio_high + +test_h_l_index_1: + call test_gpio2_high + branch test_gpio2_low + +test_h_l_h_l_index_2: + call test_h_l_index_1 + branch test_h_l_index_1 + +test_h_l_h_l_h_l_index_3: + call test_h_l_index_1 + branch test_h_l_h_l_index_2 + +test_h_l_h_l_h_l_h_l_index_4: + call test_h_l_index_1 + branch test_h_l_h_l_h_l_index_3 + endif + + + Index: sched/usb.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/LXL-186_Dongle_24M_New_Process_Gan/sched/usb.dat (revision 4123) +++ /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/LXL-186_Dongle_24M_New_Process_Gan/sched/usb.dat (working copy) @@ -192,6 +192,7 @@ #usb initial end +mem_24g_disable_fec1:00 #00:enable 1/3fec 01:disable 1/3fec #24g rx init mem_tx_power:02 @@ -201,10 +202,10 @@ mem_24g_rx_window:30 75#rx mem_24g_hop_interval:1e mem_24g_ackpayload_enable:00#ack payload enable -mem_24g_ch_map1:00 1e 00 4e -mem_24g_ch_map2:03 23 03 42 -mem_24g_ch_map3:06 25 06 4c -mem_24g_ch_map4:09 27 09 3c +mem_24g_ch_map1:00 13 2c 42 +mem_24g_ch_map2:06 15 36 48 +mem_24g_ch_map3:0f 1a 3a 4c +mem_24g_ch_map4:11 23 31 4d mem_24g_paring_addr:20 15 10 05 mem_lap:3c 2a 10 09 07 2b #low 4B used for mem_24g_rx_addr @@ -214,6 +215,6 @@ mem_eeprom_block_size:20 mem_eeprom_wp_gpio:14 -mem_firmware_version:04 00 24 +mem_firmware_version:05 00 24