Merge pull request #43 from uorocketry/table-format

Show connection details
uorocketry · Jun 26, 2021 · 068f586 · 068f586
2 parents 5886df7 + d12b18d
commit 068f586
Show file tree

Hide file tree

Showing 25 changed files with 1,497 additions and 745 deletions.
diff --git a/build.gradle b/build.gradle
@@ -24,8 +24,9 @@ dependencies {
 	implementation	'org.json:json:20210307'
 	implementation	'org.knowm.xchart:xchart:3.6.1'
 	implementation	'org.java-websocket:Java-WebSocket:1.5.1'
+    implementation 'org.jetbrains:annotations:19.0.0'
 
-	testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2'
 }
 
 test {

diff --git a/data-example/config-hotfireTest.json b/data-example/config-hotfireTest.json
@@ -25,9 +25,11 @@
                 "Abort Burn",
                 "Max States"
         	],
-	        "timestampIndex": 0,
-	        "stateIndex": 1,
-            "seperator": ","
+            "indexes": {
+                "timestamp": 0,
+                "state": 1
+	        },
+            "separator": ","
         }
     ],
     "stateEvents": [

diff --git a/data-example/config-octoberSky.json b/data-example/config-octoberSky.json
@@ -37,14 +37,14 @@
         		"Ground",
         		"Max States"
         	],
-        	"coordinateIndexes": {
+        	"indexes": {
+                "timestamp": 1,
+                "state": 19,
 	        	"altitude": 10,
 	        	"latitude": 8,
 	        	"longitude": 9
 	        },
-	        "timestampIndex": 1,
-	        "stateIndex": 19,
-            "seperator": ","
+            "separator": ","
         }
     ]
 }