 EthernetClient client;
 
 String currentSensorId = TEMPERATURESENSOR_ID;
-<<<<<<< HEAD:files/template.ino
-float temperature;
-float humidity;
-float pressure;
-unsigned long  lux;
-int analogNoise;
-int uvValue;
-=======
 float temperature, humidity, pressure;
 int analogNoise, analogLight;
->>>>>>> d9865cb6c3dc6543253fc1c85805d10c0e4ef2d4:files/template_home/template_home_2014/template_home_2014.ino
 
 DHT dht(DHTPIN, DHTTYPE);
 Barometer barometer;

      case 1:
        //temperature = dht.readTemperature();
        temperature = barometer.bmp085GetTemperature(barometer.bmp085ReadUT());
<<<<<<< HEAD:files/template.ino
        sensorSample = floatToString(temperature,0);
=======
        sensorSample = floatToString(temperature,1);
>>>>>>> d9865cb6c3dc6543253fc1c85805d10c0e4ef2d4:files/template_home/template_home_2014/template_home_2014.ino
        currentSensorId = TEMPERATURESENSOR_ID;
        break;
      case 2:

        currentSensorId = NOISESENSOR_ID;
        break;
      case 5:
        analogLight = analogRead(LIGHTPIN);
        sensorSample = (String)analogLight;
        currentSensorId = LIGHTSENSOR_ID;
        break;
    }
  }
  // if you're not already connected, and 60 seconds have passed since
  // your last connection, then connect again and send data:
  uploadSuccess = false;
  if(!client.connected() && (millis() - lastConnectionTime > postingInterval)) {
    Serial.println("-----------------------------------");
    Serial.print("Connecting and posting sensor sample (case ");
    Serial.print(sampleType);
    Serial.print(")...");
    Serial.println();
    postObservation(sensorSample, currentSensorId, SENSEBOX_ID);
  }
  // store the state of the connection for next time through the loop
