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

add subdev spec, also clean up cpr.py

Browse Source
This commit is contained in:
Nick Foster 2011-06-08 21:44:53 -07:00
parent bca80f26ad
commit 140f91537c
2 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/python/cpr.py
View File

@ -173,8 +173,6 @@ def cpr_decode(my_location, icao24, encoded_lat, encoded_lon, cpr_format, evenli
weed_poslist(evenlist) weed_poslist(evenlist)
weed_poslist(oddlist) weed_poslist(oddlist)
#here we perform global/emitter-centered CPR decoding as follows:
#first, check for the ICAO number in the planelist. if there is a decoded position in there, use that for emitter-centered decoding and be done with it.
if surface==1: if surface==1:
validrange = 45 validrange = 45
else: else:
@ -185,36 +183,20 @@ def cpr_decode(my_location, icao24, encoded_lat, encoded_lon, cpr_format, evenli
[decoded_lat, decoded_lon] = cpr_resolve_local(lkplist[icao24][0:2], [encoded_lat, encoded_lon], cpr_format, surface) [decoded_lat, decoded_lon] = cpr_resolve_local(lkplist[icao24][0:2], [encoded_lat, encoded_lon], cpr_format, surface)
lkplist[icao24] = [decoded_lat, decoded_lon, time.time()] #update the local position for next time lkplist[icao24] = [decoded_lat, decoded_lon, time.time()] #update the local position for next time
############debug info for plotting strange position reports############### elif ((icao24 in evenlist) and (icao24 in oddlist) and abs(evenlist[icao24][2] - oddlist[icao24][2]) < 10):
# [lkprange, lkpbearing] = range_bearing(lkplist[icao24][0:2], [decoded_lat, decoded_lon]) # print "debug: valid even/odd positions, performing global decode."
# lkpdeltat = time.time() - lkplist[icao24][2] newer = (oddlist[icao24][2] - evenlist[icao24][2]) > 0 #figure out which report is newer
# #the units are now mi/sec [decoded_lat, decoded_lon] = cpr_resolve_global(evenlist[icao24][0:2], oddlist[icao24][0:2], newer, surface) #do a global decode
# #an SR-71 can move at 0.6 miles per second, so let's say if it's over 1.0mi/s it's probably a bug if decoded_lat is not None:
# if lkprange / lkpdeltat > 1.0: lkplist[icao24] = [decoded_lat, decoded_lon, time.time()]
# print "debug: buggy position packet detected from icao %x, encoded lat %x, encoded lon %x, CPR format %i, longdata %x." % (icao24, encoded_lat, encoded_lon, cpr_format, longdata)
#
############debug info for plotting strange position reports###############
else if my_location is not None: #if we have a location, use it elif my_location is not None: #if we have a location, use it
[local_lat, local_lon] = cpr_resolve_local(my_location, [encoded_lat, encoded_lon], cpr_format, surface) #try local decoding [local_lat, local_lon] = cpr_resolve_local(my_location, [encoded_lat, encoded_lon], cpr_format, surface) #try local decoding
[rnge, bearing] = range_bearing(my_location, [local_lat, local_lon]) [rnge, bearing] = range_bearing(my_location, [local_lat, local_lon])
if rnge < validrange: #if the local decoding can be guaranteed valid if rnge < validrange: #if the local decoding can be guaranteed valid
lkplist[icao24] = [local_lat, local_lon, time.time()] #update the local position for next time lkplist[icao24] = [local_lat, local_lon, time.time()] #update the local position for next time
[decoded_lat, decoded_lon] = [local_lat, local_lon] [decoded_lat, decoded_lon] = [local_lat, local_lon]
else: #if the local decoding can't be guaranteed valid, attempt a global decode
# print "debug: range > %inm, attempting global decode." % validrange
if (icao24 in evenlist) and (icao24 in oddlist):
# print "debug: ICAOs found in both lists."
if abs(evenlist[icao24][2] - oddlist[icao24][2]) < 10: #if there's less than 10 seconds of time difference between the reports
print "debug: valid even/odd positions, performing global decode."
newer = (oddlist[icao24][2] - evenlist[icao24][2]) > 0 #figure out which report is newer
[decoded_lat, decoded_lon] = cpr_resolve_global(evenlist[icao24][0:2], oddlist[icao24][0:2], newer, surface) #do a global decode
if decoded_lat is not None:
lkplist[icao24] = [decoded_lat, decoded_lon, time.time()]
# else:
# print "debug: timestamps not close enough to be valid."
# else:
# print "debug: even/odd information not found."
#print "settled on position: %.6f, %.6f" % (decoded_lat, decoded_lon,) #print "settled on position: %.6f, %.6f" % (decoded_lat, decoded_lon,)
if decoded_lat is not None: if decoded_lat is not None:

15
src/python/uhd_modes.py
View File

@ -20,7 +20,8 @@
# #
#my_position = [37.76225, -122.44254] #my_position = [37.76225, -122.44254]
my_position = [37.409066,-122.077836] #my_position = [37.409066,-122.077836]
my_position = None
from gnuradio import gr, gru, optfir, eng_notation, blks2, air from gnuradio import gr, gru, optfir, eng_notation, blks2, air
from gnuradio import uhd from gnuradio import uhd
@ -34,6 +35,7 @@ from modes_sql import modes_output_sql
from modes_sbs1 import modes_output_sbs1 from modes_sbs1 import modes_output_sbs1
from modes_kml import modes_kml from modes_kml import modes_kml
import gnuradio.gr.gr_threading as _threading import gnuradio.gr.gr_threading as _threading
import csv
class top_block_runner(_threading.Thread): class top_block_runner(_threading.Thread):
def __init__(self, tb): def __init__(self, tb):
@ -58,9 +60,9 @@ class adsb_rx_block (gr.top_block):
if options.filename is None: if options.filename is None:
self.u = uhd.single_usrp_source("", uhd.io_type_t.COMPLEX_FLOAT32, 1) self.u = uhd.single_usrp_source("", uhd.io_type_t.COMPLEX_FLOAT32, 1)
#if(options.rx_subdev_spec is None): if(options.rx_subdev_spec is None):
# options.rx_subdev_spec = "" options.rx_subdev_spec = ""
#self.u.set_subdev_spec(options.rx_subdev_spec) self.u.set_subdev_spec(options.rx_subdev_spec)
self.u.set_samp_rate(rate) self.u.set_samp_rate(rate)
rate = int(self.u.get_samp_rate()) #retrieve actual rate = int(self.u.get_samp_rate()) #retrieve actual
@ -144,8 +146,13 @@ if __name__ == '__main__':
help="open an SBS-1-compatible server on port 30003") help="open an SBS-1-compatible server on port 30003")
parser.add_option("-n","--no-print", action="store_true", default=False, parser.add_option("-n","--no-print", action="store_true", default=False,
help="disable printing decoded packets to stdout") help="disable printing decoded packets to stdout")
parser.add_option("-l","--location", type="string", default=None,
help="GPS coordinates of receiving station in format xx.xxxxx,xx.xxxxx")
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
if options.location is not None:
reader = csv.reader([options.location])
my_position = reader.next()
queue = gr.msg_queue() queue = gr.msg_queue()