Merge branch 'master' into az_map

This commit is contained in:
Nick Foster
2012-10-18 22:00:12 -07:00
12 changed files with 293 additions and 123 deletions
+23
View File
@@ -0,0 +1,23 @@
#!/usr/bin/env python
import sys, re
if __name__== '__main__':
data = sys.stdin.readlines()
icaos = []
num_icaos = 0
for line in data:
match = re.match(".*Type.*from (\w+)", line)
if match is not None:
icao = int(match.group(1), 16)
icaos.append(icao)
#get dupes
dupes = sorted([icao for icao in set(icaos) if icaos.count(icao) > 1])
count = sum([icaos.count(icao) for icao in dupes])
for icao in dupes:
print "%x" % icao
print "Found %i replies from %i non-unique aircraft, out of a total %i replies (%i likely spurious replies)." \
% (count, len(dupes), len(icaos), len(icaos)-count)
+3 -11
View File
@@ -423,23 +423,15 @@ class adsb_rx_block (gr.top_block):
else:
raise NotImplementedError
self.demod = gr.complex_to_mag()
self.avg = gr.moving_average_ff(100, 1.0/100, 400)
self.preamble = air_modes.modes_preamble(int(rate), float(options["threshold"]))
self.slicer = air_modes.modes_slicer(int(rate), queue)
self.rx_path = air_modes.rx_path(rate, options["threshold"], queue)
if use_resampler:
self.lpfiltcoeffs = gr.firdes.low_pass(1, 5*3.2e6, 1.6e6, 300e3)
self.resample = blks2.rational_resampler_ccf(interpolation=5, decimation=4, taps=self.lpfiltcoeffs)
self.connect(self.u, self.resample, self.demod)
self.connect(self.u, self.resample, self.rx_path)
else:
self.connect(self.u, self.demod)
self.connect(self.u, self.rx_path)
self.connect(self.demod, self.avg)
self.connect(self.demod, (self.preamble, 0))
self.connect(self.avg, (self.preamble, 1))
self.connect(self.preamble, self.slicer)
if __name__ == '__main__':
app = QtGui.QApplication(sys.argv)
+3 -13
View File
@@ -110,24 +110,14 @@ class adsb_rx_block (gr.top_block):
if options.output_all :
pass_all = 1
self.demod = gr.complex_to_mag()
self.avg = gr.moving_average_ff(100, 1.0/100, 400)
self.preamble = air_modes.modes_preamble(rate, options.threshold)
#self.framer = air_modes.modes_framer(rate)
self.slicer = air_modes.modes_slicer(rate, queue)
self.rx_path = air_modes.rx_path(rate, options.threshold, queue)
if use_resampler:
self.lpfiltcoeffs = gr.firdes.low_pass(1, 5*3.2e6, 1.6e6, 300e3)
self.resample = blks2.rational_resampler_ccf(interpolation=5, decimation=4, taps=self.lpfiltcoeffs)
self.connect(self.u, self.resample, self.demod)
self.connect(self.u, self.resample, self.rx_path)
else:
self.connect(self.u, self.demod)
self.connect(self.demod, self.avg)
self.connect(self.demod, (self.preamble, 0))
self.connect(self.avg, (self.preamble, 1))
self.connect((self.preamble, 0), (self.slicer, 0))
self.connect(self.u, self.rx_path)
def tune(self, freq):
result = self.u.set_center_freq(freq, 0)