[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r9859 - gnuradio/trunk/gr-utils/src/python
From: |
jcorgan |
Subject: |
[Commit-gnuradio] r9859 - gnuradio/trunk/gr-utils/src/python |
Date: |
Sun, 26 Oct 2008 14:41:24 -0600 (MDT) |
Author: jcorgan
Date: 2008-10-26 14:41:23 -0600 (Sun, 26 Oct 2008)
New Revision: 9859
Modified:
gnuradio/trunk/gr-utils/src/python/usrp2_fft.py
Log:
Update usrp2_fft.py to use updated gr-usrp2. Display is correct now, however,
attempting to change parameters via the controls still isn't working. But this
has been isolated to a libusrp2 issue, not a usrp2_fft.py issue.
Modified: gnuradio/trunk/gr-utils/src/python/usrp2_fft.py
===================================================================
--- gnuradio/trunk/gr-utils/src/python/usrp2_fft.py 2008-10-26 19:46:59 UTC
(rev 9858)
+++ gnuradio/trunk/gr-utils/src/python/usrp2_fft.py 2008-10-26 20:41:23 UTC
(rev 9859)
@@ -68,8 +68,7 @@
self.u = usrp2.source_32fc(options.interface, options.mac_addr)
self.u.set_decim(options.decim)
- #input_rate = self.u.adc_freq() / self.u.decim_rate()
- input_rate = 100e6/options.decim
+ input_rate = self.u.adc_rate() / self.u.decim()
if options.waterfall:
self.scope = \
@@ -90,15 +89,13 @@
if options.gain is None:
# if no gain was specified, use the mid-point in dB
- #g = self.subdev.gain_range()
- #options.gain = float(g[0]+g[1])/2
- options.gain = 0
+ g = self.u.gain_range()
+ options.gain = float(g[0]+g[1])/2
if options.freq is None:
# if no freq was specified, use the mid-point
- #r = self.subdev.freq_range()
- #options.freq = float(r[0]+r[1])/2
- options.freq = 0
+ r = self.u.freq_range()
+ options.freq = float(r[0]+r[1])/2
self.set_gain(options.gain)
@@ -107,13 +104,13 @@
# self.subdev.select_rx_antenna(options.antenna)
if self.show_debug_info:
- self.myform['decim'].set_value(options.decim)
- self.myform['address@hidden'].set_value(100e6/options.decim)
#self.u.adc_freq() / self.u.decim_rate())
- #self.myform['dbname'].set_value(self.subdev.name())
+ self.myform['decim'].set_value(self.u.decim())
+ self.myform['address@hidden'].set_value(input_rate)
+ self.myform['dbname'].set_value("0x%04X" %
(self.u.daughterboard_id(),)) # FIXME: add text name
self.myform['baseband'].set_value(0)
self.myform['ddc'].set_value(0)
- if not(self.u.set_center_freq(options.freq)):
+ if not(self.set_freq(options.freq)):
self._set_status_msg("Failed to set initial frequency")
def _set_status_msg(self, msg):
@@ -135,8 +132,10 @@
callback=myform.check_input_and_call(_form_set_freq,
self._set_status_msg))
hbox.Add((5,0), 0, 0)
- #g = self.subdev.gain_range()
- g = [0, 100, 1] #FIXME
+ g = self.u.gain_range()
+ if self.u.daughterboard_id() == 0x0003: # FIXME: get range right in
firmware for TVRX
+ g[1] = 104
+
myform['gain'] = form.slider_field(parent=self.panel, sizer=hbox,
label="Gain",
weight=3,
min=int(g[0]), max=int(g[1]),
@@ -174,8 +173,8 @@
callback=myform.check_input_and_call(_form_set_decim,
self._set_status_msg))
hbox.Add((5,0), 1)
- myform['address@hidden'] = form.static_float_field(
- parent=panel, sizer=hbox, label="address@hidden")
+ myform['address@hidden'] = form.static_float_field(
+ parent=panel, sizer=hbox, label="address@hidden")
hbox.Add((5,0), 1)
myform['dbname'] = form.static_text_field(
@@ -226,12 +225,11 @@
ok = self.u.set_decim(decim)
if not ok:
print "set_decim failed"
- #input_rate = self.u.adc_freq() / self.u.decim_rate()
- input_rate = 100e6/decim # FIXME
+ input_rate = self.u.adc_rate() / self.u.decim()
self.scope.set_sample_rate(input_rate)
if self.show_debug_info: # update displayed values
- self.myform['decim'].set_value(decim) #self.u.decim_rate())
- self.myform['address@hidden'].set_value(input_rate)
#self.u.adc_freq() / self.u.decim_rate())
+ self.myform['decim'].set_value(self.u.decim())
+ self.myform['address@hidden'].set_value(input_rate)
return ok
def _setup_events(self):
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r9859 - gnuradio/trunk/gr-utils/src/python,
jcorgan <=