commit-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] r10612 - in gnuradio/branches/releases/3.2: . config g


From: jcorgan
Subject: [Commit-gnuradio] r10612 - in gnuradio/branches/releases/3.2: . config gnuradio-core/doc gnuradio-core/src/lib/gengen gr-gpio/src gr-gpio/src/python
Date: Sun, 15 Mar 2009 13:28:53 -0600 (MDT)

Author: jcorgan
Date: 2009-03-15 13:28:53 -0600 (Sun, 15 Mar 2009)
New Revision: 10612

Added:
   
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/gengen/gr_and_const_XX.cc.t
   
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/gengen/gr_and_const_XX.h.t
   
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/gengen/gr_and_const_XX.i.t
Removed:
   gnuradio/branches/releases/3.2/gr-gpio/src/lib/
   gnuradio/branches/releases/3.2/gr-gpio/src/python/qa_gpio.py
   gnuradio/branches/releases/3.2/gr-gpio/src/python/run_tests.in
Modified:
   gnuradio/branches/releases/3.2/
   gnuradio/branches/releases/3.2/Makefile.am
   gnuradio/branches/releases/3.2/config/grc_gr_gpio.m4
   gnuradio/branches/releases/3.2/gnuradio-core/doc/Makefile.am
   gnuradio/branches/releases/3.2/gnuradio-core/src/lib/gengen/
   gnuradio/branches/releases/3.2/gnuradio-core/src/lib/gengen/Makefile.am
   gnuradio/branches/releases/3.2/gnuradio-core/src/lib/gengen/Makefile.gen
   
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/gengen/generate_common.py
   
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/gengen/gengen_generated.i
   gnuradio/branches/releases/3.2/gr-gpio/src/Makefile.am
   gnuradio/branches/releases/3.2/gr-gpio/src/python/Makefile.am
   gnuradio/branches/releases/3.2/gr-gpio/src/python/gpio_rx_sfile.py
   gnuradio/branches/releases/3.2/gr-gpio/src/python/gpio_usrp_fft.py
Log:
Applied changeseet r10551 to release 3.2 branch.


Property changes on: gnuradio/branches/releases/3.2
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/trunk:10356-10359,10481-10482,10497-10499,10506-10507,10511,10514,10521,10523-10524,10529,10531,10535,10537-10538,10550,10565,10578,10600
   + /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,10559,10565,10578,10600

Modified: gnuradio/branches/releases/3.2/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.2/Makefile.am  2009-03-15 19:19:48 UTC (rev 
10611)
+++ gnuradio/branches/releases/3.2/Makefile.am  2009-03-15 19:28:53 UTC (rev 
10612)
@@ -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/branches/releases/3.2/config/grc_gr_gpio.m4
===================================================================
--- gnuradio/branches/releases/3.2/config/grc_gr_gpio.m4        2009-03-15 
19:19:48 UTC (rev 10611)
+++ gnuradio/branches/releases/3.2/config/grc_gr_gpio.m4        2009-03-15 
19:28:53 UTC (rev 10612)
@@ -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)
 ])

Modified: gnuradio/branches/releases/3.2/gnuradio-core/doc/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.2/gnuradio-core/doc/Makefile.am        
2009-03-15 19:19:48 UTC (rev 10611)
+++ gnuradio/branches/releases/3.2/gnuradio-core/doc/Makefile.am        
2009-03-15 19:28:53 UTC (rev 10612)
@@ -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
 


Property changes on: gnuradio/branches/releases/3.2/gnuradio-core/src/lib/gengen
___________________________________________________________________
Modified: svn:ignore
   - Makefile
