Changeset aa88f6bfe2213cb789db012c39cb68a26916e4f1

Show
Ignore:
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:
4 modified

Legend:

Unmodified
Added
Removed
  • src/Device/Driver/Condor.cpp

    r959be8 raa88f6  
    4040#include "Device/Internal.hpp" 
    4141#include "Protection.hpp" 
    42 #include "Math/Units.h" 
     42#include "Units.hpp" 
    4343#include "Device/Parser.hpp" 
    4444#include "NMEA/Info.hpp" 
     
    141141 
    142142  NMEAParser::ExtractParameter(String,ctemp,1); 
    143   fixed airspeed(_tcstod(ctemp, NULL) / TOKPH); 
     143  fixed airspeed(Units::ToSysUnit(_tcstod(ctemp, NULL), unKiloMeterPerHour)); 
    144144 
    145145  NMEAParser::ExtractParameter(String,ctemp,2); 
  • src/Device/Driver/LX.cpp

    r959be8 raa88f6  
    4141#include "Device/Parser.hpp" 
    4242#include "Protection.hpp" 
    43 #include "Math/Units.h" 
     43#include "Units.hpp" 
    4444#include "NMEA/Info.hpp" 
    4545 
     
    130130 
    131131  NMEAParser::ExtractParameter(String, ctemp, 1); 
    132   fixed airspeed(_tcstod(ctemp, NULL) / TOKPH); 
     132  fixed airspeed(Units::ToSysUnit(_tcstod(ctemp, NULL), unKiloMeterPerHour)); 
    133133 
    134134  NMEAParser::ExtractParameter(String, ctemp, 2); 
  • src/Dialogs/dlgWindSettings.cpp

    r0d4cdd raa88f6  
    9191  switch(Mode){ 
    9292    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))); 
    9594      Sender->Set(Units::ToUserWindSpeed(XCSoarInterface::Basic().wind.norm)); 
    9695    break; 
  • src/Math/Units.h

    r4e12fa raa88f6  
    4343 
    4444#define TOMPH   (double)2.237 
    45 #define TOKPH   (double)3.6 
    4645 
    4746#endif