add callsign to modeslive

junzis · Jul 4, 2018 · 0085d03 · 0085d03
1 parent 6f139d4
commit 0085d03
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/pyModeS/streamer/screen.py b/pyModeS/streamer/screen.py
@@ -6,6 +6,7 @@
 from threading import Thread
 
 COLUMNS = [
+    ('call', 10),
     ('lat', 10),
     ('lon', 10),
     ('alt', 7),
@@ -16,11 +17,12 @@
     ('roc', 7),
     ('trk', 10),
     ('hdg', 10),
-    ('ver', 4),
     ('live', 6),
 ]
 
 UNCERTAINTY_COLUMNS = [
+    ('|', 5),
+    ('ver', 4),
     ('HPL', 5),
     ('RCu', 5),
     ('RCv', 5),
@@ -113,8 +115,10 @@ def update(self):
                 line += icao
 
                 for c, cw in self.columns:
-                    if c=='live':
-                        val = int(time.time() - ac[c])
+                    if c=='|':
+                        val = '|'
+                    elif c=='live':
+                        val = str(int(time.time() - ac[c]))+'s'
                     elif ac[c] is None:
                         val = ''
                     else:

diff --git a/pyModeS/streamer/stream.py b/pyModeS/streamer/stream.py
@@ -37,6 +37,7 @@ def process_raw(self, adsb_ts, adsb_msgs, commb_ts, commb_msgs, tnow=None):
             if icao not in self.acs:
                 self.acs[icao] = {
                     'live': None,
+                    'call': None,
                     'lat': None,
                     'lon': None,
                     'alt': None,
@@ -66,7 +67,7 @@ def process_raw(self, adsb_ts, adsb_msgs, commb_ts, commb_msgs, tnow=None):
             self.acs[icao]['live'] = int(t)
 
             if 1 <= tc <= 4:
-                self.acs[icao]['callsign'] = pms.adsb.callsign(msg)
+                self.acs[icao]['call'] = pms.adsb.callsign(msg)
 
             if (5 <= tc <= 8) or (tc == 19):
                 vdata = pms.adsb.velocity(msg)