Makefile.in
.la
.lo
.deps
.libs
*.la
*.lo
*.pyc
generate-stamp
GrFIRfilterCCC.cc
GrFIRfilterCCC.h
GrFIRfilterCCF.cc
GrFIRfilterCCF.h
GrFIRfilterFCC.cc
GrFIRfilterFCC.h
GrFIRfilterFFF.cc
GrFIRfilterFFF.h
GrFIRfilterFSF.cc
GrFIRfilterFSF.h
GrFIRfilterSCC.cc
GrFIRfilterSCC.h
GrFIRfilterSIS.cc
GrFIRfilterSIS.h
GrFreqXlatingFIRfilterCCC.cc
GrFreqXlatingFIRfilterCCC.h
GrFreqXlatingFIRfilterCCF.cc
GrFreqXlatingFIRfilterCCF.h
GrFreqXlatingFIRfilterFCC.cc
GrFreqXlatingFIRfilterFCC.h
GrFreqXlatingFIRfilterFCF.cc
GrFreqXlatingFIRfilterFCF.h
GrFreqXlatingFIRfilterSCC.cc
GrFreqXlatingFIRfilterSCC.h
GrFreqXlatingFIRfilterSCF.cc
GrFreqXlatingFIRfilterSCF.h
gr_fir_CCC.cc
gr_fir_CCC.h
gr_fir_CCC_generic.cc
gr_fir_CCC_generic.h
gr_fir_CCF.cc
gr_fir_CCF.h
gr_fir_CCF_generic.cc
gr_fir_CCF_generic.h
gr_fir_FCC.cc
gr_fir_FCC.h
gr_fir_FCC_generic.cc
gr_fir_FCC_generic.h
gr_fir_FFF.cc
gr_fir_FFF.h
gr_fir_FFF_generic.cc
gr_fir_FFF_generic.h
gr_fir_FSF.cc
gr_fir_FSF.h
gr_fir_FSF_generic.cc
gr_fir_FSF_generic.h
gr_fir_SCC.cc
gr_fir_SCC.h
gr_fir_SCC_generic.cc
gr_fir_SCC_generic.h
gr_fir_SIS.cc
gr_fir_SIS.h
gr_fir_SIS_generic.cc
gr_fir_SIS_generic.h
gr_fir_sysconfig.cc
gr_fir_sysconfig.h
gr_fir_sysconfig_generic.cc
gr_fir_sysconfig_generic.h
gr_fir_util.cc
gr_fir_util.h
GrFIRfilterCCC.i
GrFIRfilterCCF.i
GrFIRfilterFCC.i
GrFIRfilterFFF.i
GrFIRfilterFSF.i
GrFIRfilterSCC.i
GrFIRfilterSIS.i
GrFreqXlatingFIRfilterCCC.i
GrFreqXlatingFIRfilterCCF.i
GrFreqXlatingFIRfilterFCC.i
GrFreqXlatingFIRfilterFCF.i
GrFreqXlatingFIRfilterSCC.i
GrFreqXlatingFIRfilterSCF.i
# --- generated files ---
gr_add_cc.cc
gr_add_cc.h
gr_add_cc.i
gr_add_const_c.cc
gr_add_const_cc.cc
gr_add_const_cc.h
gr_add_const_cc.i
gr_add_const_c.h
gr_add_const_c.i
gr_add_const_f.cc
gr_add_const_ff.cc
gr_add_const_ff.h
gr_add_const_ff.i
gr_add_const_f.h
gr_add_const_f.i
gr_add_const_i.cc
gr_add_const_i.h
gr_add_const_i.i
gr_add_const_ii.cc
gr_add_const_ii.h
gr_add_const_ii.i
gr_add_const_s.cc
gr_add_const_sf.cc
gr_add_const_sf.h
gr_add_const_sf.i
gr_add_const_s.h
gr_add_const_s.i
gr_add_const_ss.cc
gr_add_const_ss.h
gr_add_const_ss.i
gr_add_const_vcc.cc
gr_add_const_vcc.h
gr_add_const_vcc.i
gr_add_const_vff.cc
gr_add_const_vff.h
gr_add_const_vff.i
gr_add_const_vii.cc
gr_add_const_vii.h
gr_add_const_vii.i
gr_add_const_vss.cc
gr_add_const_vss.h
gr_add_const_vss.i
gr_add_ff.cc
gr_add_ff.h
gr_add_ff.i
gr_add_ii.cc
gr_add_ii.h
gr_add_ii.i
gr_add_ss.cc
gr_add_ss.h
gr_add_ss.i
gr_add_vcc.cc
gr_add_vcc.h
gr_add_vcc.i
gr_add_vff.cc
gr_add_vff.h
gr_add_vff.i
gr_add_vii.cc
gr_add_vii.h
gr_add_vii.i
gr_add_vss.cc
gr_add_vss.h
gr_add_vss.i
gr_and_bb.cc
gr_and_bb.h
gr_and_bb.i
gr_and_ii.cc
gr_and_ii.h
gr_and_ii.i
gr_and_ss.cc
gr_and_ss.h
gr_and_ss.i
gr_argmax_fs.cc
gr_argmax_fs.h
gr_argmax_fs.i
gr_argmax_is.cc
gr_argmax_is.h
gr_argmax_is.i
gr_argmax_ss.cc
gr_argmax_ss.h
gr_argmax_ss.i
gr_chunks_to_symbols_bc.cc
gr_chunks_to_symbols_bc.h
gr_chunks_to_symbols_bc.i
gr_chunks_to_symbols_bf.cc
gr_chunks_to_symbols_bf.h
gr_chunks_to_symbols_bf.i
gr_chunks_to_symbols_ic.cc
gr_chunks_to_symbols_ic.h
gr_chunks_to_symbols_ic.i
gr_chunks_to_symbols_if.cc
gr_chunks_to_symbols_if.h
gr_chunks_to_symbols_if.i
gr_chunks_to_symbols_sc.cc
gr_chunks_to_symbols_sc.h
gr_chunks_to_symbols_sc.i
gr_chunks_to_symbols_sf.cc
gr_chunks_to_symbols_sf.h
gr_chunks_to_symbols_sf.i
gr_divide_cc.cc
gr_divide_cc.h
gr_divide_cc.i
gr_divide_ff.cc
gr_divide_ff.h
gr_divide_ff.i
gr_divide_ii.cc
gr_divide_ii.h
gr_divide_ii.i
gr_divide_ss.cc
gr_divide_ss.h
gr_divide_ss.i
gr_integrate_cc.cc
gr_integrate_cc.h
gr_integrate_cc.i
gr_integrate_ff.cc
gr_integrate_ff.h
gr_integrate_ff.i
gr_integrate_ii.cc
gr_integrate_ii.h
gr_integrate_ii.i
gr_integrate_ss.cc
gr_integrate_ss.h
gr_integrate_ss.i
gr_max_ff.cc
gr_max_ff.h
gr_max_ff.i
gr_max_ii.cc
gr_max_ii.h
gr_max_ii.i
gr_max_ss.cc
gr_max_ss.h
gr_max_ss.i
gr_multiply_cc.cc
gr_multiply_cc.h
gr_multiply_cc.i
gr_multiply_const_cc.cc
gr_multiply_const_cc.h
gr_multiply_const_cc.i
gr_multiply_const_ff.cc
gr_multiply_const_ff.h
gr_multiply_const_ff.i
gr_multiply_const_ii.cc
gr_multiply_const_ii.h
gr_multiply_const_ii.i
gr_multiply_const_ss.cc
gr_multiply_const_ss.h
gr_multiply_const_ss.i
gr_multiply_const_vcc.cc
gr_multiply_const_vcc.h
gr_multiply_const_vcc.i
gr_multiply_const_vff.cc
gr_multiply_const_vff.h
gr_multiply_const_vff.i
gr_multiply_const_vii.cc
gr_multiply_const_vii.h
gr_multiply_const_vii.i
gr_multiply_const_vss.cc
gr_multiply_const_vss.h
gr_multiply_const_vss.i
gr_multiply_ff.cc
gr_multiply_ff.h
gr_multiply_ff.i
gr_multiply_ii.cc
gr_multiply_ii.h
gr_multiply_ii.i
gr_multiply_ss.cc
gr_multiply_ss.h
gr_multiply_ss.i
gr_multiply_vcc.cc
gr_multiply_vcc.h
gr_multiply_vcc.i
gr_multiply_vff.cc
gr_multiply_vff.h
gr_multiply_vff.i
gr_multiply_vii.cc
gr_multiply_vii.h
gr_multiply_vii.i
gr_multiply_vss.cc
gr_multiply_vss.h
gr_multiply_vss.i
gr_mute_cc.cc
gr_mute_cc.h
gr_mute_cc.i
gr_mute_ff.cc
gr_mute_ff.h
gr_mute_ff.i
gr_mute_ii.cc
gr_mute_ii.h
gr_mute_ii.i
gr_mute_ss.cc
gr_mute_ss.h
gr_mute_ss.i
gr_noise_source_c.cc
gr_noise_source_c.h
gr_noise_source_c.i
gr_noise_source_f.cc
gr_noise_source_f.h
gr_noise_source_f.i
gr_noise_source_i.cc
gr_noise_source_i.h
gr_noise_source_i.i
gr_noise_source_s.cc
gr_noise_source_s.h
gr_noise_source_s.i
gr_not_bb.cc
gr_not_bb.h
gr_not_bb.i
gr_not_ii.cc
gr_not_ii.h
gr_not_ii.i
gr_not_ss.cc
gr_not_ss.h
gr_not_ss.i
gr_or_bb.cc
gr_or_bb.h
gr_or_bb.i
gr_or_ii.cc
gr_or_ii.h
gr_or_ii.i
gr_or_ss.cc
gr_or_ss.h
gr_or_ss.i
gr_packed_to_unpacked_bb.cc
gr_packed_to_unpacked_bb.h
gr_packed_to_unpacked_bb.i
gr_packed_to_unpacked_ii.cc
gr_packed_to_unpacked_ii.h
gr_packed_to_unpacked_ii.i
gr_packed_to_unpacked_ss.cc
gr_packed_to_unpacked_ss.h
gr_packed_to_unpacked_ss.i
gr_peak_detector_fb.cc
gr_peak_detector_fb.h
gr_peak_detector_fb.i
gr_peak_detector_ff.cc
gr_peak_detector_ff.h
gr_peak_detector_ff.i
gr_peak_detector_ib.cc
gr_peak_detector_ib.h
gr_peak_detector_ib.i
gr_peak_detector_ii.cc
gr_peak_detector_ii.h
gr_peak_detector_ii.i
gr_peak_detector_sb.cc
gr_peak_detector_sb.h
gr_peak_detector_sb.i
gr_peak_detector_ss.cc
gr_peak_detector_ss.h
gr_peak_detector_ss.i
gr_prefix.cc
gr_sample_and_hold_bb.cc
gr_sample_and_hold_bb.h
gr_sample_and_hold_bb.i
gr_sample_and_hold_ff.cc
gr_sample_and_hold_ff.h
gr_sample_and_hold_ff.i
gr_sample_and_hold_ii.cc
gr_sample_and_hold_ii.h
gr_sample_and_hold_ii.i
gr_sample_and_hold_ss.cc
gr_sample_and_hold_ss.h
gr_sample_and_hold_ss.i
gr_sig_source_c.cc
gr_sig_source_c.h
gr_sig_source_c.i
gr_sig_source_f.cc
gr_sig_source_f.h
gr_sig_source_f.i
gr_sig_source_i.cc
gr_sig_source_i.h
gr_sig_source_i.i
gr_sig_source_s.cc
gr_sig_source_s.h
gr_sig_source_s.i
gr_sub_cc.cc
gr_sub_cc.h
gr_sub_cc.i
gr_sub_ff.cc
gr_sub_ff.h
gr_sub_ff.i
gr_sub_ii.cc
gr_sub_ii.h
gr_sub_ii.i
gr_sub_ss.cc
gr_sub_ss.h
gr_sub_ss.i
gr_unpacked_to_packed_bb.cc
gr_unpacked_to_packed_bb.h
gr_unpacked_to_packed_bb.i
gr_unpacked_to_packed_ii.cc
gr_unpacked_to_packed_ii.h
gr_unpacked_to_packed_ii.i
gr_unpacked_to_packed_ss.cc
gr_unpacked_to_packed_ss.h
gr_unpacked_to_packed_ss.i
gr_vector_sink_b.cc
gr_vector_sink_b.h
gr_vector_sink_b.i
gr_vector_sink_c.cc
gr_vector_sink_c.h
gr_vector_sink_c.i
gr_vector_sink_f.cc
gr_vector_sink_f.h
gr_vector_sink_f.i
gr_vector_sink_i.cc
gr_vector_sink_i.h
gr_vector_sink_i.i
gr_vector_sink_s.cc
gr_vector_sink_s.h
gr_vector_sink_s.i
gr_vector_source_b.cc
gr_vector_source_b.h
gr_vector_source_b.i
gr_vector_source_c.cc
gr_vector_source_c.h
gr_vector_source_c.i
gr_vector_source_f.cc
gr_vector_source_f.h
gr_vector_source_f.i
gr_vector_source_i.cc
gr_vector_source_i.h
gr_vector_source_i.i
gr_vector_source_s.cc
gr_vector_source_s.h
gr_vector_source_s.i
gr_xor_bb.cc
gr_xor_bb.h
gr_xor_bb.i
gr_xor_ii.cc
gr_xor_ii.h
gr_xor_ii.i
gr_xor_ss.cc
gr_xor_ss.h
gr_xor_ss.i
gr_moving_average_cc.cc
gr_moving_average_cc.h
gr_moving_average_cc.i
gr_moving_average_ff.cc
gr_moving_average_ff.h
gr_moving_average_ff.i
gr_moving_average_ss.cc
gr_moving_average_ss.h
gr_moving_average_ss.i
gr_moving_average_ii.cc
gr_moving_average_ii.h
gr_moving_average_ii.i
# --- end generated files ---

   + Makefile
