[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r10551 - in gnuradio/trunk: . config debian gnuradio-c
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r10551 - in gnuradio/trunk: . config debian gnuradio-core/doc gnuradio-core/src/lib/gengen gr-gpio/src gr-gpio/src/python gr-usrp/apps grc/data/platforms/python/blocks grc/freedesktop grc/scripts mblock/src/include/mblock usrp2/host/apps/bitrot |
|
Date: |
Mon, 2 Mar 2009 19:10:37 -0700 (MST) |
Author: jcorgan
Date: 2009-03-02 19:10:36 -0700 (Mon, 02 Mar 2009)
New Revision: 10551
Added:
gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_and_const_XX.cc.t
gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_and_const_XX.h.t
gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_and_const_XX.i.t
Removed:
gnuradio/trunk/gr-gpio/src/lib/
gnuradio/trunk/gr-gpio/src/python/qa_gpio.py
gnuradio/trunk/gr-gpio/src/python/run_tests.in
Modified:
gnuradio/trunk/
gnuradio/trunk/Makefile.am
gnuradio/trunk/config/grc_gr_gpio.m4
gnuradio/trunk/debian/libgnuradio-core-dev.dirs
gnuradio/trunk/debian/libgnuradio-core.dirs
gnuradio/trunk/debian/libgnuradio-core.install
gnuradio/trunk/debian/libgnuradio-omnithread-dev.dirs
gnuradio/trunk/debian/libgnuradio-omnithread-dev.install
gnuradio/trunk/debian/libgnuradio-omnithread.install
gnuradio/trunk/debian/libmblock.install
gnuradio/trunk/debian/libpmt-dev.install
gnuradio/trunk/debian/libpmt.install
gnuradio/trunk/debian/libusrp-inband.install
gnuradio/trunk/debian/libusrp.dirs
gnuradio/trunk/debian/libusrp.install
gnuradio/trunk/debian/libusrp.postinst
gnuradio/trunk/debian/libusrp.postrm
gnuradio/trunk/debian/libusrp.udev
gnuradio/trunk/gnuradio-core/doc/Makefile.am
gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.am
gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.gen
gnuradio/trunk/gnuradio-core/src/lib/gengen/generate_common.py
gnuradio/trunk/gnuradio-core/src/lib/gengen/gengen_generated.i
gnuradio/trunk/gr-gpio/src/Makefile.am
gnuradio/trunk/gr-gpio/src/python/Makefile.am
gnuradio/trunk/gr-gpio/src/python/gpio_rx_sfile.py
gnuradio/trunk/gr-gpio/src/python/gpio_usrp_fft.py
gnuradio/trunk/gr-usrp/apps/
gnuradio/trunk/gr-usrp/apps/usrp_rx_cfile.cc
gnuradio/trunk/gr-usrp/apps/usrp_rx_cfile.h
gnuradio/trunk/gr-usrp/apps/usrp_siggen.cc
gnuradio/trunk/gr-usrp/apps/usrp_siggen.h
gnuradio/trunk/grc/data/platforms/python/blocks/const_source_x.xml
gnuradio/trunk/grc/data/platforms/python/blocks/usrp_probe.xml
gnuradio/trunk/grc/freedesktop/gnuradio-usrp_probe.desktop
gnuradio/trunk/grc/scripts/usrp2_probe
gnuradio/trunk/grc/scripts/usrp_probe
gnuradio/trunk/mblock/src/include/mblock/class_registry.h
gnuradio/trunk/mblock/src/include/mblock/common.h
gnuradio/trunk/mblock/src/include/mblock/exception.h
gnuradio/trunk/mblock/src/include/mblock/mblock.h
gnuradio/trunk/mblock/src/include/mblock/message.h
gnuradio/trunk/mblock/src/include/mblock/msg_accepter.h
gnuradio/trunk/mblock/src/include/mblock/msg_queue.h
gnuradio/trunk/mblock/src/include/mblock/port.h
gnuradio/trunk/mblock/src/include/mblock/protocol_class.h
gnuradio/trunk/mblock/src/include/mblock/runtime.h
gnuradio/trunk/mblock/src/include/mblock/time.h
gnuradio/trunk/usrp2/host/apps/bitrot/rx_samples.cc
Log:
Merged r10539:10546 from michaelld/two_mods into trunk. Trunk passes distcheck.
Property changes on: gnuradio/trunk
___________________________________________________________________
Added: svn:mergeinfo
+ /gnuradio/branches/developers/michaelld/two_mods:10540-10546
Modified: gnuradio/trunk/Makefile.am
===================================================================
--- gnuradio/trunk/Makefile.am 2009-03-03 01:04:43 UTC (rev 10550)
+++ gnuradio/trunk/Makefile.am 2009-03-03 02:10:36 UTC (rev 10551)
@@ -30,9 +30,5 @@
config.h.in \
run_tests.sh.in
-dist_gr_doc_DATA = \
- README \
- README.hacking
-
SUBDIRS = @build_dirs@
DIST_SUBDIRS = @build_dirs@ @skipped_dirs@ @with_dirs@
Modified: gnuradio/trunk/config/grc_gr_gpio.m4
===================================================================
--- gnuradio/trunk/config/grc_gr_gpio.m4 2009-03-03 01:04:43 UTC (rev
10550)
+++ gnuradio/trunk/config/grc_gr_gpio.m4 2009-03-03 02:10:36 UTC (rev
10551)
@@ -1,4 +1,4 @@
-dnl Copyright 2007,2008 Free Software Foundation, Inc.
+dnl Copyright 2007,2008,2009 Free Software Foundation, Inc.
dnl
dnl This file is part of GNU Radio
dnl
@@ -31,13 +31,8 @@
gr-gpio/src/fpga/top/Makefile \
gr-gpio/src/fpga/lib/Makefile \
gr-gpio/src/fpga/rbf/Makefile \
- gr-gpio/src/lib/Makefile \
- gr-gpio/src/python/Makefile \
- gr-gpio/src/python/run_tests
+ gr-gpio/src/python/Makefile
])
- GRC_BUILD_CONDITIONAL(gr-gpio,[
- dnl run_tests is created from run_tests.in. Make it executable.
- AC_CONFIG_COMMANDS([run_tests_gpio], [chmod +x
gr-gpio/src/python/run_tests])
- ])
+ GRC_BUILD_CONDITIONAL(gr-gpio)
])
Property changes on: gnuradio/trunk/debian/libgnuradio-core-dev.dirs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: gnuradio/trunk/debian/libgnuradio-core.dirs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: gnuradio/trunk/debian/libgnuradio-core.install
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: gnuradio/trunk/debian/libgnuradio-omnithread-dev.dirs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: gnuradio/trunk/debian/libgnuradio-omnithread-dev.install
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: gnuradio/trunk/debian/libgnuradio-omnithread.install
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: gnuradio/trunk/debian/libmblock.install
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: gnuradio/trunk/debian/libpmt-dev.install
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: gnuradio/trunk/debian/libpmt.install
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: gnuradio/trunk/debian/libusrp-inband.install
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: gnuradio/trunk/debian/libusrp.dirs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: gnuradio/trunk/debian/libusrp.install
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: gnuradio/trunk/debian/libusrp.postinst
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: gnuradio/trunk/debian/libusrp.postrm
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: gnuradio/trunk/debian/libusrp.udev
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: gnuradio/trunk/gnuradio-core/doc/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/doc/Makefile.am 2009-03-03 01:04:43 UTC
(rev 10550)
+++ gnuradio/trunk/gnuradio-core/doc/Makefile.am 2009-03-03 02:10:36 UTC
(rev 10551)
@@ -23,6 +23,10 @@
SUBDIRS = other xml-swig
+dist_gr_doc_DATA = \
+ $(top_srcdir)/README \
+ $(top_srcdir)/README.hacking
+
all-local: prep @generate_docs@
doc: docs # alias
Modified: gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.am 2009-03-03
01:04:43 UTC (rev 10550)
+++ gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.am 2009-03-03
02:10:36 UTC (rev 10551)
@@ -107,6 +107,9 @@
gr_and_XX.cc.t \
gr_and_XX.h.t \
gr_and_XX.i.t \
+ gr_and_const_XX.cc.t \
+ gr_and_const_XX.h.t \
+ gr_and_const_XX.i.t \
gr_or_XX.cc.t \
gr_or_XX.h.t \
gr_or_XX.i.t \
Modified: gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.gen
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.gen 2009-03-03
01:04:43 UTC (rev 10550)
+++ gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.gen 2009-03-03
02:10:36 UTC (rev 10551)
@@ -20,6 +20,9 @@
gr_add_vii.h \
gr_add_vss.h \
gr_and_bb.h \
+ gr_and_const_bb.h \
+ gr_and_const_ii.h \
+ gr_and_const_ss.h \
gr_and_ii.h \
gr_and_ss.h \
gr_argmax_fs.h \
@@ -130,6 +133,9 @@
gr_add_vii.i \
gr_add_vss.i \
gr_and_bb.i \
+ gr_and_const_bb.i \
+ gr_and_const_ii.i \
+ gr_and_const_ss.i \
gr_and_ii.i \
gr_and_ss.i \
gr_argmax_fs.i \
@@ -240,6 +246,9 @@
gr_add_vii.cc \
gr_add_vss.cc \
gr_and_bb.cc \
+ gr_and_const_bb.cc \
+ gr_and_const_ii.cc \
+ gr_and_const_ss.cc \
gr_and_ii.cc \
gr_and_ss.cc \
gr_argmax_fs.cc \
Modified: gnuradio/trunk/gnuradio-core/src/lib/gengen/generate_common.py
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/gengen/generate_common.py
2009-03-03 01:04:43 UTC (rev 10550)
+++ gnuradio/trunk/gnuradio-core/src/lib/gengen/generate_common.py
2009-03-03 02:10:36 UTC (rev 10551)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright 2004,2006,2007,2008 Free Software Foundation, Inc.
+# Copyright 2004,2006,2007,2008,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -62,6 +62,7 @@
('gr_packed_to_unpacked_XX', ('bb','ss','ii')),
('gr_xor_XX', ('bb','ss','ii')),
('gr_and_XX', ('bb','ss','ii')),
+ ('gr_and_const_XX', ('bb','ss','ii')),
('gr_or_XX', ('bb','ss','ii')),
('gr_not_XX', ('bb','ss','ii')),
('gr_sample_and_hold_XX', ('bb','ss','ii','ff')),
Modified: gnuradio/trunk/gnuradio-core/src/lib/gengen/gengen_generated.i
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/gengen/gengen_generated.i
2009-03-03 01:04:43 UTC (rev 10550)
+++ gnuradio/trunk/gnuradio-core/src/lib/gengen/gengen_generated.i
2009-03-03 02:10:36 UTC (rev 10551)
@@ -20,6 +20,9 @@
#include <gr_add_vii.h>
#include <gr_add_vss.h>
#include <gr_and_bb.h>
+#include <gr_and_const_bb.h>
+#include <gr_and_const_ii.h>
+#include <gr_and_const_ss.h>
#include <gr_and_ii.h>
#include <gr_and_ss.h>
#include <gr_argmax_fs.h>
@@ -130,6 +133,9 @@
%include <gr_add_vii.i>
%include <gr_add_vss.i>
%include <gr_and_bb.i>
+%include <gr_and_const_bb.i>
+%include <gr_and_const_ii.i>
+%include <gr_and_const_ss.i>
%include <gr_and_ii.i>
%include <gr_and_ss.i>
%include <gr_argmax_fs.i>
Copied: gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_and_const_XX.cc.t (from
rev 10546,
gnuradio/branches/developers/michaelld/two_mods/gnuradio-core/src/lib/gengen/gr_and_const_XX.cc.t)
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_and_const_XX.cc.t
(rev 0)
+++ gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_and_const_XX.cc.t
2009-03-03 02:10:36 UTC (rev 10551)
@@ -0,0 +1,72 @@
+/* -*- 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.
+ */
+
+// @WARNING@
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <@address@hidden>
+#include <gr_io_signature.h>
+
address@hidden@
address@hidden@ (@I_TYPE@ k)
+{
+ return @SPTR_NAME@ (new @NAME@ (k));
+};
+
address@hidden@::@NAME@ (@I_TYPE@ k)
+ : gr_sync_block ("@BASE_NAME@",
+ gr_make_io_signature (1, 1, sizeof (@I_TYPE@)),
+ gr_make_io_signature (1, 1, sizeof (@O_TYPE@))),
+ d_k (k)
+{
+}
+
+int
address@hidden@::work (int noutput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items)
+{
+ @I_TYPE@ *iptr = (@I_TYPE@ *) input_items[0];
+ @O_TYPE@ *optr = (@O_TYPE@ *) output_items[0];
+
+ int size = noutput_items;
+
+ while (size >= 8) {
+ *optr++ = *iptr++ & d_k;
+ *optr++ = *iptr++ & d_k;
+ *optr++ = *iptr++ & d_k;
+ *optr++ = *iptr++ & d_k;
+ *optr++ = *iptr++ & d_k;
+ *optr++ = *iptr++ & d_k;
+ *optr++ = *iptr++ & d_k;
+ *optr++ = *iptr++ & d_k;
+ size -= 8;
+ }
+
+ while (size-- > 0)
+ *optr++ = *iptr++ & d_k;
+
+ return (noutput_items);
+}
Copied: gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_and_const_XX.h.t (from
rev 10546,
gnuradio/branches/developers/michaelld/two_mods/gnuradio-core/src/lib/gengen/gr_and_const_XX.h.t)
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_and_const_XX.h.t
(rev 0)
+++ gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_and_const_XX.h.t
2009-03-03 02:10:36 UTC (rev 10551)
@@ -0,0 +1,57 @@
+/* -*- 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.
+ */
+
+// @WARNING@
+
+#ifndef @GUARD_NAME@
+#define @GUARD_NAME@
+
+#include <gr_sync_block.h>
+
+class @NAME@;
+typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
+
address@hidden@ address@hidden@ (@O_TYPE@ k);
+
+/*!
+ * \brief output_N = input_N & value
+ * \ingroup math
+ *
+ * bitwise boolean and of const to the data stream.
+ */
+class @NAME@ : public gr_sync_block
+{
+ friend @SPTR_NAME@ address@hidden@ (@O_TYPE@ k);
+
+ @O_TYPE@ d_k; // the constant
+ @NAME@ (@O_TYPE@ k);
+
+ public:
+ @O_TYPE@ k () const { return d_k; }
+ void set_k (@O_TYPE@ k) { d_k = k; }
+
+ int work (int noutput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items);
+};
+
+#endif
Copied: gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_and_const_XX.i.t (from
rev 10546,
gnuradio/branches/developers/michaelld/two_mods/gnuradio-core/src/lib/gengen/gr_and_const_XX.i.t)
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_and_const_XX.i.t
(rev 0)
+++ gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_and_const_XX.i.t
2009-03-03 02:10:36 UTC (rev 10551)
@@ -0,0 +1,37 @@
+/* -*- 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.
+ */
+
+// @WARNING@
+
+GR_SWIG_BLOCK_MAGIC(gr,@BASE_NAME@)
+
address@hidden@ address@hidden@ (@O_TYPE@ k);
+
+class @NAME@ : public gr_sync_block
+{
+ private:
+ @NAME@ (@O_TYPE@ k);
+
+ public:
+ @O_TYPE@ k () const { return d_k; }
+ void set_k (@O_TYPE@ k) { d_k = k; }
+};
Modified: gnuradio/trunk/gr-gpio/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-gpio/src/Makefile.am 2009-03-03 01:04:43 UTC (rev
10550)
+++ gnuradio/trunk/gr-gpio/src/Makefile.am 2009-03-03 02:10:36 UTC (rev
10551)
@@ -1,5 +1,5 @@
#
-# Copyright 2007 Free Software Foundation, Inc.
+# Copyright 2007,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -19,4 +19,4 @@
# Boston, MA 02110-1301, USA.
#
-SUBDIRS = lib python fpga
+SUBDIRS = python fpga
Modified: gnuradio/trunk/gr-gpio/src/python/Makefile.am
===================================================================
--- gnuradio/trunk/gr-gpio/src/python/Makefile.am 2009-03-03 01:04:43 UTC
(rev 10550)
+++ gnuradio/trunk/gr-gpio/src/python/Makefile.am 2009-03-03 02:10:36 UTC
(rev 10551)
@@ -36,15 +36,4 @@
gpio_usrp_siggen.py \
gpio_usrp_fft.py
-# List of python files that will get distributed in tarball
-# but not installed anywhere on system
-noinst_PYTHON = \
- qa_gpio.py
-
-# Programs that get run by 'make check'
-TESTS = run_tests
-
-# Files to go into tarball not otherwise mentioned
-EXTRA_DIST = run_tests.in
-
MOSTLYCLEANFILES = *.pyo *.pyc *~
Modified: gnuradio/trunk/gr-gpio/src/python/gpio_rx_sfile.py
===================================================================
--- gnuradio/trunk/gr-gpio/src/python/gpio_rx_sfile.py 2009-03-03 01:04:43 UTC
(rev 10550)
+++ gnuradio/trunk/gr-gpio/src/python/gpio_rx_sfile.py 2009-03-03 02:10:36 UTC
(rev 10551)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2008,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -79,8 +79,8 @@
self.connect(u, head)
src = head
- ana_strip = gpio.and_const_ss(0xFFFE)
- dig_strip = gpio.and_const_ss(0x0001)
+ ana_strip = gr.and_const_ss(0xFFFE)
+ dig_strip = gr.and_const_ss(0x0001)
ana_sink = gr.file_sink(gr.sizeof_short, options.ana_filename)
dig_sink = gr.file_sink(gr.sizeof_short, options.dig_filename)
Modified: gnuradio/trunk/gr-gpio/src/python/gpio_usrp_fft.py
===================================================================
--- gnuradio/trunk/gr-gpio/src/python/gpio_usrp_fft.py 2009-03-03 01:04:43 UTC
(rev 10550)
+++ gnuradio/trunk/gr-gpio/src/python/gpio_usrp_fft.py 2009-03-03 02:10:36 UTC
(rev 10551)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright 2004,2005,2007,2008 Free Software Foundation, Inc.
+# Copyright 2004,2005,2007,2008,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -144,10 +144,10 @@
thr = gr.throttle(gr.sizeof_short, input_rate)
self.connect(self.filesrc,thr,self.is2c,self.scope)
elif options.digital:
- self.select_dig=gpio.and_const_ss(0x0001)
+ self.select_dig=gr.and_const_ss(0x0001)
self.connect(self.u, self.select_dig,self.is2c,self.scope)
elif options.analog:
- self.select_ana=gpio.and_const_ss(0xFFFE)
+ self.select_ana=gr.and_const_ss(0xFFFE)
self.connect(self.u, self.select_ana,self.is2c,self.scope)
else:
self.connect(self.u,self.is2c,self.scope)
Property changes on: gnuradio/trunk/gr-usrp/apps
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: gnuradio/trunk/gr-usrp/apps/usrp_rx_cfile.cc
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: gnuradio/trunk/gr-usrp/apps/usrp_rx_cfile.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: gnuradio/trunk/gr-usrp/apps/usrp_siggen.cc
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: gnuradio/trunk/gr-usrp/apps/usrp_siggen.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
gnuradio/trunk/grc/data/platforms/python/blocks/const_source_x.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
gnuradio/trunk/grc/data/platforms/python/blocks/usrp_probe.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: gnuradio/trunk/grc/freedesktop/gnuradio-usrp_probe.desktop
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: gnuradio/trunk/grc/scripts/usrp2_probe
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: gnuradio/trunk/grc/scripts/usrp_probe
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: gnuradio/trunk/mblock/src/include/mblock/class_registry.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: gnuradio/trunk/mblock/src/include/mblock/common.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: gnuradio/trunk/mblock/src/include/mblock/exception.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: gnuradio/trunk/mblock/src/include/mblock/mblock.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: gnuradio/trunk/mblock/src/include/mblock/message.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: gnuradio/trunk/mblock/src/include/mblock/msg_accepter.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: gnuradio/trunk/mblock/src/include/mblock/msg_queue.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: gnuradio/trunk/mblock/src/include/mblock/port.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: gnuradio/trunk/mblock/src/include/mblock/protocol_class.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: gnuradio/trunk/mblock/src/include/mblock/runtime.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: gnuradio/trunk/mblock/src/include/mblock/time.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: gnuradio/trunk/usrp2/host/apps/bitrot/rx_samples.cc
___________________________________________________________________
Deleted: svn:mergeinfo
-
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r10551 - in gnuradio/trunk: . config debian gnuradio-core/doc gnuradio-core/src/lib/gengen gr-gpio/src gr-gpio/src/python gr-usrp/apps grc/data/platforms/python/blocks grc/freedesktop grc/scripts mblock/src/include/mblock usrp2/host/apps/bitrot,
jcorgan <=