[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r9858 - gnuradio/trunk/gr-utils/src/python
From: |
jcorgan |
Subject: |
[Commit-gnuradio] r9858 - gnuradio/trunk/gr-utils/src/python |
Date: |
Sun, 26 Oct 2008 13:46:59 -0600 (MDT) |
Author: jcorgan
Date: 2008-10-26 13:46:59 -0600 (Sun, 26 Oct 2008)
New Revision: 9858
Modified:
gnuradio/trunk/gr-utils/src/python/usrp2_rx_cfile.py
gnuradio/trunk/gr-utils/src/python/usrp2_siggen.py
Log:
Updated usrp2_rx_cfile.py and usrp2_siggen.py to use updated gr-usrp2
Modified: gnuradio/trunk/gr-utils/src/python/usrp2_rx_cfile.py
===================================================================
--- gnuradio/trunk/gr-utils/src/python/usrp2_rx_cfile.py 2008-10-26
16:08:26 UTC (rev 9857)
+++ gnuradio/trunk/gr-utils/src/python/usrp2_rx_cfile.py 2008-10-26
19:46:59 UTC (rev 9858)
@@ -22,8 +22,8 @@
"""
Read samples from the USRP2 and write to file formatted as binary
-outputs single precision complex float values or complex short values
(interleaved 16 bit signed short integers).
-
+outputs single precision complex float values or complex short values
+(interleaved 16 bit signed short integers).
"""
from gnuradio import gr, eng_notation
@@ -52,9 +52,9 @@
# Set receive daughterboard gain
if options.gain is None:
- #g = self._u.gain_range()
- #options.gain = float(g[0]+g[1])/2
- options.gain = 0 # Until gain range is implemented
+ g = self._u.gain_range()
+ options.gain = float(g[0]+g[1])/2
+ print "Using mid-point gain of", options.gain, "(", g[0], "-",
g[1], ")"
self._u.set_gain(options.gain)
# Set receive frequency
@@ -63,7 +63,7 @@
sys.stderr.write('Failed to set center frequency\n')
raise SystemExit, 1
- # Create head block if needed wire it up
+ # Create head block if needed and wire it up
if options.nsamples is None:
self.connect(self._u, self._sink)
else:
@@ -74,13 +74,12 @@
self.connect(self._u, self._head, self._sink)
- #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.verbose:
print "Network interface:", options.interface
print "USRP2 address:", self._u.mac_addr()
- #print "Using RX d'board %s" % (self._u.rx_name(),)
+ print "Using RX d'board id 0x%04X" % (self._u.daughterboard_id(),)
print "Rx gain:", options.gain
print "Rx baseband frequency:", n2s(tr.baseband_freq)
print "Rx DDC frequency:", n2s(tr.dxc_freq)
Modified: gnuradio/trunk/gr-utils/src/python/usrp2_siggen.py
===================================================================
--- gnuradio/trunk/gr-utils/src/python/usrp2_siggen.py 2008-10-26 16:08:26 UTC
(rev 9857)
+++ gnuradio/trunk/gr-utils/src/python/usrp2_siggen.py 2008-10-26 19:46:59 UTC
(rev 9858)
@@ -38,9 +38,8 @@
# Set the Tx daughterboard gain as requested
if options.gain is None:
- #g = self._u.gain_range()
- #options.gain = float(g[0]+g[1])/2
- options.gain = 0 # Until gain range is implemented
+ g = self._u.gain_range()
+ options.gain = float(g[0]+g[1])/2
self._u.set_gain(options.gain)
# Tune the USRP2 FPGA and daughterboard to the requested center
frequency
@@ -49,8 +48,7 @@
sys.stderr.write('Failed to set center frequency\n')
raise SystemExit, 1
- #eth_rate = self._u.dac_rate()/self._u.interp_rate()
- eth_rate = 100e6/options.interp # FIXME
+ eth_rate = self._u.dac_rate()/self._u.interp()
# Create a source for the requested waveform type
if options.type == gr.GR_SIN_WAVE or options.type == gr.GR_CONST_WAVE:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r9858 - gnuradio/trunk/gr-utils/src/python,
jcorgan <=