Makefile.in
.la
.lo
.deps
.libs
*.la
*.lo
*.pyc
generate-stamp
GrFIRfilterCCC.cc
GrFIRfilterCCC.h
GrFIRfilterCCF.cc
GrFIRfilterCCF.h
GrFIRfilterFCC.cc
GrFIRfilterFCC.h
GrFIRfilterFFF.cc
GrFIRfilterFFF.h
GrFIRfilterFSF.cc
GrFIRfilterFSF.h
GrFIRfilterSCC.cc
GrFIRfilterSCC.h
GrFIRfilterSIS.cc
GrFIRfilterSIS.h
GrFreqXlatingFIRfilterCCC.cc
GrFreqXlatingFIRfilterCCC.h
GrFreqXlatingFIRfilterCCF.cc
GrFreqXlatingFIRfilterCCF.h
GrFreqXlatingFIRfilterFCC.cc
GrFreqXlatingFIRfilterFCC.h
GrFreqXlatingFIRfilterFCF.cc
GrFreqXlatingFIRfilterFCF.h
GrFreqXlatingFIRfilterSCC.cc
GrFreqXlatingFIRfilterSCC.h
GrFreqXlatingFIRfilterSCF.cc
GrFreqXlatingFIRfilterSCF.h
gr_fir_CCC.cc
gr_fir_CCC.h
gr_fir_CCC_generic.cc
gr_fir_CCC_generic.h
gr_fir_CCF.cc
gr_fir_CCF.h
gr_fir_CCF_generic.cc
gr_fir_CCF_generic.h
gr_fir_FCC.cc
gr_fir_FCC.h
gr_fir_FCC_generic.cc
gr_fir_FCC_generic.h
gr_fir_FFF.cc
gr_fir_FFF.h
gr_fir_FFF_generic.cc
gr_fir_FFF_generic.h
gr_fir_FSF.cc
gr_fir_FSF.h
gr_fir_FSF_generic.cc
gr_fir_FSF_generic.h
gr_fir_SCC.cc
gr_fir_SCC.h
gr_fir_SCC_generic.cc
gr_fir_SCC_generic.h
gr_fir_SIS.cc
gr_fir_SIS.h
gr_fir_SIS_generic.cc
gr_fir_SIS_generic.h
gr_fir_sysconfig.cc
gr_fir_sysconfig.h
gr_fir_sysconfig_generic.cc
gr_fir_sysconfig_generic.h
gr_fir_util.cc
gr_fir_util.h
GrFIRfilterCCC.i
GrFIRfilterCCF.i
GrFIRfilterFCC.i
GrFIRfilterFFF.i
GrFIRfilterFSF.i
GrFIRfilterSCC.i
GrFIRfilterSIS.i
GrFreqXlatingFIRfilterCCC.i
GrFreqXlatingFIRfilterCCF.i
GrFreqXlatingFIRfilterFCC.i
GrFreqXlatingFIRfilterFCF.i
GrFreqXlatingFIRfilterSCC.i
GrFreqXlatingFIRfilterSCF.i
# --- generated files ---
gr_add_cc.cc
gr_add_cc.h
gr_add_cc.i
gr_add_const_c.cc
gr_add_const_cc.cc
gr_add_const_cc.h
gr_add_const_cc.i
gr_add_const_c.h
gr_add_const_c.i
gr_add_const_f.cc
gr_add_const_ff.cc
gr_add_const_ff.h
gr_add_const_ff.i
gr_add_const_f.h
gr_add_const_f.i
gr_add_const_i.cc
gr_add_const_i.h
gr_add_const_i.i
gr_add_const_ii.cc
gr_add_const_ii.h
gr_add_const_ii.i
gr_add_const_s.cc
gr_add_const_sf.cc
gr_add_const_sf.h
gr_add_const_sf.i
gr_add_const_s.h
gr_add_const_s.i
gr_add_const_ss.cc
gr_add_const_ss.h
gr_add_const_ss.i
gr_add_const_vcc.cc
gr_add_const_vcc.h
gr_add_const_vcc.i
gr_add_const_vff.cc
gr_add_const_vff.h
gr_add_const_vff.i
gr_add_const_vii.cc
gr_add_const_vii.h
gr_add_const_vii.i
gr_add_const_vss.cc
gr_add_const_vss.h
gr_add_const_vss.i
gr_add_ff.cc
gr_add_ff.h
gr_add_ff.i
gr_add_ii.cc
gr_add_ii.h
gr_add_ii.i
gr_add_ss.cc
gr_add_ss.h
gr_add_ss.i
gr_add_vcc.cc
gr_add_vcc.h
gr_add_vcc.i
gr_add_vff.cc
gr_add_vff.h
gr_add_vff.i
gr_add_vii.cc
gr_add_vii.h
gr_add_vii.i
gr_add_vss.cc
gr_add_vss.h
gr_add_vss.i
gr_and_bb.cc
gr_and_bb.h
gr_and_bb.i
gr_and_ii.cc
gr_and_ii.h
gr_and_ii.i
gr_and_ss.cc
gr_and_ss.h
gr_and_ss.i
gr_argmax_fs.cc
gr_argmax_fs.h
gr_argmax_fs.i
gr_argmax_is.cc
gr_argmax_is.h
gr_argmax_is.i
gr_argmax_ss.cc
gr_argmax_ss.h
gr_argmax_ss.i
gr_chunks_to_symbols_bc.cc
gr_chunks_to_symbols_bc.h
gr_chunks_to_symbols_bc.i
gr_chunks_to_symbols_bf.cc
gr_chunks_to_symbols_bf.h
gr_chunks_to_symbols_bf.i
gr_chunks_to_symbols_ic.cc
gr_chunks_to_symbols_ic.h
gr_chunks_to_symbols_ic.i
gr_chunks_to_symbols_if.cc
gr_chunks_to_symbols_if.h
gr_chunks_to_symbols_if.i
gr_chunks_to_symbols_sc.cc
gr_chunks_to_symbols_sc.h
gr_chunks_to_symbols_sc.i
gr_chunks_to_symbols_sf.cc
gr_chunks_to_symbols_sf.h
gr_chunks_to_symbols_sf.i
gr_divide_cc.cc
gr_divide_cc.h
gr_divide_cc.i
gr_divide_ff.cc
gr_divide_ff.h
gr_divide_ff.i
gr_divide_ii.cc
gr_divide_ii.h
gr_divide_ii.i
gr_divide_ss.cc
gr_divide_ss.h
gr_divide_ss.i
gr_integrate_cc.cc
gr_integrate_cc.h
gr_integrate_cc.i
gr_integrate_ff.cc
gr_integrate_ff.h
gr_integrate_ff.i
gr_integrate_ii.cc
gr_integrate_ii.h
gr_integrate_ii.i
gr_integrate_ss.cc
gr_integrate_ss.h
gr_integrate_ss.i
gr_max_ff.cc
gr_max_ff.h
gr_max_ff.i
gr_max_ii.cc
gr_max_ii.h
gr_max_ii.i
gr_max_ss.cc
gr_max_ss.h
gr_max_ss.i
gr_multiply_cc.cc
gr_multiply_cc.h
gr_multiply_cc.i
gr_multiply_const_cc.cc
gr_multiply_const_cc.h
gr_multiply_const_cc.i
gr_multiply_const_ff.cc
gr_multiply_const_ff.h
gr_multiply_const_ff.i
gr_multiply_const_ii.cc
gr_multiply_const_ii.h
gr_multiply_const_ii.i
gr_multiply_const_ss.cc
gr_multiply_const_ss.h
gr_multiply_const_ss.i
gr_multiply_const_vcc.cc
gr_multiply_const_vcc.h
gr_multiply_const_vcc.i
gr_multiply_const_vff.cc
gr_multiply_const_vff.h
gr_multiply_const_vff.i
gr_multiply_const_vii.cc
gr_multiply_const_vii.h
gr_multiply_const_vii.i
gr_multiply_const_vss.cc
gr_multiply_const_vss.h
gr_multiply_const_vss.i
gr_multiply_ff.cc
gr_multiply_ff.h
gr_multiply_ff.i
gr_multiply_ii.cc
gr_multiply_ii.h
gr_multiply_ii.i
gr_multiply_ss.cc
gr_multiply_ss.h
gr_multiply_ss.i
gr_multiply_vcc.cc
gr_multiply_vcc.h
gr_multiply_vcc.i
gr_multiply_vff.cc
gr_multiply_vff.h
gr_multiply_vff.i
gr_multiply_vii.cc
gr_multiply_vii.h
gr_multiply_vii.i
gr_multiply_vss.cc
gr_multiply_vss.h
gr_multiply_vss.i
gr_mute_cc.cc
gr_mute_cc.h
gr_mute_cc.i
gr_mute_ff.cc
gr_mute_ff.h
gr_mute_ff.i
gr_mute_ii.cc
gr_mute_ii.h
gr_mute_ii.i
gr_mute_ss.cc
gr_mute_ss.h
gr_mute_ss.i
gr_noise_source_c.cc
gr_noise_source_c.h
gr_noise_source_c.i
gr_noise_source_f.cc
gr_noise_source_f.h
gr_noise_source_f.i
gr_noise_source_i.cc
gr_noise_source_i.h
gr_noise_source_i.i
gr_noise_source_s.cc
gr_noise_source_s.h
gr_noise_source_s.i
gr_not_bb.cc
gr_not_bb.h
gr_not_bb.i
gr_not_ii.cc
gr_not_ii.h
gr_not_ii.i
gr_not_ss.cc
gr_not_ss.h
gr_not_ss.i
gr_or_bb.cc
gr_or_bb.h
gr_or_bb.i
gr_or_ii.cc
gr_or_ii.h
gr_or_ii.i
gr_or_ss.cc
gr_or_ss.h
gr_or_ss.i
gr_packed_to_unpacked_bb.cc
gr_packed_to_unpacked_bb.h
gr_packed_to_unpacked_bb.i
gr_packed_to_unpacked_ii.cc
gr_packed_to_unpacked_ii.h
gr_packed_to_unpacked_ii.i
gr_packed_to_unpacked_ss.cc
gr_packed_to_unpacked_ss.h
gr_packed_to_unpacked_ss.i
gr_peak_detector_fb.cc
gr_peak_detector_fb.h
gr_peak_detector_fb.i
gr_peak_detector_ff.cc
gr_peak_detector_ff.h
gr_peak_detector_ff.i
gr_peak_detector_ib.cc
gr_peak_detector_ib.h
gr_peak_detector_ib.i
gr_peak_detector_ii.cc
gr_peak_detector_ii.h
gr_peak_detector_ii.i
gr_peak_detector_sb.cc
gr_peak_detector_sb.h
gr_peak_detector_sb.i
gr_peak_detector_ss.cc
gr_peak_detector_ss.h
gr_peak_detector_ss.i
gr_prefix.cc
gr_sample_and_hold_bb.cc
gr_sample_and_hold_bb.h
gr_sample_and_hold_bb.i
gr_sample_and_hold_ff.cc
gr_sample_and_hold_ff.h
gr_sample_and_hold_ff.i
gr_sample_and_hold_ii.cc
gr_sample_and_hold_ii.h
gr_sample_and_hold_ii.i
gr_sample_and_hold_ss.cc
gr_sample_and_hold_ss.h
gr_sample_and_hold_ss.i
gr_sig_source_c.cc
gr_sig_source_c.h
gr_sig_source_c.i
gr_sig_source_f.cc
gr_sig_source_f.h
gr_sig_source_f.i
gr_sig_source_i.cc
gr_sig_source_i.h
gr_sig_source_i.i
gr_sig_source_s.cc
gr_sig_source_s.h
gr_sig_source_s.i
gr_sub_cc.cc
gr_sub_cc.h
gr_sub_cc.i
gr_sub_ff.cc
gr_sub_ff.h
gr_sub_ff.i
gr_sub_ii.cc
gr_sub_ii.h
gr_sub_ii.i
gr_sub_ss.cc
gr_sub_ss.h
gr_sub_ss.i
gr_unpacked_to_packed_bb.cc
gr_unpacked_to_packed_bb.h
gr_unpacked_to_packed_bb.i
gr_unpacked_to_packed_ii.cc
gr_unpacked_to_packed_ii.h
gr_unpacked_to_packed_ii.i
gr_unpacked_to_packed_ss.cc
gr_unpacked_to_packed_ss.h
gr_unpacked_to_packed_ss.i
gr_vector_sink_b.cc
gr_vector_sink_b.h
gr_vector_sink_b.i
gr_vector_sink_c.cc
gr_vector_sink_c.h
gr_vector_sink_c.i
gr_vector_sink_f.cc
gr_vector_sink_f.h
gr_vector_sink_f.i
gr_vector_sink_i.cc
gr_vector_sink_i.h
gr_vector_sink_i.i
gr_vector_sink_s.cc
gr_vector_sink_s.h
gr_vector_sink_s.i
gr_vector_source_b.cc
gr_vector_source_b.h
gr_vector_source_b.i
gr_vector_source_c.cc
gr_vector_source_c.h
gr_vector_source_c.i
gr_vector_source_f.cc
gr_vector_source_f.h
gr_vector_source_f.i
gr_vector_source_i.cc
gr_vector_source_i.h
gr_vector_source_i.i
gr_vector_source_s.cc
gr_vector_source_s.h
gr_vector_source_s.i
gr_xor_bb.cc
gr_xor_bb.h
gr_xor_bb.i
gr_xor_ii.cc
gr_xor_ii.h
gr_xor_ii.i
gr_xor_ss.cc
gr_xor_ss.h
gr_xor_ss.i
gr_moving_average_cc.cc
gr_moving_average_cc.h
gr_moving_average_cc.i
gr_moving_average_ff.cc
gr_moving_average_ff.h
gr_moving_average_ff.i
gr_moving_average_ss.cc
gr_moving_average_ss.h
gr_moving_average_ss.i
gr_moving_average_ii.cc
gr_moving_average_ii.h
gr_moving_average_ii.i
gr_and_const_bb.cc
gr_and_const_ss.h
gr_and_const_ss.i
gr_and_const_ii.cc
gr_and_const_bb.h
gr_and_const_ss.cc
gr_and_const_bb.i
gr_and_const_ii.h
gr_and_const_ii.i
# --- end generated files ---


