Merge branch 'master' into qtapp

This commit is contained in:
Nick Foster
2012-08-15 20:15:55 -07:00
7 changed files with 43 additions and 17 deletions

View File

@@ -146,7 +146,7 @@ class output_sbs1(air_modes.parse):
def pp5(self, shortdata, ecc):
# I'm not sure what to do with the identiifcation shortdata & 0x1FFF
[datestr, timestr] = self.current_time()
[fs, dr, um] = self.parse5(shortdata)
[fs, dr, um, ident] = self.parse5(shortdata)
aircraft_id = self.get_aircraft_id(ecc)
retstr = "MSG,6,0,%i,%06X,%i,%s,%s,%s,%s,,,,,,,,," % (aircraft_id, ecc, aircraft_id+100, datestr, timestr, datestr, timestr)
return retstr + self.decode_fs(fs) + "\n"