Merge branch 'master' into qtapp

Conflicts: CMakeLists.txt lib/air_modes_preamble.cc
2012-09-20 18:40:31 -07:00
parent 4b70c5a0b0 32da8704a9
commit 70dfb4f821
4 changed files with 21 additions and 7 deletions
--- a/python/msprint.py
+++ b/python/msprint.py
@@ -180,7 +180,7 @@ class output_print(air_modes.parse):
      retstr = "Type 17 BDS6,2 (emergency) from %x type %s" % (icao24, emerg_str)
      
    else:
-      retstr = "Type 17 subtype %i from %x not implemented" % (subtype, icao24)
+      retstr = "Type 17 with FTC=%i from %x not implemented" % (data["ftc"], icao24)

    return retstr