diff options
Diffstat (limited to 'gr-trellis/doc/gr-trellis.xml')
| -rw-r--r-- | gr-trellis/doc/gr-trellis.xml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gr-trellis/doc/gr-trellis.xml b/gr-trellis/doc/gr-trellis.xml index 42bd54b32c..6ffbb9ec2c 100644 --- a/gr-trellis/doc/gr-trellis.xml +++ b/gr-trellis/doc/gr-trellis.xml @@ -570,8 +570,8 @@ and an initial state (which is set to 0 in this example). </para> <programlisting> 15 # TX - 16 src = gr.lfsr_32k_source_s() - 17 src_head = gr.head (gr.sizeof_short,Kb/16) # packet size in shorts + 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 </programlisting> @@ -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> @@ -803,7 +803,7 @@ L being the channel length. This is sufficient to drive the initial and final st 22 for i in range(L): # first/last L symbols set to 0 23 packet[i] = 0 24 packet[len(packet)-i-1] = 0 - 25 src = gr.vector_source_s(packet,False) + 25 src = blocks.vector_source_s(packet,False) 26 mod = digital.chunks_to_symbols_sf(modulation[1],modulation[0]) </programlisting> @@ -813,7 +813,7 @@ The modulated symbols are filtered by the ISI channel and AWGN with appropriate </para> <programlisting> 28 # CHANNEL - 29 isi = gr.fir_filter_fff(1,channel) + 29 isi = filter.fir_filter_fff(1,channel) 30 add = blocks.add_ff() 31 noise = analog.noise_source_f(analog.GR_GAUSSIAN,math.sqrt(N0/2),seed) </programlisting> @@ -826,11 +826,11 @@ Also note that the first L observations are irrelevant and thus can be skipped. </para> <programlisting> 33 # RX - 34 skip = gr.skiphead(gr.sizeof_float, L) # skip the first L samples since you know they are coming from the L zero symbols + 34 skip = blocks.skiphead(gr.sizeof_float, L) # skip the first L samples since you know they are coming from the L zero symbols 35 #metrics = trellis.metrics_f(f.O(),dimensionality,tot_constellation,trellis.TRELLIS_EUCLIDEAN) # data preprocessing to generate metrics for Viterbi 36 #va = trellis.viterbi_s(f,K+L,0,0) # Put -1 if the Initial/Final states are not set. 37 va = trellis.viterbi_combined_s(f,K+L,0,0,dimensionality,tot_constellation,trellis.TRELLIS_EUCLIDEAN) # using viterbi_combined_s instead of metrics_f/viterbi_s allows larger packet lengths because metrics_f is complaining for not being able to allocate large buffers. This is due to the large f.O() in this application... - 38 dst = gr.vector_sink_s() + 38 dst = blocks.vector_sink_s() </programlisting> <para> |