Revision 1:7908d7196d1e, committed 2019-03-20

Comitter:

sliackystefan

Date:

Wed Mar 20 11:17:37 2019 +0000

Parent:

0:8f2e256775d7

Commit message:

aaa

Changed in this revision

--- a/GPS.cpp	Mon May 04 03:41:27 2015 +0000
+++ b/GPS.cpp	Wed Mar 20 11:17:37 2019 +0000
@@ -26,6 +26,8 @@
     //_gps.baud(4800);
     longitude = 0.0;
     latitude = 0.0;
+    longitudeA = 0.0;
+    latitudeB = 0.0;
 }
 
 int GPS::sample() {
@@ -63,6 +65,7 @@
 
         */
        // if (sscanf(msg, "GPGGA,%f,%f,%c,%f,%c,%*d,%*d, %*f,%*f,%*f,%*f,%*f,%*f,%d ", &time, &latitude, &ns, &longitude, &ew, &lock) >= 1) {
+        //fgets(msg, 256, stdin);
         if(sscanf(msg, "GPGGA,%f,%f,%c,%f,%c,%d", &time, &latitude, &ns, &longitude, &ew, &lock) >= 1) { 
 
             if (!lock) 
@@ -80,12 +83,14 @@
                 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 ); //degrees = trunc(longitude / 100.0f * 0.01f);
-                minutes = longitude - (degrees * 100.0f);
-                longitude = degrees + minutes / 60.0f;
+                longitudeA = longitude / 100.000f;
+                latitudeB = latitude / 100.000f;
+                float degrees = trunc(latitude / 100.000f);
+                float minutes = latitude - (degrees * 100.000f);
+                latitude = degrees + minutes / 60.000f;
+                 degrees = trunc(longitude / 100.000f ); //degrees = trunc(longitude / 100.0f * 0.01f);
+                minutes = longitude - (degrees * 100.000f);
+                longitude = degrees + minutes / 60.000f;
                 utc=time;
                 return 1;
             }
@@ -95,13 +100,13 @@
 }
 
 float GPS::trunc(float v) {
-    if (v < 0.0) {
+   /* if (v < 0.0) {
         v*= -1.0;
         v = floor(v);
         v*=-1.0;
     } else {
         v = floor(v);
-    }
+    }*/
     return v;
 }
 

--- a/GPS.h	Mon May 04 03:41:27 2015 +0000
+++ b/GPS.h	Wed Mar 20 11:17:37 2019 +0000
@@ -1,36 +1,11 @@
-/* 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:
-
-    /** Create the GPS interface, connected to the specified serial port
-     */    
+  
     GPS(PinName tx, PinName rx);
     
     /** Sample the incoming GPS data, returning whether there is a lock
@@ -45,6 +20,9 @@
     /** The latitude (call sample() to set) */
     float latitude;
     
+    float longitudeA ;
+    float latitudeB ;
+    
     /** The UTC time */
     float utc;