Modified: 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/gengen/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.2/gnuradio-core/src/lib/gengen/Makefile.am     
2009-03-15 19:19:48 UTC (rev 10611)
+++ gnuradio/branches/releases/3.2/gnuradio-core/src/lib/gengen/Makefile.am     
2009-03-15 19:28:53 UTC (rev 10612)
@@ -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/branches/releases/3.2/gnuradio-core/src/lib/gengen/Makefile.gen
===================================================================
--- gnuradio/branches/releases/3.2/gnuradio-core/src/lib/gengen/Makefile.gen    
2009-03-15 19:19:48 UTC (rev 10611)
+++ gnuradio/branches/releases/3.2/gnuradio-core/src/lib/gengen/Makefile.gen    
2009-03-15 19:28:53 UTC (rev 10612)
@@ -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/branches/releases/3.2/gnuradio-core/src/lib/gengen/generate_common.py
===================================================================
--- 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/gengen/generate_common.py  
    2009-03-15 19:19:48 UTC (rev 10611)
+++ 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/gengen/generate_common.py  
    2009-03-15 19:28:53 UTC (rev 10612)
@@ -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/branches/releases/3.2/gnuradio-core/src/lib/gengen/gengen_generated.i
===================================================================
--- 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/gengen/gengen_generated.i  
    2009-03-15 19:19:48 UTC (rev 10611)
