Revision 2:addb687a4e73, committed 2016-03-11

Comitter:

pierrick

Date:

Fri Mar 11 10:25:05 2016 +0000

Parent:

1:f24af888e699

Commit message:

GPS for IUT

Changed in this revision

diff -r f24af888e699 -r addb687a4e73 GPS.cpp
--- a/GPS.cpp	Fri Mar 11 10:18:09 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/* mbed EM-406 GPS Module Library
- * Copyright (c) 2008-2010, sford
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
- 
-#include "GPS.h"
-
-GPS::GPS(PinName tx, PinName rx) : _gps(tx, rx) {
-    _gps.baud(4800);    
-    longitude = 0.0;
-    latitude = 0.0;        
-}
-
-int GPS::sample() {
-    float time;
-    char ns, ew;
-    int lock;
-
-    while(1) {        
-        getline();
-        //printf("long= %f %c  latitude= %f %c\n",&longitude, &ew, &latitude, &ns);
-        // Check if it is a GPGGA msg (matches both locked and non-locked msg)
-        if(sscanf(msg, "GPGGA,%f,%f,%c,%f,%c,%d", &time, &latitude, &ns, &longitude, &ew, &lock) >= 1) { 
-            if(!lock) {
-                longitude = 0.0;
-                latitude = 0.0;       
-                return 0;
-            } else {
-                if(ns == 'S') {    latitude  *= -1.0; }
-                if(ew == 'W') {    longitude *= -1.0; }
-                float degrees = trunc(latitude / 100.0f);
-                float minutes = latitude - (degrees * 100.0f);
-                latitude = degrees + minutes / 60.0f;    
-                degrees = trunc(longitude / 100.0f * 0.01f);
-                minutes = longitude - (degrees * 100.0f);
-                longitude = degrees + minutes / 60.0f;
-                return 1;
-            }
-        }
-    }
-}
-
-float GPS::trunc(float v) {
-    if(v < 0.0) {
-        v*= -1.0;
-        v = floor(v);
-        v*=-1.0;
-        puts("3\n");
-    } else {
-        v = floor(v);
-        puts("4\n");
-    }
-    return v;
-}
-
-void GPS::getline() {
-    while(_gps.getc() != '$');    // wait for the start of a line
-    //for(int i=0; i<256; i++) {
-    for(int i=0; i<512; i++) {
-        msg[i] = _gps.getc();
-        if(msg[i] == '\r') {
-            msg[i] = 0;
-            return;
-        }
-    }
-    error("Overflowed message limit");
-}

diff -r f24af888e699 -r addb687a4e73 main.cpp
--- a/main.cpp	Fri Mar 11 10:18:09 2016 +0000
+++ b/main.cpp	Fri Mar 11 10:25:05 2016 +0000
@@ -1,14 +1,11 @@
 #include "mbed.h"
-//#include "GPS.h"
 #include <Serial.h>
 #include "getline.h"
-#include <math.h>
-//#include "stream.h"
- 
+
 Serial pc(USBTX, USBRX);
 //GPS gps(p13, p14);
  
-Serial uart1(p13, p14);
+Serial uart1(p13, p14); //pin RX et TX du GPS
 char c;
  int event_callback_t ;
         int     event;
@@ -23,35 +20,30 @@
     char ns, ew;
     int lock;
 int main() {
-    uart1.baud(9600);
-    printf("hello\n");
+    uart1.baud(9600);   //vitesse de transmission de informations
+    printf("hello\n");  //test
     while (1){
         if (uart1.readable())
          {
                 
              getline(uart1,msg,999);
-            // pc.printf("\n %s",msg);
-      //pc.printf("long= %f %c  latitude= %f %c\n",&longitude, &ew, &latitude, &ns);
-        // Check if it is a GPGGA msg (matches both locked and non-locked msg)
             if ( sscanf(msg, "$GPGGA,%f,%f,%c,%f,%c,%d", &time2, &latitude, &ns, &longitude, &ew, &lock )>=1)
             {          
                 if(!lock) {
-                longitude = 0.0;
-                latitude = 0.0; 
-                pc.printf("long= %f %c  latitude= %f %c\n",&longitude, &ew, &latitude, &ns);   
-                //return 0;
+                    longitude = 0.0;
+                    latitude = 0.0; 
+                    pc.printf("long= %f %c  latitude= %f %c\n",&longitude, &ew, &latitude, &ns);   
                 } else {
-                if(ns == 'S') {    latitude  *= -1.0; }
-                if(ew == 'W') {    longitude *= -1.0; }
-                float degrees =(latitude / 100.0f);
-                float minutes = latitude - (degrees * 100.0f);
-                latitude = degrees + minutes / 60.0f;    
-                degrees = (longitude / 100.0f * 0.01f);
-                minutes = longitude - (degrees * 100.0f);
-                longitude = degrees + minutes / 60.0f;
-                printf("time = %f \n", time2);
-                pc.printf("long= %f %c  latitude= %f %c\n",longitude, ew, latitude, ns);
-                //return 1;
+                    if(ns == 'S') {    latitude  *= -1.0; }
+                    if(ew == 'W') {    longitude *= -1.0; }
+                    float degrees =(latitude / 100.0f);
+                    float minutes = latitude - (degrees * 100.0f);
+                    latitude = degrees + minutes / 60.0f;    
+                    degrees = (longitude / 100.0f * 0.01f);
+                    minutes = longitude - (degrees * 100.0f);
+                    longitude = degrees + minutes / 60.0f;
+                    pc.printf("time = %f \n", time2);
+                    pc.printf("long= %f %c  latitude= %f %c\n",longitude, ew, latitude, ns);
               }//end else
            }//end if
         }//end if