Revision 3:8ad6d84b1b60, committed 2017-06-09

Comitter:

NicolasV

Date:

Fri Jun 09 19:37:02 2017 +0000

Parent:

2:8d7c7165ffe2

Commit message:

Tarea 6: Procesadores;

Changed in this revision

--- a/GPS.cpp	Mon Apr 27 02:08:24 2015 +0000
+++ b/GPS.cpp	Fri Jun 09 19:37:02 2017 +0000
@@ -1,25 +1,3 @@
-/* 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) {
@@ -30,50 +8,50 @@
 
 int GPS::sample() {
     float time;
+    float deg_lat, deg_lon, min_lat, min_lon;
     char ns, ew;
     int lock;
 
-    while(1) {        
+    while(true) {        
         getline();
-      //$GPGGA,123519,4807.038,N,01131.000,E,1,08,0.9,545.4,M,46.9,M,,*47
-        // 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) {   //si lock es 1  hay lecturas ok
+            if(!lock) {
                 longitude = 0.0;
                 latitude = 0.0;        
                 return 0;
             } 
-                else {
-                if(ns == 'S') {    latitude  *= -1.0; }
-                if(ew == 'W') {    longitude *= -1.0; }
-                latitude = (latitude / 100.0f);
-                //float minutes = latitude - (degrees * 100.0f);
-                //latitude = degrees + minutes / 60.0f;    
+            else {
+                if(ns == 'S') {     latitude  *= -1.0; }
+                if(ew == 'W') {     longitude *= -1.0; }
+                latitude = (latitude / 100.0f);   
                 longitude = (longitude / 100.0f);
-                //minutes = longitude - (degrees * 100.0f);
-                //longitude = degrees + minutes / 60.0f;
-                
+                deg_lat = trunc(latitude);
+                deg_lon = trunc(longitude);
+                min_lat = (latitude - deg_lat);
+                min_lon = (longitude - deg_lon);
+                latitude = deg_lat + min_lat / 60.0f * 100.0f;
+                longitude = deg_lon + min_lon / 60.0f * 100.0f;
                 return 1;
             }
         }
     }
 }
 
-/*
 float GPS::trunc(float v) {
     if(v < 0.0) {
         v*= -1.0;
         v = floor(v);
         v*=-1.0;
-    } else {
+    }
+    else {
         v = floor(v);
     }
     return v;
 }
-*/
+
 void GPS::getline() {
-    while(_gps.getc() != '$');    // wait for the start of a line
-    for(int i=0; i<256; i++) {
+    while(_gps.getc() != '$');
+    for(int i = 0; i < 256; i++) {
         msg[i] = _gps.getc();
         if(msg[i] == '\r') {
             msg[i] = 0;

--- a/GPS.h	Mon Apr 27 02:08:24 2015 +0000
+++ b/GPS.h	Fri Jun 09 19:37:02 2017 +0000
@@ -1,31 +1,7 @@
-/* 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 "mbed.h"
-
 #ifndef MBED_GPS_H
 #define MBED_GPS_H
 
-/**  A GPS interface for reading from a Globalsat EM-406 GPS Module */
 class GPS {
 public: