Diff: GPS.h

Revision:

2:4ebd0e486b5a

Parent:

1:455c3e604c92

--- a/GPS.h	Sat Mar 30 08:11:26 2013 +0000
+++ b/GPS.h	Mon Aug 19 08:51:14 2013 +0000
@@ -14,20 +14,23 @@
      @return 1 if there was a lock when the sample was taken (and therefore .longitude and .latitude are valid), else 0
      */
     int sample();
-    float longitude,latitude,date,time,speed,altitude,long_masodperc,lati_masodperc;
-    int ev,ho,nap,ora,perc,masodperc,long_fok,long_perc,lati_fok,lati_perc;
-    char ns,ew,status,fok_jel;
+    float old_sz,old_h,tav,vit,start,delta_t;
+    struct data {
+     int ora,perc,masodperc;
+     char flag;
+     float szel;
+     char szb;
+     float hossz;
+     char hb;
+     float sebesseg;
+     float magassag;
+     int ev,honap,nap;
+    } poz;
+    float tavolsag(float h1,float sz1,float h2,float sz2);
     
 private:
     void getline();
-    int elso2(float d);
-    int kozepso2(float d);
-    int utolso2(float d);
-    int fok_szamol(float f);
-    int perc_szamol(float f);
-    float masodperc_szamol(float f);
     void nincs_adat();
-    void fokpercmasodperc();
        
     Serial _gps;
     char msg[256];