diff options
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_keep_one_in_n.cc | 9 | ||||
| -rw-r--r-- | gr-uhd/grc/gen_uhd_usrp_blocks.py | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc b/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc index 85495e277..e38240a3f 100644 --- a/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc +++ b/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2010 Free Software Foundation, Inc. + * Copyright 2004 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -31,16 +31,15 @@ gr_keep_one_in_n_sptr gr_make_keep_one_in_n (size_t item_size, int n) { - return gnuradio::get_initial_sptr(new gr_keep_one_in_n (item_size, n)); + return gr_keep_one_in_n_sptr (new gr_keep_one_in_n (item_size, n)); } gr_keep_one_in_n::gr_keep_one_in_n (size_t item_size, int n) : gr_block ("keep_one_in_n", gr_make_io_signature (1, 1, item_size), gr_make_io_signature (1, 1, item_size)), - d_count(n) + d_n (n), d_count(n) { - set_n(n); } void @@ -51,8 +50,6 @@ gr_keep_one_in_n::set_n(int n) d_n = n; d_count = n; - - set_relative_rate(1.0 / (float)n); } int diff --git a/gr-uhd/grc/gen_uhd_usrp_blocks.py b/gr-uhd/grc/gen_uhd_usrp_blocks.py index 831d69fc4..8596e14a6 100644 --- a/gr-uhd/grc/gen_uhd_usrp_blocks.py +++ b/gr-uhd/grc/gen_uhd_usrp_blocks.py @@ -65,7 +65,7 @@ self.\$(id).set_bandwidth(\$bw$(n), $n) <callback>set_bandwidth(\$bw$(n), $n)</callback> #end for <param> - <name>Input Type</name> + <name>$(direction.title())put Type</name> <key>type</key> <type>enum</type> <option> @@ -140,6 +140,7 @@ self.\$(id).set_bandwidth(\$bw$(n), $n) <key>num_mboards</key> <value>1</value> <type>int</type> + <hide>part</hide> #for $m in range(1, $max_mboards+1) <option> <name>$(m)</name> |