Diff: tcpTests.cpp

Revision:

16:a7902d75bef3

Parent:

15:56ec0751ca71

--- a/tcpTests.cpp	Fri Jun 20 06:52:48 2014 +0000
+++ b/tcpTests.cpp	Fri Jun 20 07:35:49 2014 +0000
@@ -45,9 +45,9 @@
 //TMP102 temperature(P0_5, P0_4, 0x90); //A0 pin is connected to ground
 // Turn on and initalise the sensor
 
-I2C i2c(P0_5, P0_4);       // sda, scl
+//I2C i2c(P0_5, P0_4);       // sda, scl
 //Serial pc(USBTX, USBRX); // tx, rx
-MPL3115A2 sensor(&i2c);
+//MPL3115A2 sensor(&i2c);
 // ------------------------------------------------------------------------------------------------------------
 /*!
     @Post Pressure and Temperature Values to website
@@ -55,9 +55,13 @@
 // ------------------------------------------------------------------------------------------------------------
 void TempTest (void)
 {
-float tempt = 0;
-float pressure = 0;
-float random = 0; 
+I2C i2c(P0_5, P0_4);       // sda, scl
+
+MPL3115A2 sensor(&i2c);
+
+//float tempt = 0;
+//float pressure = 0;
+//float random = 0; 
 pc.printf("** MPL3115A2 SENSOR **\r\n");
 
 sensor.init();
@@ -86,7 +90,7 @@
         pc.printf("Altitude: %sM, Temp: %sºC, Pressure: %sPa\r\n", a.print(), t.print(), p.print());
      //   pc.printf("OFF_H: 0x%X, OFF_T: 0x%X, OFF_P: 0x%X\r\n", sensor.offsetAltitude(), sensor.offsetTemperature(), sensor.offsetPressure());
     
-        wait(1);
+        wait(600);
  
         sensor.setModeStandby();
         sensor.setModeAltimeter();
@@ -97,16 +101,16 @@
         pc.printf( "%05d\r\nTEMP, %.1f\r\n\0", tempt);
        // HTTP POST Test
        
-        random +=1;
+        random +=1; */
         HTTPMap map;
         HTTPText inText(tmpBuffer, 512);
        
-        char buffer[50];
-        sprintf (buffer, "%.1f", tempt);
+        //char buffer[50];
+        //sprintf (buffer, "%.1f", tempt);
     
-        map.put("Temperature", buffer);
+        map.put("Temperature", t.print());
         //map.put("test", "1234");
-        pc.printf(" \r\nTrying to post data.. %0.1f \r\n", tempt);
+        pc.printf(" \r\nTrying to post data.. %0.1f \r\n", t.print());
         int ret = http.post("http://markirwin.herokuapp.com/readings", map, &inText);
         if (!ret)
         {
@@ -119,8 +123,6 @@
         }
  
         wait_ms(1000);
-        */
-        
         
         if ( pc.readable() )
         {