Merge pull request #218 from nasa/develop

Version 1.3 RC6
nasa · Jun 27, 2020 · 81a1447 · 81a1447
2 parents a4a4bba + f9733df
commit 81a1447
Show file tree

Hide file tree

Showing 26 changed files with 1,857 additions and 677 deletions.
diff --git a/.gitignore b/.gitignore
@@ -92,4 +92,5 @@ out/
 
 # Internal Docs #
 #################
-Docs/~$Capability Matrix.xlsx
+Docs/~$Capability Matrix.xlsx
+*.xpl
diff --git a/C/monitorExample/main.c b/C/monitorExample/main.c
@@ -26,6 +26,8 @@
 #include <sys/time.h>
 #include "stdio.h"
 
+struct timeval tv;
+
 #ifdef WIN32
 HANDLE hStdIn = NULL;
 INPUT_RECORD buffer;
@@ -51,7 +53,6 @@ int waitForInput()
 #else
 int fdstdin = 0;
 fd_set fds;
-struct timeval tv;
 
 int waitForInput()
 {
@@ -67,10 +68,10 @@ int main(void)
 {
 	XPCSocket client = openUDP("127.0.0.1");
 	const int aircraftNum = 0;
-    tv.tv_usec = 100 * 1000;
+	tv.tv_usec = 100 * 1000;
 	while (1)
 	{
-		float posi[7]; // FIXME: change this to the 64-bit lat/lon/h
+		double posi[7];
 		int result = getPOSI(client, posi, aircraftNum);
 		if (result < 0) // Error in getPOSI
 		{

diff --git a/C/playbackExample/src/playback.c b/C/playbackExample/src/playback.c
@@ -65,7 +65,7 @@ void record(char* path, int interval, int duration)
 	XPCSocket sock = openUDP("127.0.0.1");
 	for (int i = 0; i < count; ++i)
 	{
-		float posi[7];
+		double posi[7];
 		int result = getPOSI(sock, posi, 0);
 		playbackSleep(interval);
 		if (result < 0)