Diff: main.cpp

Revision:

3:b0a68b7daedb

Parent:

2:cc9dffa51350

Child:

4:e0e55d90dbae

--- a/main.cpp	Thu Apr 05 23:40:03 2018 +0000
+++ b/main.cpp	Fri Apr 06 16:55:48 2018 +0000
@@ -9,7 +9,11 @@
 DigitalOut myled(LED1);
 MPL3115A2 pressure_sensor(PB_7,PB_6,0x60);
 
-//This program will be called when the python script tells it to
+//This program will be called when an s is typed
+//in screen
+
+//This program will ultimately call itself every hour
+
 
 int main()
 {
@@ -24,45 +28,57 @@
     }
     else
         pc.printf("Nope#1\n\r"); 
-    if(at.send("AT+NI=1,MTCDT-19400691") 
-        && at.recv("Set Network Name: MTCDT-19400691")
-        /*&& at.recv("\n\r")*/
-        && at.recv("OK"))
+    if(at.send("AT+NI=1,MTCDT-19400691") && 1) 
         pc.printf("Bueno#2\n\r");
     else  
-        pc.printf("Nope#2\n\r");
-    /*
-    if(at.send("AT+NK=1,MTCDT-19400691")
-        && at.recv("Set Network Passphrase: MTCDT-19400691")
-        && at.recv("\n\r")
-        && at.recv("OK"))
+       pc.printf("Nope#2\n\r");
+    if(at.send("AT+NK=1,MTCDT-19400691") && 1)
+        //&& at.recv("Set Network Passphrase: MTCDT-19400691")
+        //&& at.recv("\n\r")
+        //&& at.recv("OK"))
         pc.printf("Bueno #3\n\r");
     else
         pc.printf("Nope #3\n\r");
-    if(at.send("AT+FSB=1") && at.recv("\n\r") 
-        && at.recv("OK"))
+    if(at.send("AT+FSB=1") && 1)
         pc.printf("Bueno #4\n\r");
     else
         pc.printf("Nope #4\n\r");
-    //If in doubt try \r\n (found in library)
-    if(at.send("AT+JOIN")
-    && at.recv("Successfully joined network\n\rOK")
+    if(at.send("AT+JOIN")&& 1)
         pc.printf("Bueno #5\n\r");
     else
         pc.printf("Nope #5\n\r");
-    char devID[23];
-    if(at.send("AT+DI") && at.recv("%s\n\rOK", devID))
+    
+    char devID[24];
+    if(at.send("AT+DI") && at.recv("%s\r\n\r\nOK", &devID))
         pc.printf("Bueno#6\n\r");
     else
         pc.printf("Nope #6\n\r");
-    */
-    
+        
     double pressure = pressure_sensor.getPressure();
-    double altitude = pressure_sensor.getAltitude();
     double temperature = pressure_sensor.getTemperature();
-    //subscribe to 
-    //Write these 3 numbers to device (xdot)
-    //have xdot publish these to the server     
+    
+    
+    pc.printf("temp = %lf\n\r", temperature);
+    pc.printf("pressure = %lf\n\r", pressure);
+    
+    char temp[9];
+    char press[10];
+    
+    int n;
+    
+    n = sprintf(temp, "%lf", temperature);
+    n = sprintf(press, "%lf", pressure);
+    pc.printf("It worked: %s\n\r", press);
+    /*
+    if(at.send("AT+SEND=\"%s\"", temp) && 1)
+        pc.printf("Bueno #7\n\r");
+    else
+        pc.printf("Nope #7\n\r");
+    */
+    if(at.send("AT+SEND=\"%s\"",press) && 1)
+        pc.printf("Bueno #9\n\r");
+    else
+        pc.printf("Nope #9\n\r");
     while(1);
 }