diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-18 13:13:48 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-18 13:13:48 -0400 |
| commit | 0183e3ed10c551fefdbb0ed095d896cf01699a54 (patch) | |
| tree | 788ff905a1299f948ed6908d7076a7caad17c5f1 /gr-trellis/doc | |
| parent | d26514b07a5d15206687b636a2a0c51ad10684c1 (diff) | |
blocks: removing lfsr and friends from core; now in gr-blocks.
Diffstat (limited to 'gr-trellis/doc')
| -rw-r--r-- | gr-trellis/doc/gr-trellis.xml | 4 | ||||
| -rw-r--r-- | gr-trellis/doc/test_tcm.py | 4 | ||||
| -rw-r--r-- | gr-trellis/doc/test_tcm.py.xml | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/gr-trellis/doc/gr-trellis.xml b/gr-trellis/doc/gr-trellis.xml index 335c77a39..6ffbb9ec2 100644 --- a/gr-trellis/doc/gr-trellis.xml +++ b/gr-trellis/doc/gr-trellis.xml @@ -570,7 +570,7 @@ and an initial state (which is set to 0 in this example). </para> <programlisting> 15 # TX - 16 src = gr.lfsr_32k_source_s() + 16 src = blocks.lfsr_32k_source_s() 17 src_head = blocks.head (gr.sizeof_short,Kb/16) # packet size in shorts 18 s2fsmi = blocks.packed_to_unpacked_ss(bitspersymbol,gr.GR_MSB_FIRST) # unpack shorts to symbols compatible with the FSM input cardinality 19 enc = trellis.encoder_ss(f,0) # initial state = 0 @@ -647,7 +647,7 @@ are then packed to shorts and compared with the transmitted sequence. <programlisting> 28 va = trellis.viterbi_s(f,K,0,-1) # Put -1 if the Initial/Final states are not set. 29 fsmi2s = blocks.unpacked_to_packed_ss(bitspersymbol,gr.GR_MSB_FIRST) # pack FSM input symbols to shorts - 30 dst = gr.check_lfsr_32k_s(); + 30 dst = blocks.check_lfsr_32k_s(); </programlisting> diff --git a/gr-trellis/doc/test_tcm.py b/gr-trellis/doc/test_tcm.py index 6bfa083ae..61ab00f1c 100644 --- a/gr-trellis/doc/test_tcm.py +++ b/gr-trellis/doc/test_tcm.py @@ -19,7 +19,7 @@ def run_test (f,Kb,bitspersymbol,K,dimensionality,constellation,N0,seed): tb = gr.top_block () # TX - src = gr.lfsr_32k_source_s() + src = blocks.lfsr_32k_source_s() src_head = blocks.head (gr.sizeof_short,Kb/16) # packet size in shorts s2fsmi = blocks.packed_to_unpacked_ss(bitspersymbol,gr.GR_MSB_FIRST) # unpack shorts to symbols compatible with the FSM input cardinality enc = trellis.encoder_ss(f,0) # initial state = 0 @@ -33,7 +33,7 @@ def run_test (f,Kb,bitspersymbol,K,dimensionality,constellation,N0,seed): metrics = trellis.metrics_f(f.O(),dimensionality,constellation,digital.TRELLIS_EUCLIDEAN) # data preprocessing to generate metrics for Viterbi va = trellis.viterbi_s(f,K,0,-1) # Put -1 if the Initial/Final states are not set. fsmi2s = blocks.unpacked_to_packed_ss(bitspersymbol,gr.GR_MSB_FIRST) # pack FSM input symbols to shorts - dst = gr.check_lfsr_32k_s(); + dst = blocks.check_lfsr_32k_s(); tb.connect (src,src_head,s2fsmi,enc,mod) tb.connect (mod,(add,0)) diff --git a/gr-trellis/doc/test_tcm.py.xml b/gr-trellis/doc/test_tcm.py.xml index c66363098..77009b585 100644 --- a/gr-trellis/doc/test_tcm.py.xml +++ b/gr-trellis/doc/test_tcm.py.xml @@ -15,7 +15,7 @@ 13 tb = gr.top_block () 14 15 # TX - 16 src = gr.lfsr_32k_source_s() + 16 src = blocks.lfsr_32k_source_s() 17 src_head = blocks.head (gr.sizeof_short,Kb/16) # packet size in shorts 18 s2fsmi = blocks.packed_to_unpacked_ss(bitspersymbol,gr.GR_MSB_FIRST) # unpack shorts to symbols compatible with the FSM input cardinality 19 enc = trellis.encoder_ss(f,0) # initial state = 0 @@ -29,7 +29,7 @@ 27 metrics = trellis.metrics_f(f.O(),dimensionality,constellation,trellis.TRELLIS_EUCLIDEAN) # data preprocessing to generate metrics for Viterbi 28 va = trellis.viterbi_s(f,K,0,-1) # Put -1 if the Initial/Final states are not set. 29 fsmi2s = blocks.unpacked_to_packed_ss(bitspersymbol,gr.GR_MSB_FIRST) # pack FSM input symbols to shorts - 30 dst = gr.check_lfsr_32k_s(); + 30 dst = blocks.check_lfsr_32k_s(); 31 32 tb.connect (src,src_head,s2fsmi,enc,mod) 33 tb.connect (mod,(add,0)) |