Mirrors/gr-air-modes
2
0
Fork 0
mirror of https://github.com/bistromath/gr-air-modes.git synced 2026-03-10 11:06:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix SBS-1 and SQL calls into parser.

Browse Source
This commit is contained in:
Nick Foster
2012-06-13 15:33:20 -07:00
parent 4942df438a
commit f5bea04d21
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
python/modes_sql.py
View File

@@ -81,29 +81,29 @@ class modes_output_sql(modes_parse.modes_parse):
query = None
if msgtype == 17:
query = self.sql17(shortdata, longdata, parity, ecc)
query = self.sql17(shortdata, longdata)
return query
def sql17(self, shortdata, longdata, parity, ecc):
def sql17(self, shortdata, longdata):
icao24 = shortdata & 0xFFFFFF
subtype = (longdata >> 51) & 0x1F
retstr = None
if subtype == 4:
msg = self.parseBDS08(shortdata, longdata, parity, ecc)
msg = self.parseBDS08(shortdata, longdata)
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] = self.parseBDS06(shortdata, longdata, parity, ecc)
[altitude, decoded_lat, decoded_lon, rnge, bearing] = self.parseBDS06(shortdata, longdata)
if decoded_lat is None: #no unambiguously valid position available
retstr = None
else:
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] = self.parseBDS05(shortdata, longdata, parity, ecc)
[altitude, decoded_lat, decoded_lon, rnge, bearing] = self.parseBDS05(shortdata, longdata)
if decoded_lat is None: #no unambiguously valid position available
retstr = None
else:
@@ -112,11 +112,11 @@ class modes_output_sql(modes_parse.modes_parse):
elif subtype == 19:
subsubtype = (longdata >> 48) & 0x07
if subsubtype == 0:
[velocity, heading, vert_spd] = self.parseBDS09_0(shortdata, longdata, parity, ecc)
[velocity, heading, vert_spd] = self.parseBDS09_0(shortdata, longdata)
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] = self.parseBDS09_1(shortdata, longdata, parity, ecc)
[velocity, heading, vert_spd] = self.parseBDS09_1(shortdata, longdata)
retstr = "INSERT INTO vectors (icao, seen, speed, heading, vertical) VALUES (" + "%i" % icao24 + ", datetime('now'), " + "%.0f" % velocity + ", " + "%.0f" % heading + ", " + "%.0f" % vert_spd + ")";
return retstr