From d994be2301a082a41dd28169148a6550ae054e52 Mon Sep 17 00:00:00 2001
From: James Devine <devine.jd@gmail.com>
Date: Fri, 2 Oct 2015 22:36:08 +0200
Subject: [PATCH]

---
 cosmicdatajson | 84 +++++++++++++++-----------------------------------
 1 file changed, 25 insertions(+), 59 deletions(-)

diff --git a/cosmicdatajson b/cosmicdatajson
index baa467a..c9bb5ad 100644
--- a/cosmicdatajson
+++ b/cosmicdatajson
@@ -57,49 +57,15 @@ void loop() {
   // read the input pin:
   //int buttonState = digitalRead(pushButton);
   // print out the state of the button:
-  Serial.println("{");
-  Serial.println("    \"GPS data\": {");
-  Serial.print("      \"GPSTime\": ");
-  Serial.print(gpstime);
-  Serial.println(','); 
-  Serial.print("      \"Latitude\": ");
-  Serial.print(latitude);
-  Serial.println(','); 
-  Serial.print("      \"Longitude\": ");
-  Serial.print(longitude);
-  Serial.println(',');
-  Serial.print("      \"FixQuality\": ");
-  Serial.print(fixquality);
-  Serial.println(',');
-  Serial.print("      \"Numberofsats\": ");
-  Serial.print(numsats);
-  Serial.println(',');
-  Serial.print("      \"HorizontalAccuracy\": ");
-  Serial.print(hozaccuracy);
-  Serial.println(',');
-  Serial.print("      \"Altitude\": ");
-  Serial.print(altitude);
-  Serial.println(',');
-  Serial.print("      \"Height\": ");
-  Serial.print(height);
-  Serial.println(',');
-  Serial.print("      \"TimeSinceUpdate\": ");
-  Serial.print(timesinceupdate);
-  Serial.println(',');
-  Serial.print("      \"DGPS\": ");
-  Serial.print(DGPS);
-  Serial.println(',');
-  Serial.print("      \"Checksum\": ");
-  Serial.print(checksum);
-  Serial.println(); 
-  Serial.println("    },");
+  Serial.print("{");
+  Serial.print("    \"GPS data\": \"textstring\",");
   
 
   Serial.print("    \"Timing\": ");
   Serial.print(exacttime);
-  Serial.println(','); 
+  Serial.print(','); 
   
-  Serial.println("    \"Energy\": {");
+  Serial.print("    \"Energy\": {");
   Serial.print("      \"Energy1\":[ ");
   Serial.print(energy1);
   Serial.print(',');
@@ -120,7 +86,7 @@ void loop() {
     Serial.print(energy1);
   Serial.print(',');
     Serial.print(energy1);
-  Serial.println("],");  
+  Serial.print("],");  
   Serial.print("      \"Energy2\":[ ");
   Serial.print(energy2);
   Serial.print(',');
@@ -141,58 +107,58 @@ void loop() {
     Serial.print(energy2);
   Serial.print(',');
     Serial.print(energy2);    
-  Serial.println(']');
-    Serial.println("    },");
+  Serial.print(']');
+    Serial.print("    },");
 
   Serial.print("    \"Altitude\": "); 
   Serial.print(altitudereal);
-  Serial.println(",");
+  Serial.print(",");
 
   Serial.print("    \"Humidity\": "); 
   Serial.print(humidity);
-  Serial.println(",");
+  Serial.print(",");
 
-  Serial.println("    \"GravitationalOrientation\": {"); 
+  Serial.print("    \"GravitationalOrientation\": {"); 
   Serial.print("     \"Xaxis\": ");
   Serial.print(xgrav);
-  Serial.println(",");
+  Serial.print(",");
   Serial.print("     \"Yaxis\": ");
   Serial.print(ygrav);
-  Serial.println(",");
+  Serial.print(",");
   Serial.print("     \"Zaxis\": ");
   Serial.print(zgrav);
-  Serial.println();
-  Serial.println("    },");  
+//  Serial.print();
+  Serial.print("    },");  
 
-  Serial.println("    \"MagneticOrientation\": {"); 
+  Serial.print("    \"MagneticOrientation\": {"); 
   Serial.print("     \"Xaxis\": ");
   Serial.print(mxgrav);
-  Serial.println(",");
+  Serial.print(",");
   Serial.print("     \"Yaxis\": ");
   Serial.print(mygrav);
-  Serial.println(",");
+  Serial.print(",");
   Serial.print("     \"Zaxis\": ");
   Serial.print(mzgrav);
-  Serial.println();
-  Serial.println("    },");
+//  Serial.print();
+  Serial.print("    },");
 
-  Serial.println("    \"Temperature\": {"); 
+  Serial.print("    \"Temperature\": {"); 
   Serial.print("     \"Temperature1\": ");
   Serial.print(tempval1);
-  Serial.println(",");
+  Serial.print(",");
   Serial.print("     \"Temperature2\": ");
   Serial.print(tempval2);
-  Serial.println();
-  Serial.println("    },");
+  //Serial.print();
+  Serial.print("    },");
 
 
   Serial.print("    \"DeviceUptime\": "); 
   Serial.print(uptime);
-  Serial.println(",");
+  Serial.print(",");
   
   Serial.print("    \"DeviceID\": "); 
   Serial.print(deviceid);
-  Serial.println();
+//  Serial.print();
 
   Serial.println("}");