flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-01 05:26:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/blackmisc/samplesjson.cpp
View File

@@ -53,7 +53,7 @@ namespace BlackMiscTest
CAircraft aircraft(CCallsign("DAMBZ"), CUser("123456", "Joe Pilot"), situation); CAircraft aircraft(CCallsign("DAMBZ"), CUser("123456", "Joe Pilot"), situation);
aircraft.setCom1System(CComSystem::getCom1System(122.8, 118.75)); aircraft.setCom1System(CComSystem::getCom1System(122.8, 118.75));
aircraft.setCom2System(CComSystem::getCom2System(123.8, 124.00)); 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")); aircraft.setIcaoInfo(CAircraftIcao("B737", "L2J", "DLH", "FREIGHT", "CCDDFF"));
json = aircraft.toJson(); json = aircraft.toJson();

4
src/blackcore/network_vatlib.cpp
View File

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

2
src/blackmisc/avaircraft.cpp
View File

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