From be5ec5c0edb19a973f03b92ae257c857b2141085 Mon Sep 17 00:00:00 2001 From: Nathan Matsuda Date: Tue, 10 Mar 2020 16:56:59 -0700 Subject: [PATCH] builds and runs Former-commit-id: 5158d4459d5b43213803b859ae4491113cf765f9 Former-commit-id: cd1720a0ea9b781adbe21e052efb79b75bc137f1 --- .DS_Store | Bin 0 -> 8196 bytes .gitignore | 1 + AircraftData.cpp | 7 +++---- AircraftData.h | 2 ++ Input.h | 2 +- draw.log.REMOVED.git-id | 1 - dump1090.log.REMOVED.git-id | 1 - map1090.REMOVED.git-id | 2 +- map1090.cpp | 6 +++--- run_view1090.sh | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 .DS_Store delete mode 100644 draw.log.REMOVED.git-id delete mode 100644 dump1090.log.REMOVED.git-id diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..51d2adef4d96807388cecd0d38d426153d7bc288 GIT binary patch literal 8196 zcmeHMU2GIp6h3ELU}pH~ErN7bpqp+gRf}|MX+a8Z+eNHGXlS8-$TGV#(2?m(-I?tI zrCRkx6O2#zgZiS0iNPl#Jeepj#`yQ3D5&AV2OspsN2AfibMKvPU}1TzB+gCde)ryU z&fI&x`DSMCEC66{(M$m}0DwXVN4AuzTNG~R$4w;`jw~WXiU-rrJ2}sDs1uclfrx>K zfrx>Kfrx=SlY#IxtyFpM-KOUpmA&i8358+zmf6KLN=>c^WOuR|`su?@}bf3&P_F6gPtL2PUZK>Y>xVC%5 z&U@~lebUOZI-e5mr|v+(nx^E2^PW?jbp0%=&l^s@=oo?3<2c;e9|^4E0dI}@ULoic zj#{~uq!v2zN1{0%(pSN7oc8?BE+rFK1tRdH!wCZb)s_Nyt*EB5G7!3ioZf%oBN z?8Gii<4)X#k6}OV!(kl7F&sw|pF#&G(Zv!zi_hWn_yV5BGx$2bfoJhuJdYpZ1-ytK z<0p6tzrZi?JNyxUlIx6><-14r%Qar3*6rjQ-mtMlw~}xC(Op{RKb7wf%cN%STD5w8 zvSnj?S9j0+wXL|C*UL(1Ns2{?s4Nn3Id4!Vzy5ms9&KGUb?+w)TE`VGB(_9)C*n;C zX@?2%=<(+G289I9V#2E3A16;kVKvfula^9QuxydEc4(a{Nt)G4>sD=>Lds=}rFDmv zR{2fGK=zyC8C79esmH2nd>_ukCHM-yAr)SOU*I?R0|6CWfek`|O_;=Hd=NKb3fr** zx8n}dVh{G=Zrp==ae(wVjtB7&X3-!$9us<;!V`EBPvI=-@h}x za}_G=FY8YtesDV#P7fAb$8(R8Pg%t`hDW`HW}rq+*ueMyJF9>HU+85;^F<6q3@ji6 zSeqHl^wNaY9?X2NouK0|9lUVAIf){KDzP0W6x(sa`9BP)ogh~plMZoCB8^a4@DBmv Uhi~Pt+vxp|(feQM@&8i&3w@6PzyJUM literal 0 HcmV?d00001 diff --git a/.gitignore b/.gitignore index c595430..211028c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ *.svg view1090 +map1090 *.swp .~ diff --git a/AircraftData.cpp b/AircraftData.cpp index d6a985e..b00ea94 100644 --- a/AircraftData.cpp +++ b/AircraftData.cpp @@ -9,7 +9,7 @@ int AircraftData::setupConnection(struct client *c) { int fd; // Try to connect to the selected ip address and port. We only support *ONE* input connection which we initiate.here. - if ((fd = anetTcpConnect(modes.aneterr, View1090.net_input_beast_ipaddr, modes.net_input_beast_port)) != ANET_ERR) { + if ((fd = anetTcpConnect(modes.aneterr, server, modes.net_input_beast_port)) != ANET_ERR) { anetNonBlock(modes.aneterr, fd); // // Setup a service callback client structure for a beast binary input (from dump1090) @@ -58,7 +58,7 @@ void AircraftData::connect() { c = (struct client *) malloc(sizeof(*c)); while(1) { if ((fd = setupConnection(c)) == ANET_ERR) { - fprintf(stderr, "Waiting on %s:%d\n", View1090.net_input_beast_ipaddr, modes.net_input_beast_port); + fprintf(stderr, "Waiting on %s:%d\n", server, modes.net_input_beast_port); sleep(1); } else { break; @@ -92,11 +92,10 @@ void AircraftData::update() { AircraftData::AircraftData(){ // Default everything to zero/NULL memset(&modes, 0, sizeof(Modes)); - memset(&View1090, 0, sizeof(View1090)); // Now initialise things that should not be 0/NULL to their defaults modes.check_crc = 1; - strcpy(View1090.net_input_beast_ipaddr,VIEW1090_NET_OUTPUT_IP_ADDRESS); + strcpy(server,VIEW1090_NET_OUTPUT_IP_ADDRESS); modes.net_input_beast_port = MODES_NET_OUTPUT_BEAST_PORT; modes.interactive_rows = MODES_INTERACTIVE_ROWS; modes.interactive_delete_ttl = MODES_INTERACTIVE_DELETE_TTL; diff --git a/AircraftData.h b/AircraftData.h index cb35012..dde04a9 100644 --- a/AircraftData.h +++ b/AircraftData.h @@ -29,6 +29,8 @@ class AircraftData { AircraftList aircraftList; Aircraft *selectedAircraft; Modes modes; + + char server[32]; }; #endif \ No newline at end of file diff --git a/Input.h b/Input.h index 36b269f..6958a54 100644 --- a/Input.h +++ b/Input.h @@ -1,5 +1,5 @@ #ifndef INPUT_H -#define INPUT +#define INPUT_H #include "AircraftData.h" #include "View.h" diff --git a/draw.log.REMOVED.git-id b/draw.log.REMOVED.git-id deleted file mode 100644 index 4d361fb..0000000 --- a/draw.log.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -fca1e79ced7e4bc0ee43c01bdd40d67f708ae6bb \ No newline at end of file diff --git a/dump1090.log.REMOVED.git-id b/dump1090.log.REMOVED.git-id deleted file mode 100644 index d8863a8..0000000 --- a/dump1090.log.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -ad971cbbab08e7bc43c68649b1796aa31b989e1e \ No newline at end of file diff --git a/map1090.REMOVED.git-id b/map1090.REMOVED.git-id index 5a4ef7c..2146ae3 100644 --- a/map1090.REMOVED.git-id +++ b/map1090.REMOVED.git-id @@ -1 +1 @@ -a18a4bc87ddef182cd7d61470daf952ae025186b \ No newline at end of file +93406437edceb4cd6d39e963d3094663472f660b \ No newline at end of file diff --git a/map1090.cpp b/map1090.cpp index cd7c318..533724f 100644 --- a/map1090.cpp +++ b/map1090.cpp @@ -34,6 +34,8 @@ #include "View.h" #include "Input.h" +#include + //time utility, might change to std::chrono uint64_t mstime(void) { struct timeval tv; @@ -96,10 +98,8 @@ int main(int argc, char **argv) { aircraftData.modes.net_input_beast_port = atoi(argv[++j]); } else if (!strcmp(argv[j],"--port") && more) { aircraftData.modes.net_input_beast_port = atoi(argv[++j]); - } else if (!strcmp(argv[j],"--net-bo-ipaddr") && more) { - strcpy(View1090.net_input_beast_ipaddr, argv[++j]); } else if (!strcmp(argv[j],"--server") && more) { - strcpy(View1090.net_input_beast_ipaddr, argv[++j]); + std::strcpy(aircraftData.server, argv[++j]); } else if (!strcmp(argv[j],"--lat") && more) { aircraftData.modes.fUserLat = atof(argv[++j]); appData.centerLat = aircraftData.modes.fUserLat; diff --git a/run_view1090.sh b/run_view1090.sh index 85ed8e4..c566a59 100755 --- a/run_view1090.sh +++ b/run_view1090.sh @@ -1,2 +1,2 @@ #!/bin/bash -./view1090 --screensize 640 360 --fullscreen --server adsb --lat 47.6 --lon -122.3 +./map1090 --screensize 640 360 --fullscreen --server adsb --lat 47.6 --lon -122.3