Changeset 75ce382c6dc81194e0ed05466be9056fe8a63d26

Timestamp:

02/23/10 12:27:28 (5 months ago)

Author:

Tobias Bieniek <Tobias.Bieniek@…>

git-author:

Tobias Bieniek <Tobias.Bieniek@gmx.de> / 2010-02-22T19:26:49Z+0100

Parents:

7f6214ec9e1584977d2073b7eb9ad14695fa8a17

Children:

6ce1136e2f8aefa03e06d23ec562dbb829a5b763

git-committer:

Tobias Bieniek <Tobias.Bieniek@gmx.de> / 2010-02-23T10:27:28Z+0100

Message:

Math/Units: Removed TOFEET #define

Location:

src

Files:

• AirspaceParser.cpp (modified) (3 diffs)
• Device/Driver/AltairPro.cpp (modified) (2 diffs)
• Device/Parser.cpp (modified) (2 diffs)
• Math/Units.h (modified) (1 diff)

src/AirspaceParser.cpp

@@ -599 +599 @@
     else if ((_tcscmp(pToken, TEXT("FT")) == 0)
              || (_tcscmp(pToken, TEXT("F")) == 0)){
-      Alt->Altitude = Alt->Altitude/TOFEET;
+      Alt->Altitude = Units::ToSysUnit(Alt->Altitude, unFeet);
       fHasUnit = true;
     }
@@ -623 +623 @@
       }
       Alt->Base = abFL;
-      Alt->FL = (Alt->Altitude * TOFEET) / 100;
+      Alt->FL = Units::ToUserUnit(Alt->Altitude, unFlightLevel);
     }
 
@@ -640 +640 @@
     // ToDo warning! no unit defined use feet or user alt unit
     // Alt->Altitude = Units::ToSysAltitude(Alt->Altitude);
-    Alt->Altitude = Alt->Altitude/TOFEET;
-    Alt->AGL = Alt->AGL/TOFEET;
+    Alt->Altitude = Units::ToSysUnit(Alt->Altitude, unFeet);
+    Alt->AGL = Units::ToSysUnit(Alt->AGL, unFeet);
   }
 

src/Device/Driver/AltairPro.cpp

@@ -41 +41 @@
 #include "Math/Units.h"
 #include "NMEA/Info.hpp"
+#include "Units.hpp"
 
 #include <tchar.h>
@@ -90 +91 @@
 
     if (*String == 'f' || *String== 'F')
-      lastAlt /= TOFEET;
+      lastAlt = Units::ToSysUnit(lastAlt, unFeet);
 
     if (enable_baro) {

src/Device/Parser.cpp

@@ -332 +332 @@
 
   if (format[0] == _T('f') || format[0] == _T('F'))
-    alt /= TOFEET;
+    alt = Units::ToSysUnit(alt, unFeet);
 
   return alt;
@@ -957 +957 @@
   double wnet, baralt, vtas;
 
-  wnet = (_tcstod(params[0], NULL) - 200) / (10 * TOKNOTS);
-  baralt = max(0.0, (_tcstod(params[2], NULL) - 2000) / TOFEET);
-  vtas = _tcstod(params[3], NULL) / TOKNOTS;
+  wnet = Units::ToSysUnit((_tcstod(params[0], NULL) - 200) * 0.1, unKnots);
+  baralt = max(0.0, Units::ToSysUnit(_tcstod(params[2], NULL) - 2000, unFeet));
+  vtas = Units::ToSysUnit(_tcstod(params[3], NULL), unKnots);
 
   GPS_INFO->AirspeedAvailable = true;

src/Math/Units.h

@@ -50 +50 @@
 #define TOMILES         (double)0.0006214
 #define TOKILOMETER     (double)0.001
-#define TOFEET          (double)3.281
 
 #endif