From ef9d2cfd16f0243a9a07fc80d4460467d0bdea42 Mon Sep 17 00:00:00 2001 From: Junzi Sun Date: Wed, 4 Jul 2018 18:14:13 +0200 Subject: [PATCH] fix NICv2 bug --- pyModeS/decoder/uncertainty.py | 4 ++-- pyModeS/streamer/screen.py | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/pyModeS/decoder/uncertainty.py b/pyModeS/decoder/uncertainty.py index 2e22882..dc4dab7 100644 --- a/pyModeS/decoder/uncertainty.py +++ b/pyModeS/decoder/uncertainty.py @@ -103,7 +103,7 @@ NICv2 = { 8: {0: {'Rc': 185}}, 7: { 0: {'Rc': 370}, - 2: {'Rc': 370}, + 3: {'Rc': 370}, }, 6: { 0: {'Rc': 926}, @@ -113,7 +113,7 @@ NICv2 = { }, 5: {0: {'Rc': 1852}}, 4: {0: {'Rc': 3702}}, - 3: {2: {'Rc': 7408}}, + 3: {3: {'Rc': 7408}}, 2: {0: {'Rc': 14008}}, 1: {0: {'Rc': 37000}}, 0: {0: {'Rc': NA}}, diff --git a/pyModeS/streamer/screen.py b/pyModeS/streamer/screen.py index f0bb623..b2951c9 100644 --- a/pyModeS/streamer/screen.py +++ b/pyModeS/streamer/screen.py @@ -55,7 +55,7 @@ class Screen(Thread): def draw_frame(self): self.screen.border(0) - self.screen.addstr(0, 2, "Online aircraft ('ESC' to exit, 'Enter' to lock one)") + self.screen.addstr(0, 2, "Online aircraft [%d] ('Ctrl+C' to exit, 'Enter' to lock one)" % len(self.acs)) def update(self): if len(self.acs) == 0: @@ -143,10 +143,7 @@ class Screen(Thread): while True: c = self.screen.getch() - if c == 27: - curses.endwin() - os._exit(1) - elif c == curses.KEY_HOME: + if c == curses.KEY_HOME: self.x = 1 self.y = 1 elif c == curses.KEY_NPAGE: