summaryrefslogtreecommitdiff
path: root/gnuradio-core/src
diff options
context:
space:
mode:
Diffstat (limited to 'gnuradio-core/src')
-rw-r--r--gnuradio-core/src/lib/io/Makefile.am6
-rw-r--r--gnuradio-core/src/lib/io/gr_udp_sink.cc2
-rw-r--r--gnuradio-core/src/lib/io/gr_udp_sink.h2
-rw-r--r--gnuradio-core/src/lib/io/gr_udp_sink.i2
-rw-r--r--gnuradio-core/src/lib/io/gr_udp_source.cc2
-rw-r--r--gnuradio-core/src/lib/io/gr_udp_source.h2
-rw-r--r--gnuradio-core/src/lib/io/gr_udp_source.i2
-rw-r--r--gnuradio-core/src/python/gnuradio/blksimpl/nbfm_tx.py15
8 files changed, 19 insertions, 14 deletions
diff --git a/gnuradio-core/src/lib/io/Makefile.am b/gnuradio-core/src/lib/io/Makefile.am
index 6891f3807..8320375c7 100644
--- a/gnuradio-core/src/lib/io/Makefile.am
+++ b/gnuradio-core/src/lib/io/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2001,2003,2004 Free Software Foundation, Inc.
+# Copyright 2001,2003,2004,2006 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -79,7 +79,9 @@ grinclude_HEADERS = \
microtune_xxxx_eval_board.h \
ppio.h \
ppio_ppdev.h \
- sdr_1000.h
+ sdr_1000.h \
+ gr_udp_sink.h \
+ gr_udp_source.h
swiginclude_HEADERS = \
diff --git a/gnuradio-core/src/lib/io/gr_udp_sink.cc b/gnuradio-core/src/lib/io/gr_udp_sink.cc
index f5eefdc73..a664615f1 100644
--- a/gnuradio-core/src/lib/io/gr_udp_sink.cc
+++ b/gnuradio-core/src/lib/io/gr_udp_sink.cc
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2006 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
diff --git a/gnuradio-core/src/lib/io/gr_udp_sink.h b/gnuradio-core/src/lib/io/gr_udp_sink.h
index f3ededa52..ee346f40c 100644
--- a/gnuradio-core/src/lib/io/gr_udp_sink.h
+++ b/gnuradio-core/src/lib/io/gr_udp_sink.h
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2006 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
diff --git a/gnuradio-core/src/lib/io/gr_udp_sink.i b/gnuradio-core/src/lib/io/gr_udp_sink.i
index 59c828dd6..bd4accb3e 100644
--- a/gnuradio-core/src/lib/io/gr_udp_sink.i
+++ b/gnuradio-core/src/lib/io/gr_udp_sink.i
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2006 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
diff --git a/gnuradio-core/src/lib/io/gr_udp_source.cc b/gnuradio-core/src/lib/io/gr_udp_source.cc
index 426830924..70b2f8f98 100644
--- a/gnuradio-core/src/lib/io/gr_udp_source.cc
+++ b/gnuradio-core/src/lib/io/gr_udp_source.cc
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2004,2006 Free Software Foundation, Inc.
+ * Copyright 2006 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
diff --git a/gnuradio-core/src/lib/io/gr_udp_source.h b/gnuradio-core/src/lib/io/gr_udp_source.h
index 162eef7d6..c57f4fc8f 100644
--- a/gnuradio-core/src/lib/io/gr_udp_source.h
+++ b/gnuradio-core/src/lib/io/gr_udp_source.h
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2006 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
diff --git a/gnuradio-core/src/lib/io/gr_udp_source.i b/gnuradio-core/src/lib/io/gr_udp_source.i
index e1e9c2023..1d6f4c904 100644
--- a/gnuradio-core/src/lib/io/gr_udp_source.i
+++ b/gnuradio-core/src/lib/io/gr_udp_source.i
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2006 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
diff --git a/gnuradio-core/src/python/gnuradio/blksimpl/nbfm_tx.py b/gnuradio-core/src/python/gnuradio/blksimpl/nbfm_tx.py
index 15c7bbbb4..47dc4d46a 100644
--- a/gnuradio-core/src/python/gnuradio/blksimpl/nbfm_tx.py
+++ b/gnuradio-core/src/python/gnuradio/blksimpl/nbfm_tx.py
@@ -58,13 +58,16 @@ class nbfm_tx(gr.hier_block):
if do_interp:
interp_factor = quad_rate / audio_rate
- interp_taps = optfir.low_pass (interp_factor, # gain
- quad_rate, # Fs
- 4500, # passband cutoff
- 7000, # stopband cutoff
- 0.1, # passband ripple dB
- 40) # stopband atten dB
+ if 0:
+ interp_taps = optfir.low_pass (interp_factor, # gain
+ quad_rate, # Fs
+ 4500, # passband cutoff
+ 7000, # stopband cutoff
+ 0.1, # passband ripple dB
+ 40) # stopband atten dB
+ else:
+ interp_taps = gr.firdes.low_pass(interp_factor, quad_rate, 10e3, 8e3)
#print "len(interp_taps) =", len(interp_taps)
self.interpolator = gr.interp_fir_filter_fff (interp_factor, interp_taps)