Diff: main.cpp

Revision:

16:2b2f2a3bde5a

Parent:

15:41e3e4613e34

Child:

17:726bbc1b73ee

--- a/main.cpp	Tue Sep 30 18:43:42 2014 +0000
+++ b/main.cpp	Wed Oct 01 08:47:54 2014 +0000
@@ -4,27 +4,40 @@
 #include "MDM.h"
 
 int main() {
-    printf("Hello here is the position: ");
+    
+    Timer programTimer;
+    
+    programTimer.start();
     struct gps_data_t gps_data;
-    gps_locate(&gps_data);
-    printf("https://maps.google.com/?q=%.5f,%.5f\n", gps_data.la, gps_data.lo);
+    if(gps_locate(&gps_data)) {
+        printf("Hello here is the position: ");
+        printf("https://maps.google.com/?q=%.5f,%.5f\r\n", gps_data.la, gps_data.lo);
+    }
     
     MDMSerial mdm;
     init_sms_features(&mdm);
 
     struct sms_data_t sms; 
-    sms.phone_num = "+41774084185";
+    sms.phone_num = "+41763211792";
     sms.msg_buf = "Je suis une carte u-blox. Tu veux etre mon ami ?";
-    printf("Now I will send a SMS\n");
+    printf("Now I will send a SMS\r\n");
     send_sms(&sms);
     
+    printf("And then wait to receive one\r\n");
     char buf1[32];
     char buf2[256];
     sms.phone_num = buf1;
     sms.msg_buf = buf2;
-
-    while(!read_sms(&sms));
-    printf("Received sms from %s:\n%s\n", sms.phone_num, sms.msg_buf); 
-    printf("End");
+    Timer smsTimer;
+    smsTimer.start();
+    while(smsTimer.read() < 40) {
+        if(read_sms(&sms)) {
+            printf("Received sms from %s:\r\n%s\r\n", sms.phone_num, sms.msg_buf);
+            break;
+        }
+    } 
+    
+    programTimer.stop();
+    printf("Program time: %f seconds\r\n", programTimer.read());
     return 0;
 }
\ No newline at end of file