+++ 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/gengen/gengen_generated.i  
    2009-03-15 19:28:53 UTC (rev 10612)
@@ -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/branches/releases/3.2/gnuradio-core/src/lib/gengen/gr_and_const_XX.cc.t
 (from rev 10551, 
gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_and_const_XX.cc.t)
===================================================================
--- 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/gengen/gr_and_const_XX.cc.t
                            (rev 0)
+++ 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/gengen/gr_and_const_XX.cc.t
    2009-03-15 19:28:53 UTC (rev 10612)
@@ -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/branches/releases/3.2/gnuradio-core/src/lib/gengen/gr_and_const_XX.h.t 
(from rev 10551, 
gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_and_const_XX.h.t)
===================================================================
--- 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/gengen/gr_and_const_XX.h.t 
                            (rev 0)
+++ 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/gengen/gr_and_const_XX.h.t 
    2009-03-15 19:28:53 UTC (rev 10612)
@@ -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/branches/releases/3.2/gnuradio-core/src/lib/gengen/gr_and_const_XX.i.t 
(from rev 10551, 
gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_and_const_XX.i.t)
===================================================================
--- 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/gengen/gr_and_const_XX.i.t 
                            (rev 0)
+++ 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/gengen/gr_and_const_XX.i.t 
    2009-03-15 19:28:53 UTC (rev 10612)
@@ -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/branches/releases/3.2/gr-gpio/src/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.2/gr-gpio/src/Makefile.am      2009-03-15 
19:19:48 UTC (rev 10611)
+++ gnuradio/branches/releases/3.2/gr-gpio/src/Makefile.am      2009-03-15 
19:28:53 UTC (rev 10612)
@@ -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/branches/releases/3.2/gr-gpio/src/python/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.2/gr-gpio/src/python/Makefile.am       
2009-03-15 19:19:48 UTC (rev 10611)
+++ gnuradio/branches/releases/3.2/gr-gpio/src/python/Makefile.am       
2009-03-15 19:28:53 UTC (rev 10612)
@@ -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/branches/releases/3.2/gr-gpio/src/python/gpio_rx_sfile.py
===================================================================
--- gnuradio/branches/releases/3.2/gr-gpio/src/python/gpio_rx_sfile.py  
2009-03-15 19:19:48 UTC (rev 10611)
+++ gnuradio/branches/releases/3.2/gr-gpio/src/python/gpio_rx_sfile.py  
2009-03-15 19:28:53 UTC (rev 10612)
@@ -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/branches/releases/3.2/gr-gpio/src/python/gpio_usrp_fft.py
===================================================================
--- gnuradio/branches/releases/3.2/gr-gpio/src/python/gpio_usrp_fft.py  
2009-03-15 19:19:48 UTC (rev 10611)
+++ gnuradio/branches/releases/3.2/gr-gpio/src/python/gpio_usrp_fft.py  
2009-03-15 19:28:53 UTC (rev 10612)
@@ -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)





reply via email to

[Prev in Thread] Current Thread [Next in Thread]