Changeset aa88f6bfe2213cb789db012c39cb68a26916e4f1
- Timestamp:
- 02/23/10 12:30:37 (5 months ago)
- Author:
- Tobias Bieniek <Tobias.Bieniek@…>
- git-author:
- Tobias Bieniek <Tobias.Bieniek@gmx.de> / 2010-02-23T10:17:42Z+0100
- Parents:
- 4e12fa19ed512ec4add929770f820c4f4ac99dd0
- Children:
- 30d7cf07c92af28b648f558c4bc289b242abd38b
- git-committer:
- Tobias Bieniek <Tobias.Bieniek@gmx.de> / 2010-02-23T10:30:37Z+0100
- Message:
-
Math/Units: Removed TOKPH #define
- Location:
- src
- Files:
-
Legend:
- Unmodified
- Added
- Removed
-
|
r959be8
|
raa88f6
|
|
| 40 | 40 | #include "Device/Internal.hpp" |
| 41 | 41 | #include "Protection.hpp" |
| 42 | | #include "Math/Units.h" |
| | 42 | #include "Units.hpp" |
| 43 | 43 | #include "Device/Parser.hpp" |
| 44 | 44 | #include "NMEA/Info.hpp" |
| … |
… |
|
| 141 | 141 | |
| 142 | 142 | NMEAParser::ExtractParameter(String,ctemp,1); |
| 143 | | fixed airspeed(_tcstod(ctemp, NULL) / TOKPH); |
| | 143 | fixed airspeed(Units::ToSysUnit(_tcstod(ctemp, NULL), unKiloMeterPerHour)); |
| 144 | 144 | |
| 145 | 145 | NMEAParser::ExtractParameter(String,ctemp,2); |
-
|
r959be8
|
raa88f6
|
|
| 41 | 41 | #include "Device/Parser.hpp" |
| 42 | 42 | #include "Protection.hpp" |
| 43 | | #include "Math/Units.h" |
| | 43 | #include "Units.hpp" |
| 44 | 44 | #include "NMEA/Info.hpp" |
| 45 | 45 | |
| … |
… |
|
| 130 | 130 | |
| 131 | 131 | NMEAParser::ExtractParameter(String, ctemp, 1); |
| 132 | | fixed airspeed(_tcstod(ctemp, NULL) / TOKPH); |
| | 132 | fixed airspeed(Units::ToSysUnit(_tcstod(ctemp, NULL), unKiloMeterPerHour)); |
| 133 | 133 | |
| 134 | 134 | NMEAParser::ExtractParameter(String, ctemp, 2); |
-
|
r0d4cdd
|
raa88f6
|
|
| 91 | 91 | switch(Mode){ |
| 92 | 92 | case DataField::daGet: |
| 93 | | /// @todo TOKPH shouldn't be here... |
| 94 | | Sender->SetMax(Units::ToUserWindSpeed(200.0/TOKPH)); |
| | 93 | Sender->SetMax(Units::ToUserWindSpeed(Units::ToSysUnit(200.0, unKiloMeterPerHour))); |
| 95 | 94 | Sender->Set(Units::ToUserWindSpeed(XCSoarInterface::Basic().wind.norm)); |
| 96 | 95 | break; |
-
|
r4e12fa
|
raa88f6
|
|
| 43 | 43 | |
| 44 | 44 | #define TOMPH (double)2.237 |
| 45 | | #define TOKPH (double)3.6 |
| 46 | 45 | |
| 47 | 46 | #endif |