summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
cd7b07f)
Increased buffering on usrp.source_c
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10185
221aa14e-8319-0410-a670-
987f0aec2ac5
self.reference_divisor = options.reference_divisor
self.ref_fifo = options.ref_fifo
self.reference_divisor = options.reference_divisor
self.ref_fifo = options.ref_fifo
self.notches = Numeric.zeros(self.NOTCH_TAPS,Numeric.Float64)
# Get notch locations
j = 0
self.notches = Numeric.zeros(self.NOTCH_TAPS,Numeric.Float64)
# Get notch locations
j = 0
options.decim = 256
if (self.dual_mode == False and self.interferometer == False):
options.decim = 256
if (self.dual_mode == False and self.interferometer == False):
- self.u = usrp.source_c(decim_rate=options.decim)
+ self.u = usrp.source_c(decim_rate=options.decim,fusb_block_size=8192)
self.u.set_mux(usrp.determine_rx_mux_value(self.u, options.rx_subdev_spec))
# determine the daughterboard subdevice we're using
self.subdev[0] = usrp.selected_subdev(self.u, options.rx_subdev_spec)
self.subdev[1] = self.subdev[0]
self.cardtype = self.subdev[0].dbid()
else:
self.u.set_mux(usrp.determine_rx_mux_value(self.u, options.rx_subdev_spec))
# determine the daughterboard subdevice we're using
self.subdev[0] = usrp.selected_subdev(self.u, options.rx_subdev_spec)
self.subdev[1] = self.subdev[0]
self.cardtype = self.subdev[0].dbid()
else:
- self.u=usrp.source_c(decim_rate=options.decim, nchan=2)
+ self.u=usrp.source_c(decim_rate=options.decim, nchan=2,fusb_block_size=8192)
self.subdev[0] = usrp.selected_subdev(self.u, (0, 0))
self.subdev[1] = usrp.selected_subdev(self.u, (1, 0))
self.cardtype = self.subdev[0].dbid()
self.subdev[0] = usrp.selected_subdev(self.u, (0, 0))
self.subdev[1] = usrp.selected_subdev(self.u, (1, 0))
self.cardtype = self.subdev[0].dbid()
#
if (self.dual_mode == True):
#
if (self.dual_mode == True):
- self.setup_dual (self.setimode)
+ self.setup_dual (self.setimode,self.use_notches)
if (self.interferometer == True):
if (self.interferometer == True):
- self.setup_interferometer(self.setimode)
+ self.setup_interferometer(self.setimode,self.use_notches)
if (self.normal_mode == True):
if (self.normal_mode == True):
- self.setup_normal(self.setimode)
+ self.setup_normal(self.setimode,self.use_notches)
if (self.setimode == True):
self.setup_seti()
if (self.setimode == True):
self.setup_seti()
delfreq = -1
if self.use_notches == True:
for i in range(0,len(self.notches)):
delfreq = -1
if self.use_notches == True:
for i in range(0,len(self.notches)):
- if abs(self.notches[i] - dfreq) < ((self.bw/self.NOTCH_TAPS)/2):
+ if abs(self.notches[i] - dfreq) < ((self.bw/self.NOTCH_TAPS)/2.0):
diff = i - self.observing
if int(i) == 0:
break
diff = i - self.observing
if int(i) == 0:
break
- if (i < (self.observing - self.bw/2) or i > (self.observing + self.bw/2)):
+ if ((i < (self.observing - self.bw/2)) or (i > (self.observing + self.bw/2))):
continue
if (diff > 0):
idx = diff / binwidth
continue
if (diff > 0):
idx = diff / binwidth
idx = round(idx)
idx = (self.NOTCH_TAPS/2) - idx
idx = int(idx+(self.NOTCH_TAPS/2))
idx = round(idx)
idx = (self.NOTCH_TAPS/2) - idx
idx = int(idx+(self.NOTCH_TAPS/2))
- if (idx < 0 or idx > (self.NOTCH_TAPS)):
+ if (idx < 0 or idx >= (self.NOTCH_TAPS)):
break
tmptaps[idx] = complex(0.0, 0.0)
break
tmptaps[idx] = complex(0.0, 0.0)
#
# Setup dual-channel (two antenna, usual orthogonal polarity probes in the same waveguide)
#
#
# Setup dual-channel (two antenna, usual orthogonal polarity probes in the same waveguide)
#
- def setup_dual(self, setimode):
+ def setup_dual(self, setimode,notches):
self.setup_radiometer_common(2)
self.setup_radiometer_common(2)