diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-06-28 11:39:32 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-06-28 11:39:32 -0700 |
| commit | 229dbd0aab5f2ef6819773f79eb17cdc8f27773a (patch) | |
| tree | b81361d68eebbf7fbeecb435d88f9750a47b872f /gr-uhd | |
| parent | 45cbe43da3317d9c872672553185d36c5cdf59bd (diff) | |
| parent | e8e6ab08a7f943db17666bef4c49f8a4aef3b60f (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gr-uhd')
| -rw-r--r-- | gr-uhd/apps/hf_radio/input.py | 2 | ||||
| -rwxr-xr-x | gr-uhd/apps/hf_radio/radio.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gr-uhd/apps/hf_radio/input.py b/gr-uhd/apps/hf_radio/input.py index fd2ac47a5c..49df347e8b 100644 --- a/gr-uhd/apps/hf_radio/input.py +++ b/gr-uhd/apps/hf_radio/input.py @@ -65,6 +65,7 @@ class uhd_input(gr.hier_block2): self.gain = gain self.src.set_gain(gain, 0) + @staticmethod def add_options(parser): parser.add_option("-a", "--address", type="string", default="addr=192.168.10.2", @@ -75,4 +76,3 @@ class uhd_input(gr.hier_block2): help="set frequency to FREQ", metavar="FREQ") parser.add_option("-g", "--gain", type="eng_float", default=None, help="set gain in dB (default is midpoint)") - add_options = staticmethod(add_options) diff --git a/gr-uhd/apps/hf_radio/radio.py b/gr-uhd/apps/hf_radio/radio.py index bbe2bfddb6..970ec01a38 100755 --- a/gr-uhd/apps/hf_radio/radio.py +++ b/gr-uhd/apps/hf_radio/radio.py @@ -31,7 +31,7 @@ import wx import wx.lib.evtmgr as em import time -from gnuradio import gr, gru, eng_notation, optfir +from gnuradio import gr, gru, eng_notation from gnuradio import audio from gnuradio import blocks from gnuradio import uhd |