summaryrefslogtreecommitdiff
path: root/gr-uhd/examples/python
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2013-02-13 13:08:50 -0500
committerTom Rondeau <trondeau@vt.edu>2013-02-13 13:08:50 -0500
commit2f21865e7650b72caab1dc31a6129f8b0d2f9abb (patch)
treea7f72a245bd0c5814a123b37323f475c47869efe /gr-uhd/examples/python
parent54a850f1612537e6cd5a7e7d415bc28b959cb295 (diff)
parentc1e4886a82670e30c5e6dbec70f8e068a14fb341 (diff)
Merge remote-tracking branch 'm0mik/m_misc_updates'
Diffstat (limited to 'gr-uhd/examples/python')
-rwxr-xr-xgr-uhd/examples/python/usrp_am_mw_rcv.py8
-rwxr-xr-xgr-uhd/examples/python/usrp_nbfm_ptt.py6
-rwxr-xr-xgr-uhd/examples/python/usrp_nbfm_rcv.py2
-rwxr-xr-xgr-uhd/examples/python/usrp_wfm_rcv.py2
-rwxr-xr-xgr-uhd/examples/python/usrp_wfm_rcv2_nogui.py2
-rwxr-xr-xgr-uhd/examples/python/usrp_wfm_rcv_fmdet.py2
-rwxr-xr-xgr-uhd/examples/python/usrp_wfm_rcv_nogui.py2
-rwxr-xr-xgr-uhd/examples/python/usrp_wfm_rcv_pll.py2
-rwxr-xr-xgr-uhd/examples/python/usrp_wfm_rcv_sca.py2
-rwxr-xr-xgr-uhd/examples/python/usrp_wxapt_rcv.py2
10 files changed, 14 insertions, 16 deletions
diff --git a/gr-uhd/examples/python/usrp_am_mw_rcv.py b/gr-uhd/examples/python/usrp_am_mw_rcv.py
index 28262f2bd5..02863b32fd 100755
--- a/gr-uhd/examples/python/usrp_am_mw_rcv.py
+++ b/gr-uhd/examples/python/usrp_am_mw_rcv.py
@@ -53,7 +53,7 @@ class wfm_rx_block (stdgui2.std_top_block):
help="set gain in dB (default is maximum)")
parser.add_option("-V", "--volume", type="eng_float", default=None,
help="set volume (default is midpoint)")
- parser.add_option("-O", "--audio-output", type="string", default="",
+ parser.add_option("-O", "--audio-output", type="string", default="default",
help="pcm device name. E.g., hw:0,0 or surround51 or /dev/dsp")
(options, args) = parser.parse_args()
@@ -138,10 +138,8 @@ class wfm_rx_block (stdgui2.std_top_block):
if options.gain is None:
g = self.u.get_gain_range()
- if True:
- # if no gain was specified, use the mid gain
- options.gain = (g.start() + g.stop())/2.0
- options.gain = g.stop()
+ # if no gain was specified, use the mid gain
+ options.gain = (g.start() + g.stop())/2.0
if options.volume is None:
v = self.volume_range()
diff --git a/gr-uhd/examples/python/usrp_nbfm_ptt.py b/gr-uhd/examples/python/usrp_nbfm_ptt.py
index 8d26e656e1..791b8cb990 100755
--- a/gr-uhd/examples/python/usrp_nbfm_ptt.py
+++ b/gr-uhd/examples/python/usrp_nbfm_ptt.py
@@ -59,9 +59,9 @@ class ptt_block(stdgui2.std_top_block):
help="set rx gain [default=midpoint in dB]")
parser.add_option ("", "--tx-gain", type="eng_float", default=None,
help="set tx gain [default=midpoint in dB]")
- parser.add_option("-I", "--audio-input", type="string", default="",
+ parser.add_option("-I", "--audio-input", type="string", default="default",
help="pcm input device name. E.g., hw:0,0 or /dev/dsp")
- parser.add_option("-O", "--audio-output", type="string", default="",
+ parser.add_option("-O", "--audio-output", type="string", default="default",
help="pcm output device name. E.g., hw:0,0 or /dev/dsp")
parser.add_option ("-N", "--no-gui", action="store_true", default=False)
(options, args) = parser.parse_args ()
@@ -369,7 +369,7 @@ class transmit_path(gr.hier_block2):
# ////////////////////////////////////////////////////////////////////////
class receive_path(gr.hier_block2):
- def __init__(self, args, gain, audio_output):
+ def __init__(self, args, spec, antenna, gain, audio_output):
gr.hier_block2.__init__(self, "receive_path",
gr.io_signature(0, 0, 0), # Input signature
gr.io_signature(0, 0, 0)) # Output signature
diff --git a/gr-uhd/examples/python/usrp_nbfm_rcv.py b/gr-uhd/examples/python/usrp_nbfm_rcv.py
index 571abe8c90..be890f02d8 100755
--- a/gr-uhd/examples/python/usrp_nbfm_rcv.py
+++ b/gr-uhd/examples/python/usrp_nbfm_rcv.py
@@ -50,7 +50,7 @@ class my_top_block (stdgui2.std_top_block):
help="set gain in dB (default is midpoint)")
parser.add_option("-V", "--volume", type="eng_float", default=None,
help="set volume (default is midpoint)")
- parser.add_option("-O", "--audio-output", type="string", default="",
+ parser.add_option("-O", "--audio-output", type="string", default="default",
help="pcm device name. E.g., hw:0,0 or surround51 or /dev/dsp")
parser.add_option("-N", "--no-gui", action="store_true", default=False)
diff --git a/gr-uhd/examples/python/usrp_wfm_rcv.py b/gr-uhd/examples/python/usrp_wfm_rcv.py
index bbb5990337..9004469fcb 100755
--- a/gr-uhd/examples/python/usrp_wfm_rcv.py
+++ b/gr-uhd/examples/python/usrp_wfm_rcv.py
@@ -46,7 +46,7 @@ class wfm_rx_block (stdgui2.std_top_block):
help="set gain in dB (default is midpoint)")
parser.add_option("-V", "--volume", type="eng_float", default=None,
help="set volume (default is midpoint)")
- parser.add_option("-O", "--audio-output", type="string", default="",
+ parser.add_option("-O", "--audio-output", type="string", default="default",
help="pcm device name. E.g., hw:0,0 or surround51 or /dev/dsp")
parser.add_option("", "--freq-min", type="eng_float", default=87.9e6,
help="Set a minimum frequency [default=%default]")
diff --git a/gr-uhd/examples/python/usrp_wfm_rcv2_nogui.py b/gr-uhd/examples/python/usrp_wfm_rcv2_nogui.py
index f7e72ae6f9..dd4190b6df 100755
--- a/gr-uhd/examples/python/usrp_wfm_rcv2_nogui.py
+++ b/gr-uhd/examples/python/usrp_wfm_rcv2_nogui.py
@@ -44,7 +44,7 @@ class wfm_rx_block (gr.top_block):
help="set 2nd station freq to FREQ", metavar="FREQ")
parser.add_option("-g", "--gain", type="eng_float", default=40,
help="set gain in dB (default is midpoint)")
- parser.add_option("-O", "--audio-output", type="string", default="",
+ parser.add_option("-O", "--audio-output", type="string", default="default",
help="pcm device name. E.g., hw:0,0 or surround51 or /dev/dsp")
parser.add_option("", "--freq-min", type="eng_float", default=87.9e6,
help="Set a minimum frequency [default=%default]")
diff --git a/gr-uhd/examples/python/usrp_wfm_rcv_fmdet.py b/gr-uhd/examples/python/usrp_wfm_rcv_fmdet.py
index 514bd4faf7..154f2456e1 100755
--- a/gr-uhd/examples/python/usrp_wfm_rcv_fmdet.py
+++ b/gr-uhd/examples/python/usrp_wfm_rcv_fmdet.py
@@ -47,7 +47,7 @@ class wfm_rx_block (stdgui2.std_top_block):
help="set squelch level (default is 0)")
parser.add_option("-V", "--volume", type="eng_float", default=None,
help="set volume (default is midpoint)")
- parser.add_option("-O", "--audio-output", type="string", default="",
+ parser.add_option("-O", "--audio-output", type="string", default="default",
help="pcm device name. E.g., hw:0,0 or surround51 or /dev/dsp")
parser.add_option("", "--freq-min", type="eng_float", default=87.9e6,
help="Set a minimum frequency [default=%default]")
diff --git a/gr-uhd/examples/python/usrp_wfm_rcv_nogui.py b/gr-uhd/examples/python/usrp_wfm_rcv_nogui.py
index 7d042983ef..9a7558dc77 100755
--- a/gr-uhd/examples/python/usrp_wfm_rcv_nogui.py
+++ b/gr-uhd/examples/python/usrp_wfm_rcv_nogui.py
@@ -44,7 +44,7 @@ class wfm_rx_block (gr.top_block):
help="set gain in dB (default is midpoint)")
parser.add_option("-V", "--volume", type="eng_float", default=None,
help="set volume (default is midpoint)")
- parser.add_option("-O", "--audio-output", type="string", default="",
+ parser.add_option("-O", "--audio-output", type="string", default="default",
help="pcm device name. E.g., hw:0,0 or surround51 or /dev/dsp")
parser.add_option("", "--freq-min", type="eng_float", default=87.9e6,
help="Set a minimum frequency [default=%default]")
diff --git a/gr-uhd/examples/python/usrp_wfm_rcv_pll.py b/gr-uhd/examples/python/usrp_wfm_rcv_pll.py
index 53b1e6feac..8cdabe87ae 100755
--- a/gr-uhd/examples/python/usrp_wfm_rcv_pll.py
+++ b/gr-uhd/examples/python/usrp_wfm_rcv_pll.py
@@ -48,7 +48,7 @@ class wfm_rx_block (stdgui2.std_top_block):
help="set squelch level (default is 0)")
parser.add_option("-V", "--volume", type="eng_float", default=None,
help="set volume (default is midpoint)")
- parser.add_option("-O", "--audio-output", type="string", default="",
+ parser.add_option("-O", "--audio-output", type="string", default="default",
help="pcm device name. E.g., hw:0,0 or surround51 or /dev/dsp")
parser.add_option("", "--freq-min", type="eng_float", default=87.9e6,
help="Set a minimum frequency [default=%default]")
diff --git a/gr-uhd/examples/python/usrp_wfm_rcv_sca.py b/gr-uhd/examples/python/usrp_wfm_rcv_sca.py
index 646fe85870..f8ae778a9b 100755
--- a/gr-uhd/examples/python/usrp_wfm_rcv_sca.py
+++ b/gr-uhd/examples/python/usrp_wfm_rcv_sca.py
@@ -76,7 +76,7 @@ class wfm_rx_sca_block (stdgui2.std_top_block):
help="set gain in dB (default is midpoint)")
parser.add_option("-V", "--volume", type="eng_float", default=None,
help="set volume (default is midpoint)")
- parser.add_option("-O", "--audio-output", type="string", default="",
+ parser.add_option("-O", "--audio-output", type="string", default="default",
help="pcm device name. E.g., hw:0,0 or surround51 or /dev/dsp")
parser.add_option("", "--freq-min", type="eng_float", default=87.9e6,
help="Set a minimum frequency [default=%default]")
diff --git a/gr-uhd/examples/python/usrp_wxapt_rcv.py b/gr-uhd/examples/python/usrp_wxapt_rcv.py
index 6b57de3bcf..aaf297089e 100755
--- a/gr-uhd/examples/python/usrp_wxapt_rcv.py
+++ b/gr-uhd/examples/python/usrp_wxapt_rcv.py
@@ -46,7 +46,7 @@ class wxapt_rx_block (stdgui2.std_top_block):
help="set gain in dB (default is midpoint)")
parser.add_option("-V", "--volume", type="eng_float", default=None,
help="set volume (default is midpoint)")
- parser.add_option("-O", "--audio-output", type="string", default="",
+ parser.add_option("-O", "--audio-output", type="string", default="default",
help="pcm device name. E.g., hw:0,0 or surround51 or /dev/dsp")
parser.add_option("", "--freq-min", type="eng_float", default=137e6,
help="Set a minimum frequency [default=%default]")
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-25 20:05:14 +0000