 const double smallR = 1.8;
 const int bigR = 18;
 
-void displaySensorDetails(void)
-{
-  sensor_t sensor;
-  accel.getSensor(&sensor);
-  /*Serial.println("------------------------------------");
-  Serial.print  ("Sensor:       "); Serial.println(sensor.name);
-  Serial.print  ("Driver Ver:   "); Serial.println(sensor.version);
-  Serial.print  ("Unique ID:    "); Serial.println(sensor.sensor_id);
-  Serial.print  ("Max Value:    "); Serial.print(sensor.max_value); Serial.println(" m/s^2");
-  Serial.print  ("Min Value:    "); Serial.print(sensor.min_value); Serial.println(" m/s^2");
-  Serial.print  ("Resolution:   "); Serial.print(sensor.resolution); Serial.println(" m/s^2");  
-  Serial.println("------------------------------------");
-  Serial.println("");*/
-  delay(500);
-}
-
 void setup(void) {
   Serial.begin(9600);
-  /*Serial.println("Sensor Test");
-  Serial.println("");*/
-  
-  displaySensorDetails();
 
-  if (!bmp.begin() || !mag.begin() || !accel.begin())
-  {
+  if (!bmp.begin() || !mag.begin() || !accel.begin()) {
     Serial.print("Ooops, no BMP085 or LSM303 detected");
     while(1);
   }
 }
+
 void loop() {
-  
   sensors_event_t eventP;
   sensors_event_t eventM;
   sensors_event_t eventA;

    heading = 360 + heading; 
  }
  Serial.print("{");
  Serial.print("\"solarpanelcurrent\": ");  
  Serial.print(current*1000,6);
  Serial.print(", ");
  Serial.print("\"solarpanelpower\": ");  
  Serial.print(power,6);
  Serial.print(", ");
  Serial.print("\"pressure\": ");
  if (eventP.pressure)
  {
    Serial.print(eventP.pressure);
  }
  else
  {
    Serial.print("\"error\"");
  }
    Serial.print(", ");
  if (temperature)
  {
    Serial.print("\"temperature\": ");
    Serial.print(temperature);
  }
  else
  {
    Serial.println("\"error\"");
  }
  Serial.print(", ");
  Serial.print("\"compass\": ");
   if (heading)
  {
    Serial.print("[");
    Serial.print(eventM.magnetic.y);
    Serial.print(", ");
    Serial.print(eventM.magnetic.x);
    Serial.print(", ");
    Serial.print(heading);
    Serial.print("] ");
  }
  else
  {
    Serial.print("error");
  }
  Serial.print(", ");
  Serial.print("\"accelerometer\": ");
  if (1)
  {
    Serial.print("[");
    Serial.print(eventA.acceleration.x);
    Serial.print(",");
    Serial.print(eventA.acceleration.y);
    Serial.print(",");
    Serial.print(eventA.acceleration.z);
    Serial.print("]");
  }
  else
  {
    Serial.print("\"error\"");
  }
  Serial.print("}");  
   delay(1000);
  
}

#include <Wire.h>
#include <Adafruit_10DOF.h>
#include <Adafruit_Sensor.h>
#include <Adafruit_L3GD20_U.h>
#include <Adafruit_LSM303_U.h>
#include <Adafruit_BMP085_U.h>

Adafruit_BMP085_Unified bmp = Adafruit_BMP085_Unified(10085);
