summaryrefslogtreecommitdiff
path: root/gr-digital
diff options
context:
space:
mode:
authorTom Rondeau2011-09-30 12:30:07 -0400
committerTom Rondeau2011-09-30 12:30:07 -0400
commitde4405ab0d8f6c423baadc15ab7d9fa11b6898c4 (patch)
tree1cf035c351ede8ec6726f227168e285bab098ef0 /gr-digital
parent3e8c3125da6234c4d1f8c0eaf869bc86923cb292 (diff)
downloadgnuradio-de4405ab0d8f6c423baadc15ab7d9fa11b6898c4.tar.gz
gnuradio-de4405ab0d8f6c423baadc15ab7d9fa11b6898c4.tar.bz2
gnuradio-de4405ab0d8f6c423baadc15ab7d9fa11b6898c4.zip
digital: modified generic_mod_demod so mod and demods have same options in the same order.
Diffstat (limited to 'gr-digital')
-rw-r--r--gr-digital/examples/uhd_interface.py3
-rw-r--r--gr-digital/python/generic_mod_demod.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/gr-digital/examples/uhd_interface.py b/gr-digital/examples/uhd_interface.py
index 3e2162ba3..a01648715 100644
--- a/gr-digital/examples/uhd_interface.py
+++ b/gr-digital/examples/uhd_interface.py
@@ -197,7 +197,8 @@ class uhd_receiver(uhd_interface, gr.hier_block2):
metavar="FREQ")
parser.add_option("", "--rx-gain", type="eng_float", default=None,
help="set receive gain in dB (default is midpoint)")
- parser.add_option("-v", "--verbose", action="store_true", default=False)
+ if not parser.has_option("--verbose"):
+ parser.add_option("-v", "--verbose", action="store_true", default=False)
# Make a static method to call before instantiation
add_options = staticmethod(add_options)
diff --git a/gr-digital/python/generic_mod_demod.py b/gr-digital/python/generic_mod_demod.py
index dc69fc0b5..dec96e455 100644
--- a/gr-digital/python/generic_mod_demod.py
+++ b/gr-digital/python/generic_mod_demod.py
@@ -76,8 +76,8 @@ def add_common_options(parser):
class generic_mod(gr.hier_block2):
def __init__(self, constellation,
- differential=_def_differential,
samples_per_symbol=_def_samples_per_symbol,
+ differential=_def_differential,
excess_bw=_def_excess_bw,
gray_coded=True,
verbose=_def_verbose,