diff options
27 files changed, 118 insertions, 671 deletions
diff --git a/gnuradio-examples/python/digital/Makefile.am b/gnuradio-examples/python/digital/Makefile.am index e32180cd4..f9d129400 100644 --- a/gnuradio-examples/python/digital/Makefile.am +++ b/gnuradio-examples/python/digital/Makefile.am @@ -41,8 +41,4 @@ dist_ourdata_SCRIPTS = \ benchmark_tx.py \ benchmark_qt_rx.py \ benchmark_qt_loopback.py\ - gen_whitener.py \ - rx_voice.py \ - run_length.py \ - tunnel.py \ - tx_voice.py + tunnel.py
\ No newline at end of file diff --git a/gr-digital/examples/.gitignore b/gr-digital/examples/.gitignore index b336cc7ce..d7028d40d 100644 --- a/gr-digital/examples/.gitignore +++ b/gr-digital/examples/.gitignore @@ -1,2 +1,8 @@ /Makefile /Makefile.in +/*.8b +/*.16s +/*.16i +/*.32f +/*.32fc +/*.16sc diff --git a/gr-digital/examples/Makefile.am b/gr-digital/examples/Makefile.am index ca36716fa..849e826a1 100644 --- a/gr-digital/examples/Makefile.am +++ b/gr-digital/examples/Makefile.am @@ -24,10 +24,18 @@ include $(top_srcdir)/Makefile.common ourdatadir = $(exampledir)/digital noinst_PYTHON = \ - example_fll.py + example_costas.py \ + example_fll.py \ + example_timing.py dist_ourdata_SCRIPTS = \ transmit_path.py \ - receive_path.py + receive_path.py \ + benchmark_tx.py \ + benchmark_rx.py \ + tx_voice.py \ + rx_voice.py \ + run_length.py \ + gen_whitener.py diff --git a/gr-digital/examples/benchmark_tx.py b/gr-digital/examples/benchmark_tx.py index e5d24915a..92013a532 100755 --- a/gr-digital/examples/benchmark_tx.py +++ b/gr-digital/examples/benchmark_tx.py @@ -20,8 +20,8 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gru -from gnuradio import usrp +from gnuradio import gr +from gnuradio import uhd from gnuradio import eng_notation from gnuradio.eng_option import eng_option from optparse import OptionParser diff --git a/gnuradio-examples/python/digital/gen_whitener.py b/gr-digital/examples/gen_whitener.py index 9a81e4eaa..9a81e4eaa 100755 --- a/gnuradio-examples/python/digital/gen_whitener.py +++ b/gr-digital/examples/gen_whitener.py diff --git a/gnuradio-examples/python/digital/run_length.py b/gr-digital/examples/run_length.py index 5020655db..5020655db 100755 --- a/gnuradio-examples/python/digital/run_length.py +++ b/gr-digital/examples/run_length.py diff --git a/gnuradio-examples/python/digital/rx_voice.py b/gr-digital/examples/rx_voice.py index 1aad1ff8e..d29d64ed6 100755 --- a/gnuradio-examples/python/digital/rx_voice.py +++ b/gr-digital/examples/rx_voice.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright 2005,2006,2009 Free Software Foundation, Inc. +# Copyright 2005,2006,2009,2011 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -20,8 +20,8 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gru, modulation_utils -from gnuradio import usrp +from gnuradio import gr +from gnuradio import uhd from gnuradio import audio from gnuradio import eng_notation from gnuradio.eng_option import eng_option @@ -29,12 +29,15 @@ from optparse import OptionParser from gnuradio.vocoder import gsm_full_rate +# From gr-digital +from gnuradio import digital + import random import struct import sys # from current dir -import usrp_receive_path +from receive_path import receive_path #import os #print os.getpid() @@ -47,11 +50,12 @@ class audio_tx(gr.hier_block2): gr.io_signature(0, 0, 0), # Input signature gr.io_signature(0, 0, 0)) # Output signature + sample_rate = 8000 self.packet_src = gr.message_source(33) voice_decoder = gsm_full_rate.decode_ps() s2f = gr.short_to_float () sink_scale = gr.multiply_const_ff(1.0/32767.) - audio_sink = audio.sink(8000, audio_output_dev) + audio_sink = audio.sink(sample_rate, audio_output_dev) self.connect(self.packet_src, voice_decoder, s2f, sink_scale, audio_sink) def msgq(self): @@ -61,9 +65,18 @@ class audio_tx(gr.hier_block2): class my_top_block(gr.top_block): def __init__(self, demod_class, rx_callback, options): gr.top_block.__init__(self) - self.rxpath = usrp_receive_path.usrp_receive_path(demod_class, rx_callback, options) + self.rxpath = receive_path(demod_class, rx_callback, options) self.audio_tx = audio_tx(options.audio_output) - self.connect(self.rxpath) + + if(options.from_file is not None): + self.thr = gr.throttle(gr.sizeof_gr_complex, options.bitrate) + self.source = gr.file_source(gr.sizeof_gr_complex, options.from_file) + self.connect(self.source, self.thr, self.rxpath) + else: + self.thr = gr.throttle(gr.sizeof_gr_complex, 1e6) + self.source = gr.null_source(gr.sizeof_gr_complex) + self.connect(self.source, self.thr, self.rxpath) + self.connect(self.audio_tx) # ///////////////////////////////////////////////////////////////////////////// @@ -89,7 +102,7 @@ def main(): print "ok = %r n_rcvd = %4d n_right = %4d" % ( ok, n_rcvd, n_right) - demods = modulation_utils.type_1_demods() + demods = digital.modulation_utils2.type_1_demods() # Create Options Parser: parser = OptionParser (option_class=eng_option, conflict_handler="resolve") @@ -101,7 +114,9 @@ def main(): % (', '.join(demods.keys()),)) parser.add_option("-O", "--audio-output", type="string", default="", help="pcm output device name. E.g., hw:0,0 or /dev/dsp") - usrp_receive_path.add_options(parser, expert_grp) + parser.add_option("","--from-file", default=None, + help="input file of samples to demod") + receive_path.add_options(parser, expert_grp) for mod in demods.values(): mod.add_options(expert_grp) @@ -113,10 +128,11 @@ def main(): parser.print_help(sys.stderr) sys.exit(1) - if options.rx_freq is None: - sys.stderr.write("You must specify -f FREQ or --freq FREQ\n") - parser.print_help(sys.stderr) - sys.exit(1) + if options.from_file is None: + if options.rx_freq is None: + sys.stderr.write("You must specify -f FREQ or --freq FREQ\n") + parser.print_help(sys.stderr) + sys.exit(1) # build the graph diff --git a/gnuradio-examples/python/digital/tx_voice.py b/gr-digital/examples/tx_voice.py index d8692beb4..f4f2c3a86 100755 --- a/gnuradio-examples/python/digital/tx_voice.py +++ b/gr-digital/examples/tx_voice.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright 2005,2006,2007,2009 Free Software Foundation, Inc. +# Copyright 2005-2007,2009,2011 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -20,8 +20,8 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gru, modulation_utils -from gnuradio import usrp +from gnuradio import gr +from gnuradio import uhd from gnuradio import audio from gnuradio import eng_notation from gnuradio.eng_option import eng_option @@ -29,13 +29,16 @@ from optparse import OptionParser from gnuradio.vocoder import gsm_full_rate +# From gr-digital +from gnuradio import digital + import random import time import struct import sys # from current dir -import usrp_transmit_path +from transmit_path import transmit_path #import os #print os.getpid() @@ -64,11 +67,17 @@ class my_top_block(gr.top_block): def __init__(self, modulator_class, options): gr.top_block.__init__(self) - self.txpath = usrp_transmit_path.usrp_transmit_path(modulator_class, options) + self.txpath = transmit_path(modulator_class, options) self.audio_rx = audio_rx(options.audio_input) - self.connect(self.txpath) - self.connect(self.audio_rx) + if(options.to_file is not None): + self.sink = gr.file_sink(gr.sizeof_gr_complex, options.to_file) + else: + self.sink = gr.null_sink(gr.sizeof_gr_complex) + + self.connect(self.audio_rx) + self.connect(self.txpath, self.sink) + # ///////////////////////////////////////////////////////////////////////////// # main @@ -82,7 +91,7 @@ def main(): def rx_callback(ok, payload): print "ok = %r, payload = '%s'" % (ok, payload) - mods = modulation_utils.type_1_mods() + mods = digital.modulation_utils2.type_1_mods() parser = OptionParser(option_class=eng_option, conflict_handler="resolve") expert_grp = parser.add_option_group("Expert") @@ -95,7 +104,9 @@ def main(): help="set megabytes to transmit [default=inf]") parser.add_option("-I", "--audio-input", type="string", default="", help="pcm input device name. E.g., hw:0,0 or /dev/dsp") - usrp_transmit_path.add_options(parser, expert_grp) + parser.add_option("","--to-file", default=None, + help="Output file for modulated samples") + transmit_path.add_options(parser, expert_grp) for mod in mods.values(): mod.add_options(expert_grp) @@ -107,11 +118,11 @@ def main(): parser.print_help() sys.exit(1) - if options.tx_freq is None: - sys.stderr.write("You must specify -f FREQ or --freq FREQ\n") - parser.print_help(sys.stderr) - sys.exit(1) - + if options.to_file is None: + if options.tx_freq is None: + sys.stderr.write("You must specify -f FREQ or --freq FREQ\n") + parser.print_help(sys.stderr) + sys.exit(1) # build the graph tb = my_top_block(mods[options.modulation], options) diff --git a/gr-digital/grc/Makefile.am b/gr-digital/grc/Makefile.am index 963939f12..e4426e721 100644 --- a/gr-digital/grc/Makefile.am +++ b/gr-digital/grc/Makefile.am @@ -25,15 +25,19 @@ grcblocksdir = $(grc_blocksdir) dist_grcblocks_DATA = \ digital_block_tree.xml \ + digital_binary_slicer_fb.xml \ + digital_clock_recovery_mm_xx.xml \ + digital_constellation_decoder_cb.xml \ + digital_correlate_access_code_bb.xml \ digital_costas_loop_cc.xml \ digital_cma_equalizer_cc.xml \ - digital_lms_dd_equalizer_cc.xml \ + digital_fll_band_edge_cc.xml \ digital_kurtotic_equalizer_cc.xml \ + digital_lms_dd_equalizer_cc.xml \ + digital_mpsk_receiver_cc.xml \ digital_dxpsk_mod.xml \ digital_dxpsk_demod.xml \ digital_psk_mod.xml \ digital_psk_demod.xml \ digital_qam_mod.xml \ - digital_qam_demod.xml \ - digital_fll_band_edge_cc.xml \ - digital_mpsk_receiver_cc.xml + digital_qam_demod.xml diff --git a/grc/blocks/gr_binary_slicer_fb.xml b/gr-digital/grc/digital_binary_slicer_fb.xml index 85d71e709..3187d13f9 100644 --- a/grc/blocks/gr_binary_slicer_fb.xml +++ b/gr-digital/grc/digital_binary_slicer_fb.xml @@ -6,9 +6,9 @@ --> <block> <name>Binary Slicer</name> - <key>gr_binary_slicer_fb</key> - <import>from gnuradio import gr</import> - <make>gr.binary_slicer_fb()</make> + <key>digital_binary_slicer_fb</key> + <import>from gnuradio import digital</import> + <make>digital.binary_slicer_fb()</make> <sink> <name>in</name> <type>float</type> diff --git a/gr-digital/grc/digital_block_tree.xml b/gr-digital/grc/digital_block_tree.xml index 3432d876c..088fe1c10 100644 --- a/gr-digital/grc/digital_block_tree.xml +++ b/gr-digital/grc/digital_block_tree.xml @@ -30,11 +30,15 @@ <name></name> <!-- Blank for Root Name --> <cat> <name>Digital</name> - <block>digital_costas_loop_cc</block> + <block>digital_binary_slicer_fb</block> + <block>digital_clock_recovery_mm_xx</block> <block>digital_cma_equalizer_cc</block> - <block>digital_lms_dd_equalizer_cc</block> - <block>digital_kurtotic_equalizer_cc</block> + <block>digital_constellation_decoder_cb</block> + <block>digital_correlate_access_code_bb</block> + <block>digital_costas_loop_cc</block> <block>digital_fll_band_edge_cc</block> + <block>digital_kurtotic_equalizer_cc</block> + <block>digital_lms_dd_equalizer_cc</block> <block>digital_mpsk_receiver_cc</block> </cat> <cat> diff --git a/grc/blocks/gr_clock_recovery_mm_xx.xml b/gr-digital/grc/digital_clock_recovery_mm_xx.xml index 613cc23bf..d9c5ea4ff 100644 --- a/grc/blocks/gr_clock_recovery_mm_xx.xml +++ b/gr-digital/grc/digital_clock_recovery_mm_xx.xml @@ -6,9 +6,9 @@ --> <block> <name>Clock Recovery MM</name> - <key>gr_clock_recovery_mm_xx</key> - <import>from gnuradio import gr</import> - <make>gr.clock_recovery_mm_$(type.fcn)($omega, $gain_omega, $mu, $gain_mu, $omega_relative_limit)</make> + <key>digital_clock_recovery_mm_xx</key> + <import>from gnuradio import digital</import> + <make>digital.clock_recovery_mm_$(type.fcn)($omega, $gain_omega, $mu, $gain_mu, $omega_relative_limit)</make> <callback>set_omega($omega)</callback> <callback>set_gain_omega($gain_omega)</callback> <callback>set_mu($mu)</callback> diff --git a/grc/blocks/gr_constellation_decoder_cb.xml b/gr-digital/grc/digital_constellation_decoder_cb.xml index 99d897a3a..c7353e288 100644 --- a/grc/blocks/gr_constellation_decoder_cb.xml +++ b/gr-digital/grc/digital_constellation_decoder_cb.xml @@ -6,18 +6,13 @@ --> <block> <name>Constellation Decoder</name> - <key>gr_constellation_decoder_cb</key> - <import>from gnuradio import gr</import> - <make>gr.constellation_decoder_cb($sym_position, $sym_value_out)</make> + <key>digital_constellation_decoder_cb</key> + <import>from gnuradio import digital</import> + <make>digital.constellation_decoder_cb($constellation)</make> <param> - <name>Symbol Position</name> - <key>sym_position</key> - <type>complex_vector</type> - </param> - <param> - <name>Symbol Value Out</name> - <key>sym_value_out</key> - <type>int_vector</type> + <name>Constellation Object</name> + <key>constellation</key> + <type>raw</type> </param> <sink> <name>in</name> diff --git a/grc/blocks/gr_correlate_access_code_bb.xml b/gr-digital/grc/digital_correlate_access_code_bb.xml index e13d2d070..3941834c4 100644 --- a/grc/blocks/gr_correlate_access_code_bb.xml +++ b/gr-digital/grc/digital_correlate_access_code_bb.xml @@ -6,9 +6,9 @@ --> <block> <name>Correlate Access Code</name> - <key>gr_correlate_access_code_bb</key> - <import>from gnuradio import gr</import> - <make>gr.correlate_access_code_bb($access_code, $threshold)</make> + <key>digital_correlate_access_code_bb</key> + <import>from gnuradio import digital</import> + <make>digital.correlate_access_code_bb($access_code, $threshold)</make> <param> <name>Access Code</name> <key>access_code</key> diff --git a/gr-digital/grc/digital_dxpsk_mod.xml b/gr-digital/grc/digital_dxpsk_mod.xml index 5d59f36e0..fbda9fb1f 100644 --- a/gr-digital/grc/digital_dxpsk_mod.xml +++ b/gr-digital/grc/digital_dxpsk_mod.xml @@ -23,7 +23,7 @@ <!-- ################################################### -##DPSK2 Mod - 2, 4, 8 +## DPSK Mod - 2, 4, 8 ################################################### --> <block> @@ -33,7 +33,7 @@ <make>digital.$(type)_mod( samples_per_symbol=$samples_per_symbol, excess_bw=$excess_bw, - gray_code=$gray_code, + gray_coded=$gray_coded, verbose=$verbose, log=$log) </make> @@ -68,7 +68,7 @@ </param> <param> <name>Gray Code</name> - <key>gray_code</key> + <key>gray_coded</key> <value>True</value> <type>bool</type> <option> diff --git a/gr-digital/grc/digital_fll_band_edge_cc.xml b/gr-digital/grc/digital_fll_band_edge_cc.xml index 1c5a34e54..e4da773db 100644 --- a/gr-digital/grc/digital_fll_band_edge_cc.xml +++ b/gr-digital/grc/digital_fll_band_edge_cc.xml @@ -6,9 +6,9 @@ --> <block> <name>FLL Band-Edge</name> - <key>gr_fll_band_edge_cc</key> - <import>from gnuradio import gr</import> - <make>gr.fll_band_edge_cc($samps_per_sym, $rolloff, $filter_size, $w)</make> + <key>digital_fll_band_edge_cc</key> + <import>from gnuradio import digital</import> + <make>digital.fll_band_edge_cc($samps_per_sym, $rolloff, $filter_size, $w)</make> <callback>set_loop_bandwidth($w)</callback> <param> <name>Type</name> diff --git a/gr-digital/grc/digital_mpsk_receiver_cc.xml b/gr-digital/grc/digital_mpsk_receiver_cc.xml index 948f18b6e..ab7e5c209 100644 --- a/gr-digital/grc/digital_mpsk_receiver_cc.xml +++ b/gr-digital/grc/digital_mpsk_receiver_cc.xml @@ -6,9 +6,9 @@ --> <block> <name>MPSK Receiver</name> - <key>gr_mpsk_receiver_cc</key> - <import>from gnuradio import gr</import> - <make>gr.mpsk_receiver_cc($M, $theta, $w, $fmin, $fmax, $mu, $gain_mu, $omega, $gain_omega, $omega_relative_limit)</make> + <key>digital_mpsk_receiver_cc</key> + <import>from gnuradio import digital</import> + <make>digital.mpsk_receiver_cc($M, $theta, $w, $fmin, $fmax, $mu, $gain_mu, $omega, $gain_omega, $omega_relative_limit)</make> <callback>set_loop_bandwidth($w)</callback> <callback>set_mu($mu)</callback> <callback>set_gain_mu($gain_mu)</callback> diff --git a/gr-digital/grc/digital_psk_mod.xml b/gr-digital/grc/digital_psk_mod.xml index f4566c2b4..34ed42c97 100644 --- a/gr-digital/grc/digital_psk_mod.xml +++ b/gr-digital/grc/digital_psk_mod.xml @@ -51,11 +51,11 @@ <type>enum</type> <option> <name>Yes</name> - <key>gray</key> + <key>"gray"</key> </option> <option> <name>No</name> - <key>none</key> + <key>"none"</key> </option> </param> <param> @@ -116,15 +116,10 @@ </param> <sink> <name>in</name> - <type>complex</type> + <type>byte</type> </sink> <source> <name>out</name> - <type>byte</type> - </source> - <source> - <name>sync</name> <type>complex</type> - <optional>1</optional> </source> </block> diff --git a/gr-digital/grc/digital_qam_mod.xml b/gr-digital/grc/digital_qam_mod.xml index 87782fe86..4d73d9a68 100644 --- a/gr-digital/grc/digital_qam_mod.xml +++ b/gr-digital/grc/digital_qam_mod.xml @@ -51,11 +51,11 @@ <type>enum</type> <option> <name>Yes</name> - <key>gray</key> + <key>"gray"</key> </option> <option> <name>No</name> - <key>none</key> + <key>"none"</key> </option> </param> <param> @@ -116,15 +116,10 @@ </param> <sink> <name>in</name> - <type>complex</type> + <type>byte</type> </sink> <source> <name>out</name> - <type>byte</type> - </source> - <source> - <name>sync</name> <type>complex</type> - <optional>1</optional> </source> </block> diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am index 6f72fe399..bed84adc8 100644 --- a/grc/blocks/Makefile.am +++ b/grc/blocks/Makefile.am @@ -30,10 +30,6 @@ dist_ourdata_DATA = \ blks2_analysis_filterbank.xml \ blks2_cvsd_encode.xml \ blks2_cvsd_decode.xml \ - blks2_dxpsk_demod.xml \ - blks2_dxpsk_mod.xml \ - blks2_dxpsk2_demod.xml \ - blks2_dxpsk2_mod.xml \ blks2_error_rate.xml \ blks2_fm_deemph.xml \ blks2_fm_demod_cf.xml \ @@ -71,12 +67,9 @@ dist_ourdata_DATA = \ gr_and_xx.xml \ gr_and_const_xx.xml \ gr_argmax_xx.xml \ - gr_binary_slicer_fb.xml \ gr_channel_model.xml \ gr_char_to_float.xml \ gr_chunks_to_symbols.xml \ - gr_clock_recovery_mm_xx.xml \ - gr_cma_equalizer_cc.xml \ gr_complex_to_arg.xml \ gr_complex_to_float.xml \ gr_complex_to_imag.xml \ @@ -85,10 +78,7 @@ dist_ourdata_DATA = \ gr_complex_to_mag_squared.xml \ gr_complex_to_real.xml \ gr_conjugate_cc.xml \ - gr_constellation_decoder_cb.xml \ gr_copy.xml \ - gr_correlate_access_code_bb.xml \ - gr_costas_loop_cc.xml \ gr_cpfsk_bc.xml \ gr_dc_blocker.xml \ gr_cpmmod_bc.xml \ diff --git a/grc/blocks/blks2_dxpsk2_demod.xml b/grc/blocks/blks2_dxpsk2_demod.xml deleted file mode 100644 index 7fe4be32b..000000000 --- a/grc/blocks/blks2_dxpsk2_demod.xml +++ /dev/null @@ -1,152 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -##DPSK2 Demod - 2, 4 -################################################### - --> -<block> - <name>DPSK2 Demod</name> - <key>blks2_dxpsk2_demod</key> - <import>from gnuradio import blks2</import> - <make>blks2.$(type)2_demod( - samples_per_symbol=$samples_per_symbol, - excess_bw=$excess_bw, - freq_alpha=$freq_alpha, - phase_alpha=$phase_alpha, - timing_alpha=$timing_alpha, - timing_max_dev=$timing_max_dev, - gray_code=$gray_code, - verbose=$verbose, - log=$log, - sync_out=$sync_out, -)</make> - <callback>clock_recov.set_alpha($costas_alpha)</callback> - <callback>clock_recov.set_beta(0.25*$costas_alpha**2)</callback> - <callback>time_recov.set_alpha($timing_alpha)</callback> - <param> - <name>Type</name> - <key>type</key> - <type>enum</type> - <option> - <name>DBPSK</name> - <key>dbpsk</key> - </option> - <option> - <name>DQPSK</name> - <key>dqpsk</key> - </option> - </param> - <param> - <name>Samples/Symbol</name> - <key>samples_per_symbol</key> - <value>2</value> - <type>int</type> - </param> - <param> - <name>Excess BW</name> - <key>excess_bw</key> - <value>0.35</value> - <type>real</type> - </param> - <param> - <name>FLL Alpha</name> - <key>freq_alpha</key> - <value>0.010</value> - <type>real</type> - </param> - <param> - <name>Phase Alpha</name> - <key>phase_alpha</key> - <value>0.100</value> - <type>real</type> - </param> - <param> - <name>Timing Alpha</name> - <key>timing_alpha</key> - <value>0.100</value> - <type>real</type> - </param> - <param> - <name>Timing Max Dev</name> - <key>timing_max_dev</key> - <value>1.5</value> - <type>real</type> - </param> - <param> - <name>Omega Relative Limit</name> - <key>omega_relative_limit</key> - <value>0.005</value> - <type>real</type> - </param> - <param> - <name>Gray Code</name> - <key>gray_code</key> - <value>True</value> - <type>bool</type> - <option> - <name>Yes</name> - <key>True</key> - </option> - <option> - <name>No</name> - <key>False</key> - </option> - </param> - <param> - <name>Verbose</name> - <key>verbose</key> - <value>False</value> - <type>bool</type> - <hide>#if str($verbose) == 'False' then 'part' else 'none'#</hide> - <option> - <name>On</name> - <key>True</key> - </option> - <option> - <name>Off</name> - <key>False</key> - </option> - </param> - <param> - <name>Logging</name> - <key>log</key> - <value>False</value> - <type>bool</type> - <hide>#if str($log) == 'False' then 'part' else 'none'#</hide> - <option> - <name>On</name> - <key>True</key> - </option> - <option> - <name>Off</name> - <key>False</key> - </option> - </param> - <param> - <name>Sync Out</name> - <key>sync_out</key> - <value>False</value> - <type>bool</type> - <option> - <name>On</name> - <key>True</key> - </option> - <option> - <name>Off</name> - <key>False</key> - </option> - </param> - <sink> - <name>in</name> - <type>complex</type> - </sink> - <source> - <name>out</name> - <type>byte</type> - </source> - <source> - <name>sync</name> - <type>complex</type> - <optional>1</optional> - </source> -</block> diff --git a/grc/blocks/blks2_dxpsk2_mod.xml b/grc/blocks/blks2_dxpsk2_mod.xml deleted file mode 100644 index bf292be17..000000000 --- a/grc/blocks/blks2_dxpsk2_mod.xml +++ /dev/null @@ -1,95 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -##DPSK2 Mod - 2, 4 -################################################### - --> -<block> - <name>DPSK2 Mod</name> - <key>blks2_dxpsk2_mod</key> - <import>from gnuradio import blks2</import> - <make>blks2.$(type)2_mod( - samples_per_symbol=$samples_per_symbol, - excess_bw=$excess_bw, - gray_code=$gray_code, - verbose=$verbose, - log=$log, -)</make> - <param> - <name>Type</name> - <key>type</key> - <type>enum</type> - <option> - <name>DBPSK</name> - <key>dbpsk</key> - </option> - <option> - <name>DQPSK</name> - <key>dqpsk</key> - </option> - </param> - <param> - <name>Samples/Symbol</name> - <key>samples_per_symbol</key> - <value>2</value> - <type>int</type> - </param> - <param> - <name>Excess BW</name> - <key>excess_bw</key> - <value>0.35</value> - <type>real</type> - </param> - <param> - <name>Gray Code</name> - <key>gray_code</key> - <value>True</value> - <type>bool</type> - <option> - <name>Yes</name> - <key>True</key> - </option> - <option> - <name>No</name> - <key>False</key> - </option> - </param> - <param> - <name>Verbose</name> - <key>verbose</key> - <value>False</value> - <type>bool</type> - <hide>#if str($verbose) == 'False' then 'part' else 'none'#</hide> - <option> - <name>On</name> - <key>True</key> - </option> - <option> - <name>Off</name> - <key>False</key> - </option> - </param> - <param> - <name>Logging</name> - <key>log</key> - <value>False</value> - <type>bool</type> - <hide>#if str($log) == 'False' then 'part' else 'none'#</hide> - <option> - <name>On</name> - <key>True</key> - </option> - <option> - <name>Off</name> - <key>False</key> - </option> - </param> - <sink> - <name>in</name> - <type>byte</type> - </sink> - <source> - <name>out</name> - <type>complex</type> - </source> -</block> diff --git a/grc/blocks/blks2_dxpsk_demod.xml b/grc/blocks/blks2_dxpsk_demod.xml deleted file mode 100644 index 1c96b6cec..000000000 --- a/grc/blocks/blks2_dxpsk_demod.xml +++ /dev/null @@ -1,127 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -##DPSK Demod - 2, 4, 8 -################################################### - --> -<block> - <name>DPSK Demod</name> - <key>blks2_dxpsk_demod</key> - <import>from gnuradio import blks2</import> - <make>blks2.$(type)_demod( - samples_per_symbol=$samples_per_symbol, - excess_bw=$excess_bw, - costas_alpha=$costas_alpha, - gain_mu=$gain_mu, - mu=$mu, - omega_relative_limit=$omega_relative_limit, - gray_code=$gray_code, - verbose=$verbose, - log=$log, -)</make> - <param> - <name>Type</name> - <key>type</key> - <type>enum</type> - <option> - <name>DBPSK</name> - <key>dbpsk</key> - </option> - <option> - <name>DQPSK</name> - <key>dqpsk</key> - </option> - <option> - <name>D8PSK</name> - <key>d8psk</key> - </option> - </param> - <param> - <name>Samples/Symbol</name> - <key>samples_per_symbol</key> - <value>2</value> - <type>int</type> - </param> - <param> - <name>Excess BW</name> - <key>excess_bw</key> - <value>0.35</value> - <type>real</type> - </param> - <param> - <name>Costas Alpha</name> - <key>costas_alpha</key> - <value>0.175</value> - <type>real</type> - </param> - <param> - <name>Gain Mu</name> - <key>gain_mu</key> - <value>0.175</value> - <type>real</type> - </param> - <param> - <name>Mu</name> - <key>mu</key> - <value>0.5</value> - <type>real</type> - </param> - <param> - <name>Omega Relative Limit</name> - <key>omega_relative_limit</key> - <value>0.005</value> - <type>real</type> - </param> - <param> - <name>Gray Code</name> - <key>gray_code</key> - <value>True</value> - <type>bool</type> - <option> - <name>Yes</name> - <key>True</key> - </option> - <option> - <name>No</name> - <key>False</key> - </option> - </param> - <param> - <name>Verbose</name> - <key>verbose</key> - <value>False</value> - <type>bool</type> - <hide>#if str($verbose) == 'False' then 'part' else 'none'#</hide> - <option> - <name>On</name> - <key>True</key> - </option> - <option> - <name>Off</name> - <key>False</key> - </option> - </param> - <param> - <name>Logging</name> - <key>log</key> - <value>False</value> - <type>bool</type> - <hide>#if str($log) == 'False' then 'part' else 'none'#</hide> - <option> - <name>On</name> - <key>True</key> - </option> - <option> - <name>Off</name> - <key>False</key> - </option> - </param> - <sink> - <name>in</name> - <type>complex</type> - </sink> - <source> - <name>out</name> - <type>byte</type> - </source> -</block> diff --git a/grc/blocks/blks2_dxpsk_mod.xml b/grc/blocks/blks2_dxpsk_mod.xml deleted file mode 100644 index 77505d8ad..000000000 --- a/grc/blocks/blks2_dxpsk_mod.xml +++ /dev/null @@ -1,99 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -##DPSK Mod - 2, 4, 8 -################################################### - --> -<block> - <name>DPSK Mod</name> - <key>blks2_dxpsk_mod</key> - <import>from gnuradio import blks2</import> - <make>blks2.$(type)_mod( - samples_per_symbol=$samples_per_symbol, - excess_bw=$excess_bw, - gray_code=$gray_code, - verbose=$verbose, - log=$log, -)</make> - <param> - <name>Type</name> - <key>type</key> - <type>enum</type> - <option> - <name>DBPSK</name> - <key>dbpsk</key> - </option> - <option> - <name>DQPSK</name> - <key>dqpsk</key> - </option> - <option> - <name>D8PSK</name> - <key>d8psk</key> - </option> - </param> - <param> - <name>Samples/Symbol</name> - <key>samples_per_symbol</key> - <value>2</value> - <type>int</type> - </param> - <param> - <name>Excess BW</name> - <key>excess_bw</key> - <value>0.35</value> - <type>real</type> - </param> - <param> - <name>Gray Code</name> - <key>gray_code</key> - <value>True</value> - <type>bool</type> - <option> - <name>Yes</name> - <key>True</key> - </option> - <option> - <name>No</name> - <key>False</key> - </option> - </param> - <param> - <name>Verbose</name> - <key>verbose</key> - <value>False</value> - <type>bool</type> - <hide>#if str($verbose) == 'False' then 'part' else 'none'#</hide> - <option> - <name>On</name> - <key>True</key> - </option> - <option> - <name>Off</name> - <key>False</key> - </option> - </param> - <param> - <name>Logging</name> - <key>log</key> - <value>False</value> - <type>bool</type> - <hide>#if str($log) == 'False' then 'part' else 'none'#</hide> - <option> - <name>On</name> - <key>True</key> - </option> - <option> - <name>Off</name> - <key>False</key> - </option> - </param> - <sink> - <name>in</name> - <type>byte</type> - </sink> - <source> - <name>out</name> - <type>complex</type> - </source> -</block> diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml index f5365dcb5..c729d4903 100644 --- a/grc/blocks/block_tree.xml +++ b/grc/blocks/block_tree.xml @@ -110,23 +110,19 @@ <block>gr_unpacked_to_packed_xx</block> <block>gr_packed_to_unpacked_xx</block> <block>gr_unpack_k_bits_bb</block> - <block>gr_binary_slicer_fb</block> <block>gr_chunks_to_symbols_xx</block> <block>gr_map_bb</block> </cat> <cat> <name>Synchronizers</name> - <block>gr_clock_recovery_mm_xx</block> <block>gr_pfb_clock_sync_xxx</block> - <block>gr_costas_loop_cc</block> <block>gr_mpsk_sync_cc</block> <block>gr_pll_carriertracking_cc</block> <block>gr_pll_freqdet_cf</block> <block>gr_pll_refout_cc</block> - <block>gr_correlate_access_code_bb</block> <block>gr_pn_correlator_cc</block> <block>gr_simple_correlator</block> <block>gr_simple_framer</block> @@ -178,7 +174,6 @@ <block>gr_single_pole_iir_filter_xx</block> <block>gr_hilbert_fc</block> <block>gr_goertzel_fc</block> - <block>gr_cma_equalizer_cc</block> <block>gr_rational_resampler_base_xxx</block> <block>blks2_rational_resampler_xxx</block> <block>gr_fractional_interpolator_xx</block> @@ -198,7 +193,6 @@ <block>gr_gmskmod_bc</block> <block>gr_diff_phasor_cc</block> - <block>gr_constellation_decoder_cb</block> <block>gr_diff_encoder_bb</block> <block>gr_diff_decoder_bb</block> @@ -215,12 +209,6 @@ <block>blks2_fm_deemph</block> <block>blks2_fm_preemph</block> - <block>blks2_dxpsk_mod</block> - <block>blks2_dxpsk_demod</block> - - <block>blks2_dxpsk2_mod</block> - <block>blks2_dxpsk2_demod</block> - <block>blks2_gmsk_mod</block> <block>blks2_gmsk_demod</block> diff --git a/grc/blocks/gr_cma_equalizer_cc.xml b/grc/blocks/gr_cma_equalizer_cc.xml deleted file mode 100644 index 142fb6d81..000000000 --- a/grc/blocks/gr_cma_equalizer_cc.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -##CMA Equalizer -################################################### - --> -<block> - <name>CMA Equalizer</name> - <key>gr_cma_equalizer_cc</key> - <import>from gnuradio import gr</import> - <make>gr.cma_equalizer_cc($num_taps, $modulus, $mu)</make> - <param> - <name>Num Taps</name> - <key>num_taps</key> - <value>64</value> - <type>int</type> - </param> - <param> - <name>Modulus</name> - <key>modulus</key> - <type>real</type> - </param> - <param> - <name>Mu</name> - <key>mu</key> - <type>real</type> - </param> - <sink> - <name>in</name> - <type>complex</type> - </sink> - <source> - <name>out</name> - <type>complex</type> - </source> -</block> diff --git a/grc/blocks/gr_costas_loop_cc.xml b/grc/blocks/gr_costas_loop_cc.xml deleted file mode 100644 index e0db8bc5d..000000000 --- a/grc/blocks/gr_costas_loop_cc.xml +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -##Costas Loop -################################################### - --> -<block> - <name>Costas Loop</name> - <key>gr_costas_loop_cc</key> - <import>from gnuradio import gr</import> - <make>gr.costas_loop_cc($alpha, $beta, $max_freq, $min_freq, $order)</make> - <callback>set_alpha($alpha)</callback> - <callback>set_beta($beta)</callback> - <param> - <name>Alpha</name> - <key>alpha</key> - <type>real</type> - </param> - <param> - <name>Beta</name> - <key>beta</key> - <type>real</type> - </param> - <param> - <name>Max Freq</name> - <key>max_freq</key> - <type>real</type> - </param> - <param> - <name>Min Freq</name> - <key>min_freq</key> - <type>real</type> - </param> - <param> - <name>Order</name> - <key>order</key> - <type>int</type> - </param> - <sink> - <name>in</name> - <type>complex</type> - </sink> - <source> - <name>out</name> - <type>complex</type> - </source> - <source> - <name>out</name> - <type>complex</type> - <optional>1</optional> - </source> -</block> |