diff options
| author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-02-23 02:08:43 +0000 |
|---|---|---|
| committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-02-23 02:08:43 +0000 |
| commit | 98dca512c2fdfbed0f9db14bc07fe5c2ed58b83b (patch) | |
| tree | 6c0576c724b8300838f9bd8244e0f7ece1818fdb /gr-utils | |
| parent | 09ce7710430c32b09f549eda728e711e41e8f3a6 (diff) | |
Cleanup, changed ifc_name() to interface_name()
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10477 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-utils')
| -rwxr-xr-x | gr-utils/src/python/usrp2_siggen.py | 15 | ||||
| -rwxr-xr-x | gr-utils/src/python/usrp2_siggen_gui.py | 4 |
2 files changed, 6 insertions, 13 deletions
diff --git a/gr-utils/src/python/usrp2_siggen.py b/gr-utils/src/python/usrp2_siggen.py index 71f12cf4af..9ade933c7c 100755 --- a/gr-utils/src/python/usrp2_siggen.py +++ b/gr-utils/src/python/usrp2_siggen.py @@ -60,8 +60,7 @@ class top_block(gr.top_block): self.set_amplitude(options.amplitude) self.set_waveform_freq(options.waveform_freq) - #self.set_waveform2_freq(options.waveform2_freq) - self._waveform2_freq = options.waveform2_freq + self.set_waveform2_freq(options.waveform2_freq) self.set_waveform(options.type) def set_usrp2(self, interface, mac_addr): @@ -282,14 +281,11 @@ class top_block(gr.top_block): # Property getters - #def interface(self): - # return self._u.ifc_name() - def mac_addr(self): return self._u.mac_addr() - def ifc_name(self): - return self._u.ifc_name() + def interface_name(self): + return self._u.interface_name() def daughterboard_id(self): return self._u.daughterboard_id() @@ -304,10 +300,7 @@ class top_block(gr.top_block): return self._freq def freq_range(self): - fr = self._u.freq_range() - if self._u.daughterboard_id() == 0x0000: - fr = (-50e6, 50e6) # DEBUG - return fr + return self._u.freq_range() def ddc_freq(self): return self._ddc_freq diff --git a/gr-utils/src/python/usrp2_siggen_gui.py b/gr-utils/src/python/usrp2_siggen_gui.py index 2d9f4f4df9..89bc6e5894 100755 --- a/gr-utils/src/python/usrp2_siggen_gui.py +++ b/gr-utils/src/python/usrp2_siggen_gui.py @@ -23,7 +23,7 @@ import wx from gnuradio.wxgui import form, slider, gui import usrp2_siggen -import math +import sys, math class app_gui(object): def __init__(self, frame, panel, vbox, top_block, options, args): @@ -43,7 +43,7 @@ class app_gui(object): self.build_gui() # TODO: turn these into listeners - self.myform['ifc'].set_value(self.tb.ifc_name()) + self.myform['ifc'].set_value(self.tb.interface_name()) self.myform['mac'].set_value(self.tb.mac_addr()) dbid = self.tb.daughterboard_id() self.myform['dbid'].set_value("%04x" % (dbid,)) |