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

---
 cosmicdatajson | 179 +------------------------------------------------
 1 file changed, 1 insertion(+), 178 deletions(-)

diff --git a/cosmicdatajson b/cosmicdatajson
index c9bb5ad..104c6ec 100644
--- a/cosmicdatajson
+++ b/cosmicdatajson
@@ -1,178 +1 @@
-/*
-  DigitalReadSerial
- Reads a digital input on pin 2, prints the result to the serial monitor
-
- This example code is in the public domain.
- */
-
-// digital pin 2 has a pushbutton attached to it. Give it a name:
-//int pushButton = 2;
-
-int gpstime = random(100,1000);
-int latitude = random(0, 100);
-int longitude = random(0,100);
-int fixquality = random(-0,1);
-int numsats = random(10,16);
-int hozaccuracy= random(5,50);
-int altitude = random(1000,3000);
-int height = altitude + 100;
-int timesinceupdate = random(10,1000);
-int DGPS = random(1,2);
-int checksum =random(0,8);
-
-int exacttime = gpstime;
-int energy1 = random(10000,20000);
-int energy2 = random(10050,19950);
-int altitudereal = altitude + random(-100,100);
-int altaccuracy = random(1,100);
-
-int humidity = random (60,70);
-int humaccuracy = random (1,20);
-
-
-int xgrav = random(0,10);
-int ygrav = random(0,10);
-int zgrav = random(0,10);
-
-int mxgrav = random(0,10);
-int mygrav = random(0,10);
-int mzgrav = random(0,10);
-
-int tempval1 = random(10,35);
-int tempval2 = tempval1 + 1;
-
-int uptime = random(1,1000);
-
-int deviceid = random(1,10000);
-
-// the setup routine runs once when you press reset:
-void setup() {
-  // initialize serial communication at 9600 bits per second:
-  Serial.begin(115200);
-
-  }
-
-// the loop routine runs over and over again forever:
-void loop() {
-  // read the input pin:
-  //int buttonState = digitalRead(pushButton);
-  // print out the state of the button:
-  Serial.print("{");
-  Serial.print("    \"GPS data\": \"textstring\",");
-  
-
-  Serial.print("    \"Timing\": ");
-  Serial.print(exacttime);
-  Serial.print(','); 
-  
-  Serial.print("    \"Energy\": {");
-  Serial.print("      \"Energy1\":[ ");
-  Serial.print(energy1);
-  Serial.print(',');
-    Serial.print(energy1);
-  Serial.print(',');
-    Serial.print(energy1);
-  Serial.print(',');
-    Serial.print(energy1);
-  Serial.print(',');
-    Serial.print(energy1);
-  Serial.print(',');
-    Serial.print(energy1);
-  Serial.print(',');
-    Serial.print(energy1);
-  Serial.print(',');
-    Serial.print(energy1);
-  Serial.print(',');
-    Serial.print(energy1);
-  Serial.print(',');
-    Serial.print(energy1);
-  Serial.print("],");  
-  Serial.print("      \"Energy2\":[ ");
-  Serial.print(energy2);
-  Serial.print(',');
-    Serial.print(energy2);
-  Serial.print(',');
-    Serial.print(energy2);
-  Serial.print(',');
-    Serial.print(energy2);
-  Serial.print(',');
-    Serial.print(energy2);
-  Serial.print(',');
-    Serial.print(energy2);
-  Serial.print(',');
-    Serial.print(energy2);
-  Serial.print(',');
-    Serial.print(energy2);
-  Serial.print(',');
-    Serial.print(energy2);
-  Serial.print(',');
-    Serial.print(energy2);    
-  Serial.print(']');
-    Serial.print("    },");
-
-  Serial.print("    \"Altitude\": "); 
-  Serial.print(altitudereal);
-  Serial.print(",");
-
-  Serial.print("    \"Humidity\": "); 
-  Serial.print(humidity);
-  Serial.print(",");
-
-  Serial.print("    \"GravitationalOrientation\": {"); 
-  Serial.print("     \"Xaxis\": ");
-  Serial.print(xgrav);
-  Serial.print(",");
-  Serial.print("     \"Yaxis\": ");
-  Serial.print(ygrav);
-  Serial.print(",");
-  Serial.print("     \"Zaxis\": ");
-  Serial.print(zgrav);
-//  Serial.print();
-  Serial.print("    },");  
-
-  Serial.print("    \"MagneticOrientation\": {"); 
-  Serial.print("     \"Xaxis\": ");
-  Serial.print(mxgrav);
-  Serial.print(",");
-  Serial.print("     \"Yaxis\": ");
-  Serial.print(mygrav);
-  Serial.print(",");
-  Serial.print("     \"Zaxis\": ");
-  Serial.print(mzgrav);
-//  Serial.print();
-  Serial.print("    },");
-
-  Serial.print("    \"Temperature\": {"); 
-  Serial.print("     \"Temperature1\": ");
-  Serial.print(tempval1);
-  Serial.print(",");
-  Serial.print("     \"Temperature2\": ");
-  Serial.print(tempval2);
-  //Serial.print();
-  Serial.print("    },");
-
-
-  Serial.print("    \"DeviceUptime\": "); 
-  Serial.print(uptime);
-  Serial.print(",");
-  
-  Serial.print("    \"DeviceID\": "); 
-  Serial.print(deviceid);
-//  Serial.print();
-
-  Serial.println("}");
-
-  
-  //increment and modify things
-  gpstime++;
-  exacttime++;
-  energy1= energy1 + random(-100,100);
-  energy2= energy2 + random(-100,100);
-  altitudereal = altitudereal + random(-10,10);
-  humidity=random(60,70);
-  uptime++;
-  
-  delay(1);        // delay in between reads for stability
-}
-
-
+{    "gps": "textstring",    "timing": 681,    "energy": {      "channel1":[ 19614,19614,19614,19614,19614,19614,19614,19614,19614,19614],      "channel2":[ 20792,20792,20792,20792,20792,20792,20792,20792,20792,20792]    },    "altitude": 2684,    "humidity": 64,    "gravitationalOrientation": {     "x": 0,     "y": 6,     "z": 9    },    "magneticOrientation": {     "x": 2,     "y": 7,     "z": 7    },    "temperature": {     "value1": 32,     "value2": 33    },    "uptime": 147,    "id": 4709}