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

Database inputs working.

Browse Source
This commit is contained in:
Nick Foster 2010-10-17 22:17:48 -07:00
parent 468cb726cb
commit 627b820b6e
7 changed files with 88 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/python/cpr.pyc
View File

Binary file not shown.

2
src/python/modes_parse.py
View File

@ -1,5 +1,3 @@
#!/usr/bin/env python
import time, os, sys
from string import split, join
from altitude import decode_alt

BIN
src/python/modes_parse.pyc
View File

Binary file not shown.

1
src/python/modes_print.py
View File

@ -1,4 +1,3 @@
#!/usr/bin/env python
import time, os, sys
from string import split, join
import modes_parse

87
src/python/modes_sql.py
View File

@ -1,13 +1,52 @@
#!/usr/bin/env python
import time, os, sys
from string import split, join
from modes_parse import *
import modes_parse
import sqlite3
def modes_sql(message):
class modes_output_sql(modes_parse.modes_parse):
def __init__(self):
#create the database
self.db = sqlite3.connect(':memory:') #RAM-based database, no persistence
#now execute a schema to create the tables you need
c = self.db.cursor()
query = """CREATE TABLE "positions" (
"icao" INTEGER KEY NOT NULL,
"seen" TEXT NOT NULL,
"alt" INTEGER,
"lat" REAL,
"lon" REAL
);"""
c.execute(query)
query = """CREATE TABLE "vectors" (
"icao" INTEGER KEY NOT NULL,
"seen" TEXT NOT NULL,
"speed" REAL,
"heading" REAL,
"vertical" REAL
);"""
c.execute(query)
query = """CREATE TABLE "ident" (
"icao" INTEGER PRIMARY KEY NOT NULL,
"ident" TEXT NOT NULL
);"""
c.execute(query)
c.close()
#assembles a MySQLdb query tailored to Owen's database
def __del__(self):
self.db.close()
def output(self, message):
query = self.make_query(message)
if query is not None:
c = self.db.cursor()
c.execute(query)
c.close()
self.db.commit() #not sure if i have to do this
def make_query(self, message):
#assembles a SQL query tailored to our database
#this version ignores anything that isn't Type 17 for now, because we just don't care
[msgtype, shortdata, longdata, parity, ecc, reference] = message.split()
shortdata = long(shortdata, 16)
@ -20,64 +59,48 @@ def modes_sql(message):
query = None
# if msgtype == 0:
# query = sql0(shortdata, parity, ecc)
# elif msgtype == 4:
# query = sql4(shortdata, parity, ecc)
# elif msgtype == 5:
# query = sql5(shortdata, parity, ecc)
# elif msgtype == 11:
# query = sql11(shortdata, parity, ecc)
# elif msgtype == 17:
if msgtype == 17:
query = sql17(shortdata, longdata, parity, ecc)
# elif msgtype == 20:
# output = parse20(shortdata, longdata, parity, ecc)
# else:
#output = "No handler for message type " + str(msgtype) + " from " + str(ecc)
# output = "(%.0f) " % float(reference) + output
query = self.sql17(shortdata, longdata, parity, ecc)
return query
def sql17(shortdata, longdata, parity, ecc):
def sql17(self, shortdata, longdata, parity, ecc):
icao24 = shortdata & 0xFFFFFF
subtype = (longdata >> 51) & 0x1F
retstr = None
if subtype == 4:
msg = parseBDS08(shortdata, longdata, parity, ecc)
retstr = "INSERT INTO plane_metadata (icao, ident) VALUES ('" + "%x" % icao24 + "', '" + msg + "') ON DUPLICATE KEY UPDATE seen=now(), ident=values(ident)"
msg = self.parseBDS08(shortdata, longdata, parity, ecc)
retstr = "INSERT OR REPLACE INTO ident (icao, ident) VALUES (" + "%i" % icao24 + ", '" + msg + "')"
elif subtype >= 5 and subtype <= 8:
[altitude, decoded_lat, decoded_lon, rnge, bearing] = parseBDS06(shortdata, longdata, parity, ecc)
[altitude, decoded_lat, decoded_lon, rnge, bearing] = self.parseBDS06(shortdata, longdata, parity, ecc)
if decoded_lat is None: #no unambiguously valid position available
retstr = None
else:
retstr = "INSERT INTO plane_positions (icao, seen, alt, lat, lon) VALUES ('" + "%x" % icao24 + "', now(), " + str(altitude) + ", " + "%.6f" % decoded_lat + ", " + "%.6f" % decoded_lon + ")"
retstr = "INSERT INTO positions (icao, seen, alt, lat, lon) VALUES (" + "%i" % icao24 + ", datetime('now'), " + str(altitude) + ", " + "%.6f" % decoded_lat + ", " + "%.6f" % decoded_lon + ")"
elif subtype >= 9 and subtype <= 18 and subtype != 15: #i'm eliminating type 15 records because they don't appear to be valid position reports.
[altitude, decoded_lat, decoded_lon, rnge, bearing] = parseBDS05(shortdata, longdata, parity, ecc)
[altitude, decoded_lat, decoded_lon, rnge, bearing] = self.parseBDS05(shortdata, longdata, parity, ecc)
if decoded_lat is None: #no unambiguously valid position available
retstr = None
else:
retstr = "INSERT INTO plane_positions (icao, seen, alt, lat, lon) VALUES ('" + "%x" % icao24 + "', now(), " + str(altitude) + ", " + "%.6f" % decoded_lat + ", " + "%.6f" % decoded_lon + ")"
retstr = "INSERT INTO positions (icao, seen, alt, lat, lon) VALUES (" + "%i" % icao24 + ", datetime('now'), " + str(altitude) + ", " + "%.6f" % decoded_lat + ", " + "%.6f" % decoded_lon + ")"
elif subtype == 19:
subsubtype = (longdata >> 48) & 0x07
if subsubtype == 0:
[velocity, heading, vert_spd] = parseBDS09_0(shortdata, longdata, parity, ecc)
retstr = "INSERT INTO plane_metadata (icao, seen, speed, heading, vertical) VALUES ('" + "%x" % icao24 + "', now(), " + "%.0f" % velocity + ", " + "%.0f" % heading + ", " + "%.0f" % vert_spd + ") ON DUPLICATE KEY UPDATE seen=now(), speed=values(speed), heading=values(heading), vertical=values(vertical)"
[velocity, heading, vert_spd] = self.parseBDS09_0(shortdata, longdata, parity, ecc)
retstr = "INSERT INTO vectors (icao, seen, speed, heading, vertical) VALUES (" + "%i" % icao24 + ", datetime('now'), " + "%.0f" % velocity + ", " + "%.0f" % heading + ", " + "%.0f" % vert_spd + ")";
elif subsubtype == 1:
[velocity, heading, vert_spd] = parseBDS09_1(shortdata, longdata, parity, ecc)
retstr = "INSERT INTO plane_metadata (icao, seen, speed, heading, vertical) VALUES ('" + "%x" % icao24 + "', now(), " + "%.0f" % velocity + ", " + "%.0f" % heading + ", " + "%.0f" % vert_spd + ") ON DUPLICATE KEY UPDATE seen=now(), speed=values(speed), heading=values(heading), vertical=values(vertical)"
[velocity, heading, vert_spd] = self.parseBDS09_1(shortdata, longdata, parity, ecc)
retstr = "INSERT INTO vectors (icao, seen, speed, heading, vertical) VALUES (" + "%i" % icao24 + ", datetime('now'), " + "%.0f" % velocity + ", " + "%.0f" % heading + ", " + "%.0f" % vert_spd + ")";
else:
print "debug (modes_sql): unknown subtype %i with data %x %x %x" % (subtype, shortdata, longdata, parity,)
return retstr

14
src/python/uhd_modes.py
View File

@ -1,5 +1,4 @@
#!/usr/bin/env python
from gnuradio import gr, gru, optfir, eng_notation, blks2, air
from gnuradio import uhd
from gnuradio.eng_option import eng_option
@ -8,7 +7,7 @@ import time, os, sys
from string import split, join
from usrpm import usrp_dbid
from modes_print import modes_output_print
from modes_sql import modes_sql
from modes_sql import modes_output_sql
from modes_sbs1 import modes_output_sbs1
import gnuradio.gr.gr_threading as _threading
@ -83,11 +82,6 @@ class adsb_rx_block (gr.top_block):
result = self.u.set_center_freq(freq)
return result
def post_to_sql(db, query):
if query is not None:
c = db.cursor()
c.execute(query)
if __name__ == '__main__':
usage = "%prog: [options] output filename"
parser = OptionParser(option_class=eng_option, usage=usage)
@ -122,9 +116,7 @@ if __name__ == '__main__':
updates = [] #registry of plugin update functions
if options.database is True:
import pysqlite3
#db = pysqlite3.connect(:memory:)
#here we have to initialize the database with the correct tables and relations
outputs.append(modes_output_sql().output)
if options.sbs1 is True:
sbs1port = modes_output_sbs1()
@ -141,7 +133,7 @@ if __name__ == '__main__':
try:
#the update registry is really for the SBS1 plugin -- we're looking for new TCP connections.
#i think we have to do this here rather than in the output handler because otherwise connections will stack up
#until the next output
#until the next output arrives
for update in updates:
update()