diff options
Diffstat (limited to 'gnuradio-core/src/python')
19 files changed, 8 insertions, 433 deletions
diff --git a/gnuradio-core/src/python/.gitignore b/gnuradio-core/src/python/.gitignore deleted file mode 100644 index f9c5da0db..000000000 --- a/gnuradio-core/src/python/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -/Makefile -/Makefile.in -/.deps -/.libs -/*.la -/*.lo -/*.pyc -/*.pyo diff --git a/gnuradio-core/src/python/Makefile.am b/gnuradio-core/src/python/Makefile.am deleted file mode 100644 index a90aaba5c..000000000 --- a/gnuradio-core/src/python/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -# -# Copyright 2004 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -include $(top_srcdir)/Makefile.common - -if PYTHON -SUBDIRS = gnuradio bin - -noinst_PYTHON = \ - build_utils.py \ - build_utils_codes.py -endif diff --git a/gnuradio-core/src/python/bin/.gitignore b/gnuradio-core/src/python/bin/.gitignore deleted file mode 100644 index f9c5da0db..000000000 --- a/gnuradio-core/src/python/bin/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -/Makefile -/Makefile.in -/.deps -/.libs -/*.la -/*.lo -/*.pyc -/*.pyo diff --git a/gnuradio-core/src/python/bin/Makefile.am b/gnuradio-core/src/python/bin/Makefile.am deleted file mode 100644 index 6f9f162f1..000000000 --- a/gnuradio-core/src/python/bin/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -# -# Copyright 2005,2009,2010 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -include $(top_srcdir)/Makefile.common - - -EXTRA_DIST += microtune.py - -noinst_SCRIPTS = \ - microtune.py diff --git a/gnuradio-core/src/python/gnuradio/.gitignore b/gnuradio-core/src/python/gnuradio/.gitignore deleted file mode 100644 index f9c5da0db..000000000 --- a/gnuradio-core/src/python/gnuradio/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -/Makefile -/Makefile.in -/.deps -/.libs -/*.la -/*.lo -/*.pyc -/*.pyo diff --git a/gnuradio-core/src/python/gnuradio/Makefile.am b/gnuradio-core/src/python/gnuradio/Makefile.am deleted file mode 100644 index ffc171b2d..000000000 --- a/gnuradio-core/src/python/gnuradio/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -# -# Copyright 2004-2011 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -include $(top_srcdir)/Makefile.common - -if PYTHON -SUBDIRS = gr gru gruimpl blks2 blks2impl - -grpython_PYTHON = \ - __init__.py \ - eng_notation.py \ - eng_option.py \ - gr_unittest.py \ - gr_xmlrunner.py \ - optfir.py \ - window.py -endif diff --git a/gnuradio-core/src/python/gnuradio/blks2/.gitignore b/gnuradio-core/src/python/gnuradio/blks2/.gitignore deleted file mode 100644 index b6950912c..000000000 --- a/gnuradio-core/src/python/gnuradio/blks2/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/Makefile -/Makefile.in -/*.pyc diff --git a/gnuradio-core/src/python/gnuradio/blks2/Makefile.am b/gnuradio-core/src/python/gnuradio/blks2/Makefile.am deleted file mode 100644 index 04b7c6500..000000000 --- a/gnuradio-core/src/python/gnuradio/blks2/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -# -# Copyright 2005,2009 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -include $(top_srcdir)/Makefile.common - -# EXTRA_DIST = run_tests.in -# TESTS = run_tests - -grblks2pythondir = $(grpythondir)/blks2 - -grblks2python_PYTHON = \ - __init__.py diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/.gitignore b/gnuradio-core/src/python/gnuradio/blks2impl/.gitignore deleted file mode 100644 index f9c5da0db..000000000 --- a/gnuradio-core/src/python/gnuradio/blks2impl/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -/Makefile -/Makefile.in -/.deps -/.libs -/*.la -/*.lo -/*.pyc -/*.pyo diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am b/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am deleted file mode 100644 index eb031cd20..000000000 --- a/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -# -# Copyright 2005,2007,2009,2010 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -include $(top_srcdir)/Makefile.common - -# EXTRA_DIST = run_tests.in -# TESTS = run_tests - -grblkspythondir = $(grpythondir)/blks2impl - -grblkspython_PYTHON = \ - __init__.py \ - am_demod.py \ - channel_model.py \ - filterbank.py \ - fm_demod.py \ - fm_emph.py \ - logpwrfft.py \ - nbfm_rx.py \ - nbfm_tx.py \ - pfb_arb_resampler.py \ - pfb_channelizer.py \ - pfb_decimator.py \ - pfb_interpolator.py \ - rational_resampler.py \ - standard_squelch.py \ - stream_to_vector_decimator.py \ - wfm_rcv.py \ - wfm_rcv_fmdet.py \ - wfm_rcv_pll.py \ - wfm_tx.py diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/pfb_channelizer.py b/gnuradio-core/src/python/gnuradio/blks2impl/pfb_channelizer.py index 3ddc1749a..dea71b286 100644 --- a/gnuradio-core/src/python/gnuradio/blks2impl/pfb_channelizer.py +++ b/gnuradio-core/src/python/gnuradio/blks2impl/pfb_channelizer.py @@ -34,7 +34,7 @@ class pfb_channelizer_ccf(gr.hier_block2): gr.io_signature(1, 1, gr.sizeof_gr_complex), # Input signature gr.io_signature(numchans, numchans, gr.sizeof_gr_complex)) # Output signature - self._numchans = numchans + self._nchans = numchans self._oversample_rate = oversample_rate if taps is not None: @@ -47,7 +47,7 @@ class pfb_channelizer_ccf(gr.hier_block2): made = False while not made: try: - self._taps = optfir.low_pass(1, self._numchans, bw, bw+tb, ripple, atten) + self._taps = optfir.low_pass(1, self._nchans, bw, bw+tb, ripple, atten) made = True except RuntimeError: ripple += 0.01 @@ -58,22 +58,16 @@ class pfb_channelizer_ccf(gr.hier_block2): if(ripple >= 1.0): raise RuntimeError("optfir could not generate an appropriate filter.") - self.s2ss = gr.stream_to_streams(gr.sizeof_gr_complex, self._numchans) - self.pfb = gr.pfb_channelizer_ccf(self._numchans, self._taps, + self.s2ss = gr.stream_to_streams(gr.sizeof_gr_complex, self._nchans) + self.pfb = gr.pfb_channelizer_ccf(self._nchans, self._taps, self._oversample_rate) - self.v2s = gr.vector_to_streams(gr.sizeof_gr_complex, self._numchans) - self.connect(self, self.s2ss) - for i in xrange(self._numchans): + for i in xrange(self._nchans): self.connect((self.s2ss,i), (self.pfb,i)) + self.connect((self.pfb,i), (self,i)) - # Get independent streams from the filterbank and send them out - self.connect(self.pfb, self.v2s) - - for i in xrange(self._numchans): - self.connect((self.v2s,i), (self,i)) - - + def set_channel_map(self, newmap): + self.pfb.set_channel_map(newmap) diff --git a/gnuradio-core/src/python/gnuradio/gr/.gitignore b/gnuradio-core/src/python/gnuradio/gr/.gitignore deleted file mode 100644 index bf03975bb..000000000 --- a/gnuradio-core/src/python/gnuradio/gr/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -/Makefile -/Makefile.in -/.deps -/.libs -/*.la -/*.lo -/*.pyc -/*.pyo -/run_tests diff --git a/gnuradio-core/src/python/gnuradio/gr/Makefile.am b/gnuradio-core/src/python/gnuradio/gr/Makefile.am deleted file mode 100644 index 9853766f9..000000000 --- a/gnuradio-core/src/python/gnuradio/gr/Makefile.am +++ /dev/null @@ -1,102 +0,0 @@ -# -# Copyright 2004,2005,2006,2008,2010 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -include $(top_srcdir)/Makefile.common - -EXTRA_DIST += \ - run_tests.in \ - test_16bit_1chunk.wav - -TESTS = run_tests - - -grgrpythondir = $(grpythondir)/gr - -grgrpython_PYTHON = \ - __init__.py \ - exceptions.py \ - gr_threading.py \ - gr_threading_23.py \ - gr_threading_24.py \ - hier_block2.py \ - prefs.py \ - top_block.py \ - pubsub.py - -noinst_PYTHON = \ - benchmark_filters.py \ - qa_add_and_friends.py \ - qa_add_v_and_friends.py \ - qa_agc.py \ - qa_argmax.py \ - qa_bin_statistics.py \ - qa_classify.py \ - qa_complex_to_xxx.py \ - qa_conjugate.py \ - qa_copy.py \ - qa_delay.py \ - qa_dc_blocker.py \ - qa_diff_encoder.py \ - qa_diff_phasor_cc.py \ - qa_ecc_ccsds_27.py \ - qa_feval.py \ - qa_fft.py \ - qa_fft_filter.py \ - qa_filter_delay_fc.py \ - qa_float_to_char.py \ - qa_float_to_int.py \ - qa_float_to_short.py \ - qa_fractional_interpolator.py \ - qa_frequency_modulator.py \ - qa_fsk_stuff.py \ - qa_glfsr_source.py \ - qa_goertzel.py \ - qa_head.py \ - qa_hier_block2.py \ - qa_hilbert.py \ - qa_iir.py \ - qa_int_to_float.py \ - qa_interleave.py \ - qa_interp_fir_filter.py \ - qa_kludge_copy.py \ - qa_kludged_imports.py \ - qa_max.py \ - qa_message.py \ - qa_multiply_conjugate.py \ - qa_mute.py \ - qa_nlog10.py \ - qa_noise.py \ - qa_packed_to_unpacked.py \ - qa_pipe_fittings.py \ - qa_pll_carriertracking.py \ - qa_pll_freqdet.py \ - qa_pll_refout.py \ - qa_pn_correlator_cc.py \ - qa_rational_resampler.py \ - qa_sig_source.py \ - qa_single_pole_iir.py \ - qa_single_pole_iir_cc.py \ - qa_skiphead.py \ - qa_unpack_k_bits.py \ - qa_repeat.py \ - qa_scrambler.py \ - qa_udp_sink_source.py \ - qa_vector_sink_source.py diff --git a/gnuradio-core/src/python/gnuradio/gr/run_tests.in b/gnuradio-core/src/python/gnuradio/gr/run_tests.in deleted file mode 100755 index 107efe728..000000000 --- a/gnuradio-core/src/python/gnuradio/gr/run_tests.in +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -# 1st parameter is absolute path to component source directory -# 2nd parameter is absolute path to component build directory -# 3rd parameter is path to Python QA directory - -# Note: calling master run_tests.sh in gnuradio core is not strictly -# correct, as it will result in a partially bogus PYTHONPATH, but it -# does make the correct paths in the second half so all is well. - -@top_builddir@/run_tests.sh \ - @abs_top_srcdir@/gnuradio-core \ - @abs_top_builddir@/gnuradio-core \ - @srcdir@ diff --git a/gnuradio-core/src/python/gnuradio/gru/.gitignore b/gnuradio-core/src/python/gnuradio/gru/.gitignore deleted file mode 100644 index f9c5da0db..000000000 --- a/gnuradio-core/src/python/gnuradio/gru/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -/Makefile -/Makefile.in -/.deps -/.libs -/*.la -/*.lo -/*.pyc -/*.pyo diff --git a/gnuradio-core/src/python/gnuradio/gru/Makefile.am b/gnuradio-core/src/python/gnuradio/gru/Makefile.am deleted file mode 100644 index 9b311d81f..000000000 --- a/gnuradio-core/src/python/gnuradio/gru/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -# -# Copyright 2005,2009 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -include $(top_srcdir)/Makefile.common - -# EXTRA_DIST = run_tests.in -# TESTS = run_tests - -grblkspythondir = $(grpythondir)/gru - -grblkspython_PYTHON = \ - __init__.py diff --git a/gnuradio-core/src/python/gnuradio/gruimpl/.gitignore b/gnuradio-core/src/python/gnuradio/gruimpl/.gitignore deleted file mode 100644 index f9c5da0db..000000000 --- a/gnuradio-core/src/python/gnuradio/gruimpl/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -/Makefile -/Makefile.in -/.deps -/.libs -/*.la -/*.lo -/*.pyc -/*.pyo diff --git a/gnuradio-core/src/python/gnuradio/gruimpl/Makefile.am b/gnuradio-core/src/python/gnuradio/gruimpl/Makefile.am deleted file mode 100644 index 903bc2695..000000000 --- a/gnuradio-core/src/python/gnuradio/gruimpl/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright 2005,2009 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -include $(top_srcdir)/Makefile.common - -grupythondir = $(grpythondir)/gruimpl - -grupython_PYTHON = \ - __init__.py \ - freqz.py \ - gnuplot_freqz.py \ - hexint.py \ - listmisc.py \ - mathmisc.py \ - lmx2306.py \ - msgq_runner.py \ - os_read_exactly.py \ - sdr_1000.py \ - seq_with_cursor.py \ - socket_stuff.py \ - daemon.py diff --git a/gnuradio-core/src/python/gnuradio/vocoder/.gitignore b/gnuradio-core/src/python/gnuradio/vocoder/.gitignore deleted file mode 100644 index b336cc7ce..000000000 --- a/gnuradio-core/src/python/gnuradio/vocoder/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/Makefile -/Makefile.in |