formatting for terminusBold 20x16

Former-commit-id: fc05907e9365a464a5465547403090f0fe0ca7fc
This commit is contained in:
Nathan Matsuda 2017-09-04 12:54:12 +00:00
parent 8bf5126a75
commit 2b730833c8
11 changed files with 13 additions and 19 deletions

Binary file not shown.

View file

@ -1 +1 @@
a12e9b1c39fb3432f7175cecd1ca3d8fc490e2f5 e328571ee755d40455f14ff797c85de516b3cf0c

Binary file not shown.

View file

@ -0,0 +1 @@
f9454b21fbaa395742eefee887a437a2bcf85b60

View file

@ -441,7 +441,7 @@ void interactiveShowData(void) {
printf ( printf (
// original version "Hex Mode Sqwk Flight Alt Spd Hdg Lat Long Sig Msgs Ti%c\n", progress); // 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); // pitft version "\x1B[30;47m\e[1mFlight Alt Spd Lat Long \n", progress);
"\x1B[30;47m\e[1mFlight Alt Spd Dist Dir", progress); "\x1B[30;47m\e[1mFlight Alt(m) m/s Dst(km) H ", progress);
} else { } else {
printf ( printf (
"Hex Flight Alt V/S GS TT SSR G*456^ Msgs Seen %c\n", progress); "Hex Flight Alt V/S GS TT SSR G*456^ Msgs Seen %c\n", progress);
@ -450,7 +450,7 @@ void interactiveShowData(void) {
//"---------------------------------------"); //"---------------------------------------");
printf("\x1B[37;40m"); printf("\x1B[37;40m");
int numNoDir = 0; int numNoDir = 0;
while(a && (count < Modes.interactive_rows)) { while(a && (count < 10)) {
if ((now - a->seen) < Modes.interactive_display_ttl) if ((now - a->seen) < Modes.interactive_display_ttl)
{ {
int msgs = a->messages; int msgs = a->messages;
@ -527,7 +527,7 @@ void interactiveShowData(void) {
if(fabsf(dLon) < .01 && fabsf(dLat) > fabsf(dLon)) { if(fabsf(dLon) < .01 && fabsf(dLat) > fabsf(dLon)) {
cLon = ' '; cLon = ' ';
} else { } else {
if(a->lon < 0) { if(dLon < 0) {
cLon = 'W'; cLon = 'W';
} else { } else {
cLon = 'E'; cLon = 'E';
@ -538,7 +538,7 @@ void interactiveShowData(void) {
if(fabsf(dLat) < .01 && fabsf(dLon) > fabsf(dLat)) { if(fabsf(dLat) < .01 && fabsf(dLon) > fabsf(dLat)) {
cLat = ' '; cLat = ' ';
} else { } else {
if(a->lat < 0) { if(dLat < 0) {
cLat = 'S'; cLat = 'S';
} else { } else {
cLat = 'N'; cLat = 'N';
@ -547,6 +547,7 @@ void interactiveShowData(void) {
snprintf(strD, 8,"%7.03f", d); snprintf(strD, 8,"%7.03f", d);
//formatted for terminusBold 10x16
printf("\n\x1B[%d;31m%-8s \x1B[%d;32m%5s \x1B[%d;33m%3s \x1B[%d;34m%8s \x1B[%d;36m%c%c", printf("\n\x1B[%d;31m%-8s \x1B[%d;32m%5s \x1B[%d;33m%3s \x1B[%d;34m%8s \x1B[%d;36m%c%c",
count%2, a->flight, count%2, a->flight,
count%2, strFl, count%2, strFl,
@ -558,20 +559,12 @@ void interactiveShowData(void) {
} else { } else {
numNoDir++; numNoDir++;
} }
//printf("%06X %-4s %-4s %-8s %5s %3s %3s %7s %8s %3d %5d %2d\n",
//a->addr, strMode, strSquawk, a->flight, strFl, strGs, strTt,
//strLat, strLon, signalAverage, msgs, (int)(now - a->seen));
// printf("\n\x1B[%d;%dm%-8s %5s %3s %7s %8s",a->addr % 12 > 6, 31 + a->addr % 6,
// a->flight, strFl, strGs,
// strLat, strLon);
} }
} }
a = a->next; a = a->next;
} }
while(count < 14) { while(count < 10) {
printf("\n"); printf("\n");
count++; count++;
} }

Binary file not shown.

Binary file not shown.

View file

@ -1 +1 @@
bdd60b55bc0624ff84544a794ae21d71eaf0adc8 d5ebbbdea727d372f6d868a8f114fdb2c4dfe1f5

Binary file not shown.

View file

@ -1 +1 @@
8e54cfa965ac942c81c1742f1abe3a82b9a8412a e8e8d968d4f4aec851cfe3bae4e8ad926f7f7b65

Binary file not shown.