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

Added comments and change surface reports to MSG2

Browse Source 
2 important things happened here:

-> Surface position reports where changed from MSG3 to MSG2. I believe
   this is what that SBS message means.
-> MEs 1-4 are aircraft identification packets. Those should go to SBS
   MSG1.
This commit is contained in:
Zack Moratto 2011-07-07 11:14:05 -07:00
parent 7f9574b7cd
commit 4220255908
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/python/modes_sbs1.py
View File

@ -136,19 +136,22 @@ class modes_output_sbs1(modes_parse.modes_parse):
#in them #in them
[datestr, timestr] = self.current_time() [datestr, timestr] = self.current_time()
if subtype == 4: if subtype >= 1 and subtype <= 4:
# Aircraft Identification
msg = self.parseBDS08(shortdata, longdata, parity, ecc) msg = self.parseBDS08(shortdata, longdata, parity, ecc)
retstr = "MSG,1,0,0,%X,0,%s,%s,%s,%s,%s,,,,,,,,,,,\n" % (icao24, datestr, timestr, datestr, timestr, msg) retstr = "MSG,1,0,0,%X,0,%s,%s,%s,%s,%s,,,,,,,,,,,\n" % (icao24, datestr, timestr, datestr, timestr, msg)
elif subtype >= 5 and subtype <= 8: elif subtype >= 5 and subtype <= 8:
# Surface position measurement
[altitude, decoded_lat, decoded_lon, rnge, bearing] = self.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 if decoded_lat is None: #no unambiguously valid position available
retstr = None retstr = None
else: else:
retstr = "MSG,3,0,0,%X,0,%s,%s,%s,%s,,%i,,,%.5f,%.5f,,,,0,0,0\n" % (icao24, datestr, timestr, datestr, timestr, altitude, decoded_lat, decoded_lon) retstr = "MSG,2,0,0,%X,0,%s,%s,%s,%s,,%i,,,%.5f,%.5f,,,,0,0,0\n" % (icao24, datestr, timestr, datestr, timestr, altitude, decoded_lat, decoded_lon)
elif subtype >= 9 and subtype <= 18 and subtype != 15: elif subtype >= 9 and subtype <= 18 and subtype != 15:
# WRONG (rnge, bearing) # Airborne position measurements
# WRONG (rnge, bearing), is this still true?
# i'm eliminating type 15 records because they don't appear to be # i'm eliminating type 15 records because they don't appear to be
# valid position reports. # 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, parity, ecc)
@ -158,7 +161,8 @@ class modes_output_sbs1(modes_parse.modes_parse):
retstr = "MSG,3,0,0,%X,0,%s,%s,%s,%s,,%i,,,%.5f,%.5f,,,,0,0,0\n" % (icao24, datestr, timestr, datestr, timestr, altitude, decoded_lat, decoded_lon) retstr = "MSG,3,0,0,%X,0,%s,%s,%s,%s,,%i,,,%.5f,%.5f,,,,0,0,0\n" % (icao24, datestr, timestr, datestr, timestr, altitude, decoded_lat, decoded_lon)
elif subtype == 19: elif subtype == 19:
# WRONG (heading, vert_spd) # Airborne velocity measurements
# WRONG (heading, vert_spd), Is this still true?
subsubtype = (longdata >> 48) & 0x07 subsubtype = (longdata >> 48) & 0x07
if subsubtype == 0: if subsubtype == 0:
[velocity, heading, vert_spd] = self.parseBDS09_0(shortdata, longdata, parity, ecc) [velocity, heading, vert_spd] = self.parseBDS09_0(shortdata, longdata, parity, ecc)