FGFS-4.1/gr-air-modes
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small Osmosdr fixes. Still unsatisfactory w/HackRF Jawbreaker. DC block

Browse Source 
unhelpful.
This commit is contained in:
Nick Foster
2013-08-08 22:15:24 -07:00
parent c878d80e28
commit 55559086ac
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
python/radio.py
View File

@@ -102,7 +102,7 @@ class modes_radio (gr.top_block, pubsub):
#RX path args
group.add_option("-r", "--rate", type="eng_float", default=4e6,
help="set sample rate [default=%default]")
group.add_option("-T", "--threshold", type="eng_float", default=5.0,
group.add_option("-T", "--threshold", type="eng_float", default=7.0,
help="set pulse detection threshold above noise in dB [default=%default]")
group.add_option("-p","--pmf", action="store_true", default=False,
help="Use pulse matched filtering [default=%default]")
@@ -119,7 +119,6 @@ class modes_radio (gr.top_block, pubsub):
if self.live_source():
self._u.set_gain(gain)
print "Gain is %f" % self.get_gain()
return self.get_gain()
def set_rate(self, rate):
@@ -131,7 +130,7 @@ class modes_radio (gr.top_block, pubsub):
def get_freq(self, freq):
return self._u.get_center_freq(freq, 0) if self.live_source() else 1090e6
def get_gain(self):
return self._u.get_gain() if self.live_source() else 0
@@ -176,7 +175,7 @@ class modes_radio (gr.top_block, pubsub):
#osmocom doesn't have gain bucket distribution like UHD does
elif options.source == "osmocom": #RTLSDR dongle or HackRF Jawbreaker
import osmosdr
self._u = osmosdr.source_c(options.args)
self._u = osmosdr.source(options.args)
# self._u.set_sample_rate(3.2e6) #fixed for RTL dongles
self._u.set_sample_rate(options.rate)
if not self._u.set_center_freq(options.freq):
@@ -188,7 +187,7 @@ class modes_radio (gr.top_block, pubsub):
###DO NOT COMMIT
self._u.set_gain(14, "RF", 0)
self._u.set_gain(40, "IF", 0)
#self._u.set_gain(14, "BB", 0)
self._u.set_gain(6, "BB", 0)
###DO NOT COMMIT
# self._u.set_gain(options.gain)
print "Gain is %i" % self._u.get_gain()
@@ -214,3 +213,4 @@ class modes_radio (gr.top_block, pubsub):
def close(self):
self._sender.close()
self._u = None

5
python/rx_path.py
View File

@@ -19,7 +19,7 @@
# Boston, MA 02110-1301, USA.
#
from gnuradio import gr, blocks
from gnuradio import gr, blocks, filter
import air_modes_swig
class rx_path(gr.hier_block2):
@@ -36,6 +36,7 @@ class rx_path(gr.hier_block2):
# Convert incoming I/Q baseband to amplitude
self._demod = blocks.complex_to_mag_squared()
# self._dcblock = filter.dc_blocker_ff(128, False)
self._bb = self._demod
# Pulse matched filter for 0.5us pulses
@@ -54,7 +55,7 @@ class rx_path(gr.hier_block2):
self._slicer = air_modes_swig.slicer(self._queue)
# Wire up the flowgraph
self.connect(self, self._demod)
self.connect(self, self._demod)#, self._dcblock)
self.connect(self._bb, (self._sync, 0))
self.connect(self._bb, self._avg, (self._sync, 1))
self.connect(self._sync, self._slicer)