refs #196, fixed wrong inits with ModeS instead of StateStdby (Transponder)

This commit is contained in:
Klaus Basan
2014-03-27 01:55:19 +01:00
parent 2c5b84beb4
commit bbb4ddbaef
3 changed files with 4 additions and 4 deletions

View File

@@ -53,7 +53,7 @@ namespace BlackMiscTest
CAircraft aircraft(CCallsign("DAMBZ"), CUser("123456", "Joe Pilot"), situation);
aircraft.setCom1System(CComSystem::getCom1System(122.8, 118.75));
aircraft.setCom2System(CComSystem::getCom2System(123.8, 124.00));
aircraft.setTransponder(CTransponder::getStandardTransponder(7000, CTransponder::ModeS));
aircraft.setTransponder(CTransponder::getStandardTransponder(7000, CTransponder::ModeC));
aircraft.setIcaoInfo(CAircraftIcao("B737", "L2J", "DLH", "FREIGHT", "CCDDFF"));
json = aircraft.toJson();

View File

@@ -628,14 +628,14 @@ namespace BlackCore
QString tn("transponder ");
tn.append(callsign.asString());
CTransponder::TransponderMode mode = CTransponder::ModeS;
CTransponder::TransponderMode mode = CTransponder::StateStandby;
switch (pos.xpdrMode)
{
case Cvatlib_Network::xpndrMode_Normal:
mode = CTransponder::ModeC;
break;
case Cvatlib_Network::xpndrMode_Standby:
mode = CTransponder::ModeS;
mode = CTransponder::StateStandby;
break;
case Cvatlib_Network::xpndrMode_Ident:
mode = CTransponder::StateIdent;

View File

@@ -81,7 +81,7 @@ namespace BlackMisc
*/
void CAircraft::initTransponder()
{
CTransponder xpdr("TRANSPONDER", 7000, CTransponder::ModeS);
CTransponder xpdr("TRANSPONDER", 7000, CTransponder::StateStandby);
this->setTransponder(xpdr);
}