From 64a0c13ab57805dc1dea58a819335008d88bd9e1 Mon Sep 17 00:00:00 2001 From: Nathan Date: Thu, 7 Sep 2017 16:56:29 -0500 Subject: [PATCH] switched back to terminus 10x20 no unicode for now, until hardware rotates 90 Former-commit-id: 1dcbeb0370ddf4f14022fe31b81b2586f8856f9e --- dump1090/dump1090.REMOVED.git-id | 2 +- dump1090/interactive.c | 15 +++++++++++++-- dump1090/interactive.o | Bin 24392 -> 24264 bytes dump1090/view1090.REMOVED.git-id | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dump1090/dump1090.REMOVED.git-id b/dump1090/dump1090.REMOVED.git-id index 546c373..5a235ef 100644 --- a/dump1090/dump1090.REMOVED.git-id +++ b/dump1090/dump1090.REMOVED.git-id @@ -1 +1 @@ -991767a65daecf769ad18d4cff2b6ccf858da843 \ No newline at end of file +890272146e6936b8596ef44ad393d3987dab8418 \ No newline at end of file diff --git a/dump1090/interactive.c b/dump1090/interactive.c index 69dd5a1..8d36498 100644 --- a/dump1090/interactive.c +++ b/dump1090/interactive.c @@ -444,7 +444,7 @@ void interactiveShowData(void) { printf ( // original version "Hex Mode Sqwk Flight Alt Spd Hdg Lat Long Sig Msgs Ti%c\n", progress); // pitft version "\x1B[30;47m\e[1mFlight Alt Spd Lat Long \n", progress); - "\x1B[30;47m\e[1mFlight Zm m/s D(km) %lc S",0x25cb); + "\x1B[30;47m\e[1mFlight Zm m/s D(km) H S "); } else { printf ( "Hex Flight Alt V/S GS TT SSR G*456^ Msgs Seen %c\n", progress); @@ -550,7 +550,8 @@ void interactiveShowData(void) { snprintf(strD, 6,"%5.01f", d); - //formatted for terminusBold 10x16 + /* + //formatted for Unifont 8x16, rotated 90 printf("\n\x1B[%d;31m%-8s\x1B[%d;32m%5s \x1B[%d;33m%3s \x1B[%d;34m%6s \x1B[%d;36m%c%c \x1B[%d;37m%lc", count%2, a->flight, count%2, strFl, @@ -558,6 +559,16 @@ void interactiveShowData(void) { count%2, strD, count%2, cLat, cLon, count%2, 0x2581 + (wint_t) (2*signalAverage)); + */ + + //formatted for terminusBold 10x20, no unicode + printf("\n\x1B[%d;31m%-8s\x1B[%d;32m%5s \x1B[%d;33m%3s \x1B[%d;34m%6s \x1B[%d;36m%c%c \x1B[%d;37m%d", + count%2, a->flight, + count%2, strFl, + count%2, strGs, + count%2, strD, + count%2, cLat, cLon, + count%2, signalAverage); count++; } else { numNoDir++; diff --git a/dump1090/interactive.o b/dump1090/interactive.o index 9f80f679860d6ffd556210cc7058b5b3c7a9e637..a8b1bf0c621e849fbcf157d0970284c2d5f3715a 100644 GIT binary patch delta 5188 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