Changeset 447bfb2f214c07de968760f5ecd00351514d4456

Timestamp:

02/23/10 12:29:12 (5 months ago)

Author:

Tobias Bieniek <Tobias.Bieniek@…>

git-author:

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

Parents:

a9bd51a8a88f04980b6746b3c02dc8c49aab9d9a

Children:

4e12fa19ed512ec4add929770f820c4f4ac99dd0

git-committer:

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

Message:

Math/Units: Removed KNOTSTOMETRESSECOND #define

Location:

src

Files:

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

src/Device/Driver/CAI302.cpp

@@ -49 +49 @@
 #include "Device/Internal.hpp"
 #include "Protection.hpp"
-#include "Math/Units.h"
+#include "Units.hpp"
 #include "NMEA/Info.hpp"
 
@@ -196 +196 @@
   TCHAR  szTmp[32];
 
-  _stprintf(szTmp, _T("!g,m%d\r\n"), int(((MacCready * 10) / KNOTSTOMETRESSECONDS) + 0.5));
+  _stprintf(szTmp, _T("!g,m%d\r\n"), int(Units::ToUserUnit(
+      MacCready * 10, unKnots) + 0.5));
 
   port->WriteString(szTmp);
@@ -578 +579 @@
   NMEAParser::ExtractParameter(String,ctemp,7);
   GPS_INFO->TotalEnergyVarioAvailable = true;
-  GPS_INFO->TotalEnergyVario = ((_tcstod(ctemp, NULL) - 200.0) / 10.0)
-    * KNOTSTOMETRESSECONDS;
+  GPS_INFO->TotalEnergyVario = Units::ToSysUnit(
+      (_tcstod(ctemp, NULL) - 200.0) / 10.0, unKnots);
 
   NMEAParser::ExtractParameter(String,ctemp,10);
-  GPS_INFO->MacCready = (_tcstod(ctemp, NULL) / 10.0) * KNOTSTOMETRESSECONDS;
+  GPS_INFO->MacCready = Units::ToSysUnit(_tcstod(ctemp, NULL) / 10.0, unKnots);
   if (MacCreadyUpdateTimeout <= 0) {
   /// @todo: OLD_TASK device MC/bugs/ballast is currently not implemented, have to push MC to master

src/Device/Parser.cpp

@@ -584 +584 @@
   GPS_INFO->WaypointDistance = NAUTICALMILESTOMETRES * _tcstod(params[9], NULL);
   GPS_INFO->WaypointBearing = _tcstod(params[10], NULL);
-  GPS_INFO->WaypointSpeed = KNOTSTOMETRESSECONDS * _tcstod(params[11], NULL);
+  GPS_INFO->WaypointSpeed =  Units::ToSysUnit(_tcstod(params[11], NULL), unKnots);
   */
 
@@ -676 +676 @@
   }
 
-  GPS_INFO->GroundSpeed = KNOTSTOMETRESSECONDS * speed;
+  GPS_INFO->GroundSpeed = Units::ToSysUnit(speed, unKnots);
 
   if (GPS_INFO->GroundSpeed > fixed_one) {

src/Math/Units.h

@@ -41 +41 @@
 
 #define NAUTICALMILESTOMETRES (double)1851.96
-#define KNOTSTOMETRESSECONDS (double)0.5144
 
 #define TOKNOTS (double)1.944