Diff: Get.cpp

Revision:

25:30966ed7f7e8

Parent:

20:a820531c78bc

Child:

27:1be1f25be449

--- a/Get.cpp	Thu Sep 10 00:09:31 2015 +0000
+++ b/Get.cpp	Thu Sep 10 17:40:48 2015 +0000
@@ -1,98 +1,53 @@
 #include "Config.h"
 
 
-string getIMU_Y() {
-    return IMU_Y;
-}
-
-string getIMU_P() {
-    return IMU_P;
-}
-
-string getIMU_R() {
-    return IMU_R;
-}
-
-string getGPS_Quality() {
-    return GPS_Quality;
-}
-
-string getGPS_UTC() {
-    return GPS_UTC;
-}
-
-string getGPS_Latitude() {
-    return GPS_Latitude;
-}
-
-string getGPS_Longtitude() {
-    return GPS_Longtitude;
-}
-
-string getGPS_Altitude() {
-    return GPS_Altitude;
-}
-
-string getGPS_Num_Satellite() {
-    return GPS_Num_Satellite;
-}
-
-string getGPS_HDOP() {
-    return GPS_HDOP;
-}
-
-string getGPS_VDOP() {
-    return GPS_VDOP;
-}
-
-string getGPS_PDOP() {
-    return GPS_PDOP;
-}
-
-string getGPS_Date() {
-    return GPS_Date;
-}
-
-string getGPS_VelocityKnot() {
-    return GPS_VelocityKnot;
-}
-
-string getGPS_VelocityKph() {
-    return GPS_VelocityKph;
-}
-    
 string decodeCommandGET(string cmd) {
     if (cmd == "IMU_Y") {
-        return(getIMU_Y());
+        return(IMU_Y);
     } else if (cmd == "IMU_P") {
-        return(getIMU_P());
+        return(IMU_P);
     } else if (cmd == "IMU_R") {
-        return(getIMU_R());
+        return(IMU_R);
     } else if (cmd == "GPS_Quality") {
-        return(getGPS_Quality());
+        return(GPS_Quality);
     } else if (cmd == "GPS_UTC") {
-        return(getGPS_UTC());
+        return(GPS_UTC);
     } else if (cmd == "GPS_Latitude") {
-        return(getGPS_Latitude());
+        return(GPS_Latitude);
     } else if (cmd == "GPS_Longtitude") {
-        return(getGPS_Longtitude());
+        return(GPS_Longtitude);
     } else if (cmd == "GPS_Altitude") {
-        return(getGPS_Altitude());
+        return(GPS_Altitude);
     } else if (cmd == "GPS_Num_Satellite") {
-        return(getGPS_Num_Satellite());
+        return(GPS_Num_Satellite);
     } else if (cmd == "GPS_HDOP") {
-        return(getGPS_HDOP());
+        return(GPS_HDOP);
     } else if (cmd == "GPS_VDOP") {
-        return(getGPS_VDOP());
+        return(GPS_VDOP);
     } else if (cmd == "GPS_PDOP") {
-        return(getGPS_PDOP());
+        return(GPS_PDOP);
     } else if (cmd == "GPS_Date") {
-        return(getGPS_Date());
+        return(GPS_Date);
     } else if (cmd == "GPS_VelocityKnot") {
-        return(getGPS_VelocityKnot());
+        return(GPS_VelocityKnot);
     } else if (cmd == "GPS_VelocityKph") {
-        return(getGPS_VelocityKph());
+        return(GPS_VelocityKph);
     } else {
         return("Not valid command, example: @GET=GPS_Quality");
     }
+}
+
+double getDistance(int task_id) {
+    double cur_Latitude = D_GPS_Latitude;
+    double cur_Logntitude = D_GPS_Longtitude;
+    double dest_Latitude = Latitude_Path[task_id-1];
+    double dest_Longtitude = Longtitude_Path[task_id-1];
+
+
+
+
+
+
+
+
 }
\ No newline at end of file