[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r10912 - in gnuradio/branches/releases/3.2: . config g
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r10912 - in gnuradio/branches/releases/3.2: . config gnuradio-core/src/lib gnuradio-core/src/lib/hier gnuradio-core/src/lib/swig gnuradio-core/src/python/gnuradio/blks2impl gnuradio-core/src/python/gnuradio/gr gnuradio-examples/python/digital gnuradio-examples/python/ofdm gr-qtgui/src/python gr-wxgui/src/python/plotter grc/data/platforms/python grc/data/platforms/python/blocks |
|
Date: |
Sun, 26 Apr 2009 13:51:49 -0600 (MDT) |
Author: jcorgan
Date: 2009-04-26 13:51:49 -0600 (Sun, 26 Apr 2009)
New Revision: 10912
Added:
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/hier/
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/hier/Makefile.am
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/hier/gr_channel_model.cc
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/hier/gr_channel_model.h
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/hier/gr_channel_model.i
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/hier/hier.i
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/swig/gnuradio_swig_py_hier.i
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/gr_channel_model.xml
Removed:
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/hier/Makefile.am
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/hier/gr_channel_model.cc
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/hier/gr_channel_model.h
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/hier/gr_channel_model.i
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/hier/hier.i
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_channel_model.xml
Modified:
gnuradio/branches/releases/3.2/
gnuradio/branches/releases/3.2/config/grc_gnuradio_core.m4
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/Makefile.am
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/swig/
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/swig/Makefile.am
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/swig/Makefile.swig.gen
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/swig/gnuradio_swig_python.py
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/swig/gr_swig_block_magic.i
gnuradio/branches/releases/3.2/gnuradio-core/src/python/gnuradio/blks2impl/channel_model.py
gnuradio/branches/releases/3.2/gnuradio-core/src/python/gnuradio/gr/pubsub.py
gnuradio/branches/releases/3.2/gnuradio-examples/python/digital/benchmark_loopback.py
gnuradio/branches/releases/3.2/gnuradio-examples/python/ofdm/benchmark_ofdm.py
gnuradio/branches/releases/3.2/gr-qtgui/src/python/pyqt_example.py
gnuradio/branches/releases/3.2/gr-qtgui/src/python/qt_digital.py
gnuradio/branches/releases/3.2/gr-qtgui/src/python/usrp_display.py
gnuradio/branches/releases/3.2/gr-wxgui/src/python/plotter/grid_plotter_base.py
gnuradio/branches/releases/3.2/grc/data/platforms/python/block_tree.xml
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/Makefile.am
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/gr_add_xx.xml
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/gr_multiply_xx.xml
Log:
Merged changesets r10859, r10860:10862, r10864 into release-3.2 branch.
Property changes on: gnuradio/branches/releases/3.2
___________________________________________________________________
Modified: svn:mergeinfo
- /gnuradio/branches/developers/eb/t348:10638-10648
/gnuradio/branches/developers/eb/t378:10683-10688
/gnuradio/branches/developers/jblum/gui_guts:10464-10658
/gnuradio/branches/developers/jblum/vlen:10667-10677
/gnuradio/branches/developers/jcorgan/fw-optimize:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2:10713-10765
/gnuradio/branches/developers/michaelld/am_swig_4:10555-10595
/gnuradio/branches/developers/michaelld/two_mods:10540-10546
/gnuradio/trunk:10356-10359,10481-10482,10497-10499,10506-10507,10511,10514,10521,10523-10524,10529,10531,10535,10537-10538,10550-10551,10556,10558-10560,10562-10563,10565,10574-10576,10578-10579,10581-10582,10585,10587,10596-10600,10623-10624,10629,10632-10634,10645-10646,10649-10650,10653-10655,10660-10661,10671,10673,10678,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10847-10848,10850,10852
+ /gnuradio/branches/developers/eb/t348:10638-10648
/gnuradio/branches/developers/eb/t378:10683-10688
/gnuradio/branches/developers/jblum/gui_guts:10464-10658
/gnuradio/branches/developers/jblum/vlen:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier:10818-10858
/gnuradio/branches/developers/jcorgan/fw-optimize:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2:10713-10765
/gnuradio/branches/developers/michaelld/am_swig_4:10555-10595
/gnuradio/branches/developers/michaelld/two_mods:10540-10546
/gnuradio/trunk:10356-10359,10481-10482,10497-10499,10506-10507,10511,10514,10521,10523-10524,10529,10531,10535,10537-10538,10550-10551,10556,10558-10560,10562-10563,10565,10574-10576,10578-10579,10581-10582,10585,10587,10596-10600,10623-10624,10629,10632-10634,10645-10646,10649-10650,10653-10655,10660-10661,10671,10673,10678,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10847-10848,10850,10852,10859,10861-10862,10864
Modified: gnuradio/branches/releases/3.2/config/grc_gnuradio_core.m4
===================================================================
--- gnuradio/branches/releases/3.2/config/grc_gnuradio_core.m4 2009-04-26
19:42:28 UTC (rev 10911)
+++ gnuradio/branches/releases/3.2/config/grc_gnuradio_core.m4 2009-04-26
19:51:49 UTC (rev 10912)
@@ -61,6 +61,7 @@
-I\${abs_top_srcdir}/gnuradio-core/src/lib/io \
-I\${abs_top_srcdir}/gnuradio-core/src/lib/g72x \
-I\${abs_top_srcdir}/gnuradio-core/src/lib/swig \
+-I\${abs_top_srcdir}/gnuradio-core/src/lib/hier \
-I\${abs_top_builddir}/gnuradio-core/src/lib/swig \
\$(FFTW3F_CFLAGS) \
\$(GSL_CFLAGS)"
@@ -96,6 +97,7 @@
gnuradio-core/src/lib/reed-solomon/Makefile \
gnuradio-core/src/lib/viterbi/Makefile \
gnuradio-core/src/lib/runtime/Makefile \
+ gnuradio-core/src/lib/hier/Makefile \
gnuradio-core/src/lib/swig/Makefile \
gnuradio-core/src/python/Makefile \
gnuradio-core/src/python/bin/Makefile \
Modified: gnuradio/branches/releases/3.2/gnuradio-core/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.2/gnuradio-core/src/lib/Makefile.am
2009-04-26 19:42:28 UTC (rev 10911)
+++ gnuradio/branches/releases/3.2/gnuradio-core/src/lib/Makefile.am
2009-04-26 19:51:49 UTC (rev 10912)
@@ -24,7 +24,7 @@
## Process this file with automake to produce Makefile.in
# We've got to build . before swig
-SUBDIRS = missing runtime filter viterbi general gengen g72x reed-solomon io .
swig
+SUBDIRS = missing runtime filter viterbi general gengen g72x reed-solomon io
hier . swig
# generate libgnuradio-core.la from the convenience libraries in subdirs
@@ -48,6 +48,7 @@
missing/libmissing.la \
reed-solomon/librs.la \
runtime/libruntime.la \
+ hier/libhier.la \
$(OMNITHREAD_LA) \
$(GRUEL_LA) \
$(FFTW3F_LIBS) \
Property changes on: gnuradio/branches/releases/3.2/gnuradio-core/src/lib/hier
___________________________________________________________________
Added: svn:ignore
+ Makefile
Makefile.in
.libs
.deps
Copied: gnuradio/branches/releases/3.2/gnuradio-core/src/lib/hier/Makefile.am
(from rev 10859, gnuradio/trunk/gnuradio-core/src/lib/hier/Makefile.am)
===================================================================
--- gnuradio/branches/releases/3.2/gnuradio-core/src/lib/hier/Makefile.am
(rev 0)
+++ gnuradio/branches/releases/3.2/gnuradio-core/src/lib/hier/Makefile.am
2009-04-26 19:51:49 UTC (rev 10912)
@@ -0,0 +1,37 @@
+#
+# Copyright 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
+
+
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(WITH_INCLUDES)
+
+noinst_LTLIBRARIES = libhier.la
+
+libhier_la_SOURCES = \
+ gr_channel_model.cc
+
+grinclude_HEADERS = \
+ gr_channel_model.h
+
+swiginclude_HEADERS = \
+ hier.i \
+ gr_channel_model.i
Copied:
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/hier/gr_channel_model.cc
(from rev 10859, gnuradio/trunk/gnuradio-core/src/lib/hier/gr_channel_model.cc)
===================================================================
---
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/hier/gr_channel_model.cc
(rev 0)
+++
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/hier/gr_channel_model.cc
2009-04-26 19:51:49 UTC (rev 10912)
@@ -0,0 +1,101 @@
+/*
+ * Copyright 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 <gr_channel_model.h>
+#include <gr_io_signature.h>
+#include <gr_sig_source_f.h>
+#include <iostream>
+
+// Shared pointer constructor
+gr_channel_model_sptr
+gr_make_channel_model(double noise_voltage,
+ double frequency_offset,
+ double epsilon,
+ const std::vector<gr_complex> &taps,
+ double noise_seed)
+{
+ return gnuradio::get_initial_sptr(new gr_channel_model(noise_voltage,
+ frequency_offset,
+ epsilon,
+ taps,
+ noise_seed));
+}
+
+// Hierarchical block constructor
+gr_channel_model::gr_channel_model(double noise_voltage,
+ double frequency_offset,
+ double epsilon,
+ const std::vector<gr_complex> &taps,
+ double noise_seed)
+ : gr_hier_block2("gr_channel_model",
+ gr_make_io_signature(1, 1, sizeof(gr_complex)),
+ gr_make_io_signature(1, 1, sizeof(gr_complex)))
+{
+ d_taps = taps;
+ while(d_taps.size() < 2) {
+ d_taps.push_back(0);
+ }
+
+ d_timing_offset = gr_make_fractional_interpolator_cc(0, epsilon);
+
+ d_multipath = gr_make_fir_filter_ccc(1, d_taps);
+
+ d_noise_adder = gr_make_add_cc();
+ d_noise = gr_make_noise_source_c(GR_GAUSSIAN, noise_voltage, noise_seed);
+ d_freq_offset = gr_make_sig_source_c(1, GR_SIN_WAVE, frequency_offset, 1.0,
0.0);
+ d_mixer_offset = gr_make_multiply_cc();
+
+ connect(self(), 0, d_timing_offset, 0);
+ connect(d_timing_offset, 0, d_multipath, 0);
+ connect(d_multipath, 0, d_mixer_offset, 0);
+ connect(d_freq_offset, 0, d_mixer_offset, 1);
+ connect(d_mixer_offset, 0, d_noise_adder, 1);
+ connect(d_noise, 0, d_noise_adder, 0);
+ connect(d_noise_adder, 0, self(), 0);
+}
+
+void
+gr_channel_model::set_noise_voltage(double noise_voltage)
+{
+ d_noise->set_amplitude(noise_voltage);
+}
+
+void
+gr_channel_model::set_frequency_offset(double frequency_offset)
+{
+ d_freq_offset->set_frequency(frequency_offset);
+}
+
+void
+gr_channel_model::set_taps(const std::vector<gr_complex> &taps)
+{
+ d_taps = taps;
+ while(d_taps.size() < 2) {
+ d_taps.push_back(0);
+ }
+ d_multipath->set_taps(d_taps);
+}
+
+void
+gr_channel_model::set_timing_offset(double epsilon)
+{
+ d_timing_offset->set_interp_ratio(epsilon);
+}
Copied:
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/hier/gr_channel_model.h
(from rev 10859, gnuradio/trunk/gnuradio-core/src/lib/hier/gr_channel_model.h)
===================================================================
---
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/hier/gr_channel_model.h
(rev 0)
+++
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/hier/gr_channel_model.h
2009-04-26 19:51:49 UTC (rev 10912)
@@ -0,0 +1,69 @@
+/*
+ * Copyright 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 <gr_top_block.h>
+#include <gr_fractional_interpolator_cc.h>
+#include <gr_sig_source_c.h>
+#include <gr_fir_filter_ccc.h>
+#include <gr_add_cc.h>
+#include <gr_noise_source_c.h>
+#include <gr_multiply_cc.h>
+
+class gr_channel_model;
+typedef boost::shared_ptr<gr_channel_model> gr_channel_model_sptr;
+
+
+gr_channel_model_sptr gr_make_channel_model(double noise_voltage=0.0,
+ double frequency_offset=0.0,
+ double epsilon=1.0,
+ const std::vector<gr_complex>
&taps=std::vector<gr_complex>(1, 1),
+ double noise_seed=3021);
+
+class gr_channel_model : public gr_hier_block2
+{
+ private:
+ gr_channel_model(double noise_voltage,
+ double frequency_offset,
+ double epsilon,
+ const std::vector<gr_complex> &taps,
+ double noise_seed);
+
+ friend gr_channel_model_sptr gr_make_channel_model(double noise_voltage,
+ double frequency_offset,
+ double epsilon,
+ const
std::vector<gr_complex> &taps,
+ double noise_seed);
+
+ gr_fractional_interpolator_cc_sptr d_timing_offset;
+ gr_sig_source_c_sptr d_freq_offset;
+ gr_fir_filter_ccc_sptr d_multipath;
+ gr_add_cc_sptr d_noise_adder;
+ gr_noise_source_c_sptr d_noise;
+ gr_multiply_cc_sptr d_mixer_offset;
+
+ std::vector<gr_complex> d_taps;
+
+ public:
+ void set_noise_voltage(double noise_voltage);
+ void set_frequency_offset(double frequency_offset);
+ void set_taps(const std::vector<gr_complex> &taps);
+ void set_timing_offset(double epsilon);
+};
Copied:
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/hier/gr_channel_model.i
(from rev 10859, gnuradio/trunk/gnuradio-core/src/lib/hier/gr_channel_model.i)
===================================================================
---
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/hier/gr_channel_model.i
(rev 0)
+++
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/hier/gr_channel_model.i
2009-04-26 19:51:49 UTC (rev 10912)
@@ -0,0 +1,45 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 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.
+ */
+
+GR_SWIG_BLOCK_MAGIC(gr,channel_model)
+
+gr_channel_model_sptr gr_make_channel_model(double noise_voltage=0.0,
+ double frequency_offset=0.0,
+ double epsilon=1.0,
+ const std::vector<gr_complex>
&taps=std::vector<gr_complex>(1, 1),
+ double noise_seed=3021);
+
+class gr_channel_model : public gr_hier_block2
+{
+ private:
+ gr_channel_model(double noise_voltage,
+ double frequency_offset,
+ double epsilon,
+ const std::vector<gr_complex> &taps,
+ double noise_seed);
+
+ public:
+ void set_noise_voltage(double noise_voltage);
+ void set_frequency_offset(double frequency_offset);
+ void set_taps(const std::vector<gr_complex> &taps);
+ void set_timing_offset(double epsilon);
+};
Copied: gnuradio/branches/releases/3.2/gnuradio-core/src/lib/hier/hier.i (from
rev 10859, gnuradio/trunk/gnuradio-core/src/lib/hier/hier.i)
===================================================================
--- gnuradio/branches/releases/3.2/gnuradio-core/src/lib/hier/hier.i
(rev 0)
+++ gnuradio/branches/releases/3.2/gnuradio-core/src/lib/hier/hier.i
2009-04-26 19:51:49 UTC (rev 10912)
@@ -0,0 +1,31 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 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.
+ */
+
+%{
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gr_channel_model.h>
+%}
+
+%include "gr_channel_model.i"
Property changes on: gnuradio/branches/releases/3.2/gnuradio-core/src/lib/swig
___________________________________________________________________
Modified: svn:ignore
- Makefile
Makefile.in
.la
.lo
.deps
.libs
*.la
*.lo
*.pyc
swigrun.py
swigrun_wrap.c
Makefile.swigdeps.new
gnuradio_swig_py_runtime.d
gnuradio_swig_py_general.d
gnuradio_swig_py_gengen.d
gnuradio_swig_py_filter.d
gnuradio_swig_py_io.d
gnuradio_swig_bug_workaround.h
gnuradio_swig_py_runtime.cc
gnuradio_swig_py_runtime.h
gnuradio_swig_py_runtime.py
gnuradio_swig_py_general.cc
gnuradio_swig_py_general.h
gnuradio_swig_py_general.py
gnuradio_swig_py_gengen.cc
gnuradio_swig_py_gengen.h
gnuradio_swig_py_gengen.py
gnuradio_swig_py_filter.cc
gnuradio_swig_py_filter.h
gnuradio_swig_py_filter.py
gnuradio_swig_py_io.cc
gnuradio_swig_py_io.h
gnuradio_swig_py_io.py
+ Makefile
Makefile.in
.la
.lo
.deps
.libs
*.la
*.lo
*.pyc
swigrun.py
swigrun_wrap.c
Makefile.swigdeps.new
gnuradio_swig_py_runtime.d
gnuradio_swig_py_general.d
gnuradio_swig_py_gengen.d
gnuradio_swig_py_filter.d
gnuradio_swig_py_io.d
gnuradio_swig_bug_workaround.h
gnuradio_swig_py_runtime.cc
gnuradio_swig_py_runtime.h
gnuradio_swig_py_runtime.py
gnuradio_swig_py_general.cc
gnuradio_swig_py_general.h
gnuradio_swig_py_general.py
gnuradio_swig_py_gengen.cc
gnuradio_swig_py_gengen.h
gnuradio_swig_py_gengen.py
gnuradio_swig_py_filter.cc
gnuradio_swig_py_filter.h
gnuradio_swig_py_filter.py
gnuradio_swig_py_io.cc
gnuradio_swig_py_io.h
gnuradio_swig_py_io.py
gnuradio_swig_py_hier.cc
gnuradio_swig_py_hier.h
gnuradio_swig_py_hier.py
Modified: gnuradio/branches/releases/3.2/gnuradio-core/src/lib/swig/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.2/gnuradio-core/src/lib/swig/Makefile.am
2009-04-26 19:42:28 UTC (rev 10911)
+++ gnuradio/branches/releases/3.2/gnuradio-core/src/lib/swig/Makefile.am
2009-04-26 19:51:49 UTC (rev 10912)
@@ -48,7 +48,7 @@
gnuradio_swig_bug_workaround.h
# ----------------------------------------------------------------
-# We've split the previously monstrous gnuradio_swig_python into 5
+# We've split the previously monstrous gnuradio_swig_python into 6
# smaller pieces. This reduces compile time coupling and creates
# smaller pieces for the compiler to digest. prior to this change, on
# X86_64, g++'s resident set size was 650MB!
@@ -59,7 +59,8 @@
gnuradio_swig_py_general.i \
gnuradio_swig_py_gengen.i \
gnuradio_swig_py_filter.i \
- gnuradio_swig_py_io.i
+ gnuradio_swig_py_io.i \
+ gnuradio_swig_py_hier.i
# Install so that they end up available as:
# import gnuradio.gr
@@ -70,6 +71,7 @@
gnuradio_swig_py_gengen_pythondir_category = gnuradio/gr
gnuradio_swig_py_filter_pythondir_category = gnuradio/gr
gnuradio_swig_py_io_pythondir_category = gnuradio/gr
+gnuradio_swig_py_hier_pythondir_category = gnuradio/gr
# additional libraries for linking with each SWIG-generated library
gnuradio_swig_py_runtime_la_swig_libadd = $(GNURADIO_CORE_LA)
@@ -77,6 +79,7 @@
gnuradio_swig_py_gengen_la_swig_libadd = $(GNURADIO_CORE_LA)
gnuradio_swig_py_filter_la_swig_libadd = $(GNURADIO_CORE_LA)
gnuradio_swig_py_io_la_swig_libadd = $(GNURADIO_CORE_LA)
+gnuradio_swig_py_hier_la_swig_libadd = $(GNURADIO_CORE_LA)
include $(top_srcdir)/Makefile.swig
@@ -90,6 +93,7 @@
gnuradio_swig_py_gengen.h \
gnuradio_swig_py_filter.h \
gnuradio_swig_py_io.h \
+ gnuradio_swig_py_hier.h \
$(grinclude_HEADERS) \
$(swig_built_sources)
Modified:
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/swig/Makefile.swig.gen
===================================================================
--- gnuradio/branches/releases/3.2/gnuradio-core/src/lib/swig/Makefile.swig.gen
2009-04-26 19:42:28 UTC (rev 10911)
+++ gnuradio/branches/releases/3.2/gnuradio-core/src/lib/swig/Makefile.swig.gen
2009-04-26 19:51:49 UTC (rev 10912)
@@ -1293,3 +1293,262 @@
@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
+# -*- Makefile -*-
+#
+# Copyright 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.
+#
+
+# Makefile.swig.gen for gnuradio_swig_py_hier.i
+
+## Default install locations for these files:
+##
+## Default location for the Python directory is:
+##
${prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_swig_py_hier
+## Default location for the Python exec directory is:
+##
${exec_prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_swig_py_hier
+##
+## The following can be overloaded to change the install location, but
+## this has to be done in the including Makefile.am -before-
+## Makefile.swig is included.
+
+gnuradio_swig_py_hier_pythondir_category ?= gnuradio/gnuradio_swig_py_hier
+gnuradio_swig_py_hier_pylibdir_category ?=
$(gnuradio_swig_py_hier_pythondir_category)
+gnuradio_swig_py_hier_pythondir =
$(pythondir)/$(gnuradio_swig_py_hier_pythondir_category)
+gnuradio_swig_py_hier_pylibdir =
$(pyexecdir)/$(gnuradio_swig_py_hier_pylibdir_category)
+
+## SWIG headers are always installed into the same directory.
+
+gnuradio_swig_py_hier_swigincludedir = $(swigincludedir)
+
+## This is a template file for a "generated" Makefile addition (in
+## this case, "Makefile.swig.gen"). By including the top-level
+## Makefile.swig, this file will be used to generate the SWIG
+## dependencies. Assign the variable TOP_SWIG_FILES to be the list of
+## SWIG .i files to generated wrappings for; there can be more than 1
+## so long as the names are unique (no sorting is done on the
+## TOP_SWIG_FILES list). This file explicitly assumes that a SWIG .i
+## file will generate .cc, .py, and possibly .h files -- meaning that
+## all of these files will have the same base name (that provided for
+## the SWIG .i file).
+##
+## This code is setup to ensure parallel MAKE ("-j" or "-jN") does the
+## right thing. For more info, see <
+## http://sources.redhat.com/automake/automake.html#Multiple-Outputs >
+
+## Stamps used to ensure parallel make does the right thing. These
+## are removed by "make clean", but otherwise unused except during the
+## parallel built. These will not be included in a tarball, because
+## the SWIG-generated files will be removed from the distribution.
+
+STAMPS += $(DEPDIR)/gnuradio_swig_py_hier-generate-*
+
+## Other cleaned files: dependency files generated by SWIG or this Makefile
+
+MOSTLYCLEANFILES += $(DEPDIR)/*.S*
+
+## Add the .py and .cc files to the list of SWIG built sources. The
+## .h file is sometimes built, but not always ... so that one has to
+## be added manually by the including Makefile.am .
+
+swig_built_sources += gnuradio_swig_py_hier.py gnuradio_swig_py_hier.cc
+
+## Various SWIG variables. These can be overloaded in the including
+## Makefile.am by setting the variable value there, then including
+## Makefile.swig .
+
+gnuradio_swig_py_hier_swiginclude_HEADERS = \
+ gnuradio_swig_py_hier.i \
+ $(gnuradio_swig_py_hier_swiginclude_headers)
+
+gnuradio_swig_py_hier_pylib_LTLIBRARIES = \
+ _gnuradio_swig_py_hier.la
+
+_gnuradio_swig_py_hier_la_SOURCES = \
+ gnuradio_swig_py_hier.cc \
+ $(gnuradio_swig_py_hier_la_swig_sources)
+
+_gnuradio_swig_py_hier_la_LIBADD = \
+ $(STD_SWIG_LA_LIB_ADD) \
+ $(gnuradio_swig_py_hier_la_swig_libadd)
+
+_gnuradio_swig_py_hier_la_LDFLAGS = \
+ $(STD_SWIG_LA_LD_FLAGS) \
+ $(gnuradio_swig_py_hier_la_swig_ldflags)
+
+_gnuradio_swig_py_hier_la_CXXFLAGS = \
+ $(STD_SWIG_CXX_FLAGS) \
+ $(gnuradio_swig_py_hier_la_swig_cxxflags)
+
+gnuradio_swig_py_hier_python_PYTHON = \
+ gnuradio_swig_py_hier.py \
+ $(gnuradio_swig_py_hier_python)
+
+## Entry rule for running SWIG
+
+gnuradio_swig_py_hier.h gnuradio_swig_py_hier.py gnuradio_swig_py_hier.cc:
gnuradio_swig_py_hier.i
+## This rule will get called only when MAKE decides that one of the
+## targets needs to be created or re-created, because:
+##
+## * The .i file is newer than any or all of the generated files;
+##
+## * Any or all of the .cc, .h, or .py files does not exist and is
+## needed (in the case this file is not needed, the rule for it is
+## ignored); or
+##
+## * Some SWIG-based dependecy of the .cc file isn't met and hence the
+## .cc file needs be be regenerated. Explanation: Because MAKE
+## knows how to handle dependencies for .cc files (regardless of
+## their name or extension), then the .cc file is used as a target
+## instead of the .i file -- but with the dependencies of the .i
+## file. It is this last reason why the line:
+##
+## if test -f $@; then :; else
+##
+## cannot be used in this case: If a .i file dependecy is not met,
+## then the .cc file needs to be rebuilt. But if the stamp is newer
+## than the .cc file, and the .cc file exists, then in the original
+## version (with the 'test' above) the internal MAKE call will not
+## be issued and hence the .cc file will not be rebuilt.
+##
+## Once execution gets to here, it should always proceed no matter the
+## state of a stamp (as discussed in link above). The
+## $(DEPDIR)/gnuradio_swig_py_hier-generate stuff is used to allow for parallel
+## builds to "do the right thing". The stamp has no relationship with
+## either the target files or dependency file; it is used solely for
+## the protection of multiple builds during a given call to MAKE.
+##
+## Catch signals SIGHUP (1), SIGINT (2), SIGPIPE (13), and SIGTERM
+## (15). At a caught signal, the quoted command will be issued before
+## exiting. In this case, remove any stamp, whether temporary of not.
+## The trap is valid until the process exits; the process includes all
+## commands appended via "\"s.
+##
+ trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_hier-generate-*' 1 2 13 15; \
+##
+## Create a temporary directory, which acts as a lock. The first
+## process to create the directory will succeed and issue the MAKE
+## command to do the actual work, while all subsequent processes will
+## fail -- leading them to wait for the first process to finish.
+##
+ if mkdir $(DEPDIR)/gnuradio_swig_py_hier-generate-lock 2>/dev/null;
then \
+##
+## This code is being executed by the first process to succeed in
+## creating the directory lock.
+##
+## Remove the stamp associated with this filename.
+##
+ rm -f $(DEPDIR)/gnuradio_swig_py_hier-generate-stamp; \
+##
+## Tell MAKE to run the rule for creating this stamp.
+##
+ $(MAKE) $(AM_MAKEFLAGS)
$(DEPDIR)/gnuradio_swig_py_hier-generate-stamp WHAT=$<; \
+##
+## Now that the .cc, .h, and .py files have been (re)created from the
+## .i file, future checking of this rule during the same MAKE
+## execution will come back that the rule doesn't need to be executed
+## because none of the conditions mentioned at the start of this rule
+## will be positive. Remove the the directory lock, which frees up
+## any waiting process(es) to continue.
+##
+ rmdir $(DEPDIR)/gnuradio_swig_py_hier-generate-lock; \
+ else \
+##
+## This code is being executed by any follower processes while the
+## directory lock is in place.
+##
+## Wait until the first process is done, testing once per second.
+##
+ while test -d $(DEPDIR)/gnuradio_swig_py_hier-generate-lock; do
\
+ sleep 1; \
+ done; \
+##
+## Succeed if and only if the first process succeeded; exit this
+## process returning the status of the generated stamp.
+##
+ test -f $(DEPDIR)/gnuradio_swig_py_hier-generate-stamp; \
+ exit $$?; \
+ fi;
+
+$(DEPDIR)/gnuradio_swig_py_hier-generate-stamp:
+## This rule will be called only by the first process issuing the
+## above rule to succeed in creating the lock directory, after
+## removing the actual stamp file in order to guarantee that MAKE will
+## execute this rule.
+##
+## Call SWIG to generate the various output files; special
+## post-processing on 'mingw32' host OS for the dependency file.
+##
+ if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_hier_swig_args) \
+ -MD -MF $(DEPDIR)/gnuradio_swig_py_hier.Std \
+ -module gnuradio_swig_py_hier -o gnuradio_swig_py_hier.cc
$(WHAT); then \
+ if test $(host_os) = mingw32; then \
+ $(RM) $(DEPDIR)/gnuradio_swig_py_hier.Sd; \
+ $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_hier.Std \
+ > $(DEPDIR)/gnuradio_swig_py_hier.Sd; \
+ $(RM) $(DEPDIR)/gnuradio_swig_py_hier.Std; \
+ $(MV) $(DEPDIR)/gnuradio_swig_py_hier.Sd
$(DEPDIR)/gnuradio_swig_py_hier.Std; \
+ fi; \
+ else \
+ $(RM) $(DEPDIR)/gnuradio_swig_py_hier.S*; exit 1; \
+ fi;
+##
+## Mess with the SWIG output .Std dependency file, to create a
+## dependecy file valid for the input .i file: Basically, simulate the
+## dependency file created for libraries by GNU's libtool for C++,
+## where all of the dependencies for the target are first listed, then
+## each individual dependency is listed as a target with no further
+## dependencies.
+##
+## (1) remove the current dependency file
+##
+ $(RM) $(DEPDIR)/gnuradio_swig_py_hier.d
+##
+## (2) Copy the whole SWIG file:
+##
+ cp $(DEPDIR)/gnuradio_swig_py_hier.Std $(DEPDIR)/gnuradio_swig_py_hier.d
+##
+## (3) all a carriage return to the end of the dependency file.
+##
+ echo "" >> $(DEPDIR)/gnuradio_swig_py_hier.d
+##
+## (4) from the SWIG file, remove the first line (the target); remove
+## trailing " \" and " " from each line. Append ":" to each line,
+## followed by 2 carriage returns, then append this to the end of
+## the dependency file.
+##
+ $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_hier.Std | \
+ awk '{ printf "%s:\n\n", $$0 }' >>
$(DEPDIR)/gnuradio_swig_py_hier.d
+##
+## (5) remove the SWIG-generated file
+##
+ $(RM) $(DEPDIR)/gnuradio_swig_py_hier.Std
+##
+## Create the stamp for this filename generation, to signal success in
+## executing this rule; allows other threads waiting on this process
+## to continue.
+##
+ touch $(DEPDIR)/gnuradio_swig_py_hier-generate-stamp
+
+# KLUDGE: Force runtime include of a SWIG dependency file. This is
+# not guaranteed to be portable, but will probably work. If it works,
+# we have accurate dependencies for our swig stuff, which is good.
+
address@hidden@ @address@hidden/$(DEPDIR)/address@hidden@
+
Copied:
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/swig/gnuradio_swig_py_hier.i
(from rev 10859,
gnuradio/trunk/gnuradio-core/src/lib/swig/gnuradio_swig_py_hier.i)
===================================================================
---
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/swig/gnuradio_swig_py_hier.i
(rev 0)
+++
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/swig/gnuradio_swig_py_hier.i
2009-04-26 19:51:49 UTC (rev 10912)
@@ -0,0 +1,30 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 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 this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef SWIGIMPORTED
+%module(directors="1") gnuradio_swig_py_hier
+#endif
+
+ //%feature("autodoc", "1"); // generate python docstrings
+
+%include "gnuradio.i" // the common stuff
+
+%include "hier.i"
Modified:
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/swig/gnuradio_swig_python.py
===================================================================
---
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/swig/gnuradio_swig_python.py
2009-04-26 19:42:28 UTC (rev 10911)
+++
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/swig/gnuradio_swig_python.py
2009-04-26 19:51:49 UTC (rev 10912)
@@ -1,5 +1,5 @@
#
-# Copyright 2006 Free Software Foundation, Inc.
+# Copyright 2006,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -25,3 +25,4 @@
from gnuradio_swig_py_gengen import *
from gnuradio_swig_py_filter import *
from gnuradio_swig_py_io import *
+from gnuradio_swig_py_hier import *
Modified:
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/swig/gr_swig_block_magic.i
===================================================================
---
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/swig/gr_swig_block_magic.i
2009-04-26 19:42:28 UTC (rev 10911)
+++
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/swig/gr_swig_block_magic.i
2009-04-26 19:51:49 UTC (rev 10912)
@@ -29,12 +29,6 @@
typedef boost::shared_ptr<NAME> NAME ## _sptr;
%template(NAME ## _sptr) boost::shared_ptr<NAME>;
%rename(BASE_NAME) PKG ## _make_ ## BASE_NAME;
-%inline {
- gr_block_sptr NAME ## _block (NAME ## _sptr r)
- {
- return gr_block_sptr (r);
- }
-}
%pythoncode %{
NAME ## _sptr.block = lambda self: NAME ## _block (self)
Modified:
gnuradio/branches/releases/3.2/gnuradio-core/src/python/gnuradio/blks2impl/channel_model.py
===================================================================
---
gnuradio/branches/releases/3.2/gnuradio-core/src/python/gnuradio/blks2impl/channel_model.py
2009-04-26 19:42:28 UTC (rev 10911)
+++
gnuradio/branches/releases/3.2/gnuradio-core/src/python/gnuradio/blks2impl/channel_model.py
2009-04-26 19:51:49 UTC (rev 10912)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright 2007 Free Software Foundation, Inc.
+# Copyright 2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -22,44 +22,5 @@
from gnuradio import gr
-class channel_model(gr.hier_block2):
- def __init__(self, noise_voltage=0.0, frequency_offset=0.0, epsilon=1.0,
taps=[1.0,0.0], noise_seed=3021):
- ''' Creates a channel model that includes:
- - AWGN noise power in terms of noise voltage
- - A frequency offest in the channel in ratio
- - A timing offset ratio to model clock difference (epsilon)
- - Multipath taps
- '''
- gr.hier_block2.__init__(self, "channel_model",
- gr.io_signature(1, 1, gr.sizeof_gr_complex), #
Input signature
- gr.io_signature(1, 1, gr.sizeof_gr_complex)) #
Output signature
-
- #print epsilon
- self.timing_offset = gr.fractional_interpolator_cc(0, epsilon)
-
- self.multipath = gr.fir_filter_ccc(1, taps)
-
- self.noise_adder = gr.add_cc()
- self.noise = gr.noise_source_c(gr.GR_GAUSSIAN, noise_voltage,
noise_seed)
- self.freq_offset = gr.sig_source_c(1, gr.GR_SIN_WAVE,
frequency_offset, 1.0, 0.0)
- self.mixer_offset = gr.multiply_cc()
-
- self.connect(self, self.timing_offset, self.multipath)
- self.connect(self.multipath, (self.mixer_offset,0))
- self.connect(self.freq_offset,(self.mixer_offset,1))
- self.connect(self.mixer_offset, (self.noise_adder,1))
- self.connect(self.noise, (self.noise_adder,0))
- self.connect(self.noise_adder, self)
-
-
- def set_noise_voltage(self, noise_voltage):
- self.noise.set_amplitude(noise_voltage)
-
- def set_frequency_offset(self, frequency_offset):
- self.freq_offset.set_frequency(frequency_offset)
-
- def set_taps(self, taps):
- self.multipath.set_taps(taps)
-
- def set_timing_offset(self, epsilon):
- self.timing_offset.set_interp_ratio(epsilon)
+# This block is now a C++ hierarchical block, gr.channel_model
+channel_model = gr.channel_model
Property changes on:
gnuradio/branches/releases/3.2/gnuradio-core/src/python/gnuradio/gr/pubsub.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10638-10648
/gnuradio/branches/developers/eb/t378/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10683-10688
/gnuradio/branches/developers/jblum/vlen/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10667-10677
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10713-10765
/gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10653-10655,10660-10661,10671,10673,10678,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10847-10848,10850,10852
+
/gnuradio/branches/developers/eb/t348/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10638-10648
/gnuradio/branches/developers/eb/t378/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10683-10688
/gnuradio/branches/developers/jblum/vlen/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10818-10858
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10713-10765
/gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10653-10655,10660-10661,10671,10673,10678,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10847-10848,10850,10852,10859,10861-10862,10864
Modified:
gnuradio/branches/releases/3.2/gnuradio-examples/python/digital/benchmark_loopback.py
===================================================================
---
gnuradio/branches/releases/3.2/gnuradio-examples/python/digital/benchmark_loopback.py
2009-04-26 19:42:28 UTC (rev 10911)
+++
gnuradio/branches/releases/3.2/gnuradio-examples/python/digital/benchmark_loopback.py
2009-04-26 19:51:49 UTC (rev 10912)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -20,7 +20,7 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, gru, modulation_utils, blks2
+from gnuradio import gr, gru, modulation_utils
from gnuradio import eng_notation
from gnuradio.eng_option import eng_option
from optparse import OptionParser
@@ -50,7 +50,7 @@
self.rxpath = receive_path(demod_class, rx_callback, options)
if channelon:
- self.channel = blks2.channel_model(noise_voltage,
frequency_offset, 1.01)
+ self.channel = gr.channel_model(noise_voltage, frequency_offset,
1.01)
if options.discontinuous:
z = 20000*[0,]
Modified:
gnuradio/branches/releases/3.2/gnuradio-examples/python/ofdm/benchmark_ofdm.py
===================================================================
---
gnuradio/branches/releases/3.2/gnuradio-examples/python/ofdm/benchmark_ofdm.py
2009-04-26 19:42:28 UTC (rev 10911)
+++
gnuradio/branches/releases/3.2/gnuradio-examples/python/ofdm/benchmark_ofdm.py
2009-04-26 19:51:49 UTC (rev 10912)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright 2006, 2007 Free Software Foundation, Inc.
+# Copyright 2006, 2007, 2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -71,8 +71,8 @@
#self.mux = gr.stream_mux(gr.sizeof_gr_complex, stream_size)
self.throttle = gr.throttle(gr.sizeof_gr_complex, options.sample_rate)
- self.channel = blks2.channel_model(noise_voltage, frequency_offset,
- options.clockrate_ratio, taps)
+ self.channel = gr.channel_model(noise_voltage, frequency_offset,
+ options.clockrate_ratio, taps)
self.rxpath = receive_path(callback, options)
#self.connect(self.zeros, (self.mux,0))
Modified: gnuradio/branches/releases/3.2/gr-qtgui/src/python/pyqt_example.py
===================================================================
--- gnuradio/branches/releases/3.2/gr-qtgui/src/python/pyqt_example.py
2009-04-26 19:42:28 UTC (rev 10911)
+++ gnuradio/branches/releases/3.2/gr-qtgui/src/python/pyqt_example.py
2009-04-26 19:51:49 UTC (rev 10912)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-from gnuradio import gr, blks2
+from gnuradio import gr
from gnuradio.qtgui import qtgui
from PyQt4 import QtGui, QtCore
import sys, sip
@@ -111,7 +111,7 @@
src1 = gr.sig_source_c(Rs, gr.GR_SIN_WAVE, f1, 0.1, 0)
src2 = gr.sig_source_c(Rs, gr.GR_SIN_WAVE, f2, 0.1, 0)
src = gr.add_cc()
- channel = blks2.channel_model(0.001)
+ channel = gr.channel_model(0.001)
thr = gr.throttle(gr.sizeof_gr_complex, 100*fftsize)
self.snk1 = qtgui.sink_c(fftsize, gr.firdes.WIN_BLACKMAN_hARRIS,
-Rs/2, Rs/2,
Modified: gnuradio/branches/releases/3.2/gr-qtgui/src/python/qt_digital.py
===================================================================
--- gnuradio/branches/releases/3.2/gr-qtgui/src/python/qt_digital.py
2009-04-26 19:42:28 UTC (rev 10911)
+++ gnuradio/branches/releases/3.2/gr-qtgui/src/python/qt_digital.py
2009-04-26 19:51:49 UTC (rev 10912)
@@ -74,7 +74,7 @@
def noiseEditText(self):
try:
noise = self.noiseEdit.text().toDouble()[0]
- self.channel.noise.set_amplitude(noise)
+ self.channel.set_noise_voltage(noise)
self.noise = noise
except RuntimeError:
@@ -83,7 +83,7 @@
def freqEditText(self):
try:
freq = self.freqEdit.text().toDouble()[0]
- self.channel.freq_offset.set_frequency(freq)
+ self.channel.set_frequency_offset(freq)
self.freq = freq
except RuntimeError:
@@ -92,7 +92,7 @@
def timeEditText(self):
try:
to = self.timeEdit.text().toDouble()[0]
- self.channel.timing_offset.set_interp_ratio(to)
+ self.channel.set_timing_offset(to)
self.timing_offset = to
except RuntimeError:
@@ -121,7 +121,7 @@
noise = 1e-7
fo = 1e-6
to = 1.0
- channel = blks2.channel_model(noise, fo, to)
+ channel = gr.channel_model(noise, fo, to)
thr = gr.throttle(gr.sizeof_gr_complex, 10*fftsize)
self.snk_tx = qtgui.sink_c(fftsize, gr.firdes.WIN_BLACKMAN_hARRIS,
-1/2, 1/2,
Property changes on:
gnuradio/branches/releases/3.2/gr-qtgui/src/python/usrp_display.py
___________________________________________________________________
Modified: svn:mergeinfo
-
+
/gnuradio/branches/developers/jcorgan/cpphier/gr-qtgui/src/python/usrp_display.py:10818-10858
/gnuradio/trunk/gr-qtgui/src/python/usrp_display.py:10859,10861-10862,10864
Property changes on:
gnuradio/branches/releases/3.2/gr-wxgui/src/python/plotter/grid_plotter_base.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t378/gr-wxgui/src/python/plotter/grid_plotter_base.py:10683-10688
/gnuradio/branches/developers/jblum/vlen/gr-wxgui/src/python/plotter/grid_plotter_base.py:10667-10677
/gnuradio/branches/developers/jcorgan/gpio2/gr-wxgui/src/python/plotter/grid_plotter_base.py:10713-10765
/gnuradio/trunk/gr-wxgui/src/python/plotter/grid_plotter_base.py:10673,10678,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10847-10848,10850,10852
+
/gnuradio/branches/developers/eb/t378/gr-wxgui/src/python/plotter/grid_plotter_base.py:10683-10688
/gnuradio/branches/developers/jblum/vlen/gr-wxgui/src/python/plotter/grid_plotter_base.py:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/gr-wxgui/src/python/plotter/grid_plotter_base.py:10818-10858
/gnuradio/branches/developers/jcorgan/gpio2/gr-wxgui/src/python/plotter/grid_plotter_base.py:10713-10765
/gnuradio/trunk/gr-wxgui/src/python/plotter/grid_plotter_base.py:10673,10678,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10847-10848,10850,10852,10859,10861-10862,10864
Modified:
gnuradio/branches/releases/3.2/grc/data/platforms/python/block_tree.xml
===================================================================
--- gnuradio/branches/releases/3.2/grc/data/platforms/python/block_tree.xml
2009-04-26 19:42:28 UTC (rev 10911)
+++ gnuradio/branches/releases/3.2/grc/data/platforms/python/block_tree.xml
2009-04-26 19:51:49 UTC (rev 10912)
@@ -166,7 +166,7 @@
<block>gr_freq_xlating_fir_filter_xxx</block>
<block>gr_iir_filter_ffd</block>
<block>gr_filter_delay_fc</block>
- <block>blks2_channel_model</block>
+ <block>gr_channel_model</block>
<!-- Other filters -->
<block>gr_single_pole_iir_filter_xx</block>
<block>gr_hilbert_fc</block>
Modified:
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/Makefile.am
2009-04-26 19:42:28 UTC (rev 10911)
+++ gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/Makefile.am
2009-04-26 19:51:49 UTC (rev 10912)
@@ -30,7 +30,6 @@
band_reject_filter.xml \
blks2_am_demod_cf.xml \
blks2_analysis_filterbank.xml \
- blks2_channel_model.xml \
blks2_dxpsk_demod.xml \
blks2_dxpsk_mod.xml \
blks2_error_rate.xml \
@@ -65,6 +64,7 @@
gr_and_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 \
Property changes on:
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/gr_add_xx.xml
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_add_vxx.xml:10638-10648
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_add_xx.xml:10683-10688
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_add_vxx.xml:10464-10658
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_add_xx.xml:10713-10765
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_add_vxx.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_add_vxx.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/gr_add_xx.xml:10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10847-10848,10850,10852
+
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_add_vxx.xml:10638-10648
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_add_xx.xml:10683-10688
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_add_vxx.xml:10464-10658
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_add_xx.xml:10818-10858
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_add_xx.xml:10713-10765
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_add_vxx.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_add_vxx.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/gr_add_xx.xml:10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10847-10848,10850,10852,10859,10861-10862,10864
Copied:
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/gr_channel_model.xml
(from rev 10862,
gnuradio/trunk/grc/data/platforms/python/blocks/gr_channel_model.xml)
===================================================================
---
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/gr_channel_model.xml
(rev 0)
+++
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/gr_channel_model.xml
2009-04-26 19:51:49 UTC (rev 10912)
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Channel Model
+###################################################
+ -->
+<block>
+ <name>Channel Model</name>
+ <key>gr_channel_model</key>
+ <import>from gnuradio import gr</import>
+ <import>from gnuradio.gr import firdes</import>
+ <make>gr.channel_model(
+ noise_voltage=$noise_voltage,
+ frequency_offset=$freq_offset,
+ epsilon=$epsilon,
+ taps=$taps,
+ noise_seed=$seed,
+)</make>
+ <callback>set_noise_voltage($noise_voltage)</callback>
+ <callback>set_frequency_offset($freq_offset)</callback>
+ <callback>set_taps($taps)</callback>
+ <callback>set_timing_offset($epsilon)</callback>
+ <param>
+ <name>Noise Voltage</name>
+ <key>noise_voltage</key>
+ <value>0.0</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Frequency Offset</name>
+ <key>freq_offset</key>
+ <value>0.0</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Epsilon</name>
+ <key>epsilon</key>
+ <value>1.0</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Taps</name>
+ <key>taps</key>
+ <value>1.0 + 1.0j</value>
+ <type>complex_vector</type>
+ </param>
+ <param>
+ <name>Seed</name>
+ <key>seed</key>
+ <value>42</value>
+ <type>int</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>complex</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>complex</type>
+ </source>
+</block>
Property changes on:
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/gr_channel_model.xml
___________________________________________________________________
Added: svn:mergeinfo
+
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/blks2_channel_model.xml:10638-10648
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/blks2_channel_model.xml:10683-10688
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/blks2_channel_model.xml:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/blks2_channel_model.xml:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/blks2_channel_model.xml:10818-10858
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/data/platforms/python/blocks/blks2_channel_model.xml:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/blks2_channel_model.xml:10713-10765
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/blks2_channel_model.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/blks2_channel_model.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/gr_channel_model.xml:10864
Property changes on:
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/gr_multiply_xx.xml
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10638-10648
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10683-10688
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10464-10658
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10713-10765
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10847-10848,10850,10852
+
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10638-10648
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10683-10688
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10464-10658
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10818-10858
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10713-10765
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10847-10848,10850,10852,10859,10861-10862,10864
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r10912 - in gnuradio/branches/releases/3.2: . config gnuradio-core/src/lib gnuradio-core/src/lib/hier gnuradio-core/src/lib/swig gnuradio-core/src/python/gnuradio/blks2impl gnuradio-core/src/python/gnuradio/gr gnuradio-examples/python/digital gnuradio-examples/python/ofdm gr-qtgui/src/python gr-wxgui/src/python/plotter grc/data/platforms/python grc/data/platforms/python/blocks,
jcorgan <=