flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-30 14:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Style and check condition

Browse Source
This commit is contained in:
Klaus Basan
2018-09-02 14:36:14 +02:00
committed by Roland Winklmeier
parent a062607520
commit f85c6bcc30
2 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/plugins/simulator/fs9/fs9.h
View File

@@ -58,19 +58,19 @@ namespace BlackSimPlugin
} }
//! Returns the FS9 pitch multiplier //! Returns the FS9 pitch multiplier
static double pitchMultiplier () static double pitchMultiplier()
{ {
return 256.0 / 90.0; return 256.0 / 90.0;
} }
//! Return the FS9 bank multiplier //! Return the FS9 bank multiplier
static double bankMultiplier () static double bankMultiplier()
{ {
return 512.0 / 180.0; return 512.0 / 180.0;
} }
//! Returns the FS9 heading multiplier //! Returns the FS9 heading multiplier
static double headingMultiplier () static double headingMultiplier()
{ {
return 1024.0 / 360.0; return 1024.0 / 360.0;
} }
@@ -153,7 +153,7 @@ namespace BlackSimPlugin
{ {
quint32 application_time = 0; //!< Application time - ignored quint32 application_time = 0; //!< Application time - ignored
quint32 packet_index = 0; //!< Packet index quint32 packet_index = 0; //!< Packet index
std::array<quint8, 4> reserved = std::array<quint8, 4>{{0, 0, 0, 0}}; //!< Reserved std::array<quint8, 4> reserved = std::array<quint8, 4> {{0, 0, 0, 0}}; //!< Reserved
quint32 pbh = 0; //!< Pitch/Bank/Heading quint32 pbh = 0; //!< Pitch/Bank/Heading
qint32 lat_i = 0; //!< Latitude - integer qint32 lat_i = 0; //!< Latitude - integer
qint32 lon_hi = 0; //!< Longitude - integer qint32 lon_hi = 0; //!< Longitude - integer
@@ -161,7 +161,7 @@ namespace BlackSimPlugin
quint16 lat_f = 0; //!< Latitude - fraction quint16 lat_f = 0; //!< Latitude - fraction
quint16 lon_lo = 0; //!< Longitude - fraction quint16 lon_lo = 0; //!< Longitude - fraction
quint16 alt_f = 0; //!< Altitude - fraction quint16 alt_f = 0; //!< Altitude - fraction
std::array<quint8, 2> unknown = std::array<quint8, 2>{{0, 0}}; //!< Unknown packet std::array<quint8, 2> unknown = std::array<quint8, 2> {{0, 0}}; //!< Unknown packet
}; };
//! Full multiplayer position and velocity packet //! Full multiplayer position and velocity packet
@@ -173,14 +173,14 @@ namespace BlackSimPlugin
qint32 lon_velocity = 0; //!< Longitude velocity qint32 lon_velocity = 0; //!< Longitude velocity
qint32 alt_velocity = 0; //!< Altitude velocity qint32 alt_velocity = 0; //!< Altitude velocity
quint32 ground_velocity = 0; //!< Ground velocity quint32 ground_velocity = 0; //!< Ground velocity
std::array<quint8, 4> reserved = std::array<quint8, 4>{{0, 0, 0, 0}}; //!< Reserved std::array<quint8, 4> reserved = std::array<quint8, 4> {{0, 0, 0, 0}}; //!< Reserved
quint32 pbh = 0; //!< Pitch/Bank/Heading quint32 pbh = 0; //!< Pitch/Bank/Heading
qint32 lat_i = 0; //!< Latitude - integer qint32 lat_i = 0; //!< Latitude - integer
qint32 lon_hi = 0; //!< Longitude - integer qint32 lon_hi = 0; //!< Longitude - integer
qint32 alt_i = 0; //!< Altitude - integer qint32 alt_i = 0; //!< Altitude - integer
quint16 lat_f = 0; //!< Latitude - fraction quint16 lat_f = 0; //!< Latitude - fraction
quint16 lon_lo = 0; //!< Longitude - fraction quint16 lon_lo = 0; //!< Longitude - fraction
quint16 alt_f = 0; //!< Altitude - fraction quint16 alt_f = 0; //!< Altitude - fraction
}; };
//! Player info //! Player info
@@ -213,16 +213,18 @@ namespace BlackSimPlugin
union FS_PBH union FS_PBH
{ {
unsigned int pbh = 0; //!< Pitch/Bank/Heading as integer value unsigned int pbh = 0; //!< Pitch/Bank/Heading as integer value
//! PBH
struct struct
{ {
unsigned int unused : 1; //!< unused bit unsigned int unused : 1; //!< unused bit
unsigned int onground : 1; //!< Onground flag unsigned int onground : 1; //!< Onground flag
unsigned int hdg : 10; //!< Heading unsigned int hdg : 10; //!< Heading
int bank : 10; //!< Bank int bank : 10; //!< Bank
int pitch : 10; //!< Pitch int pitch : 10; //!< Pitch
}; };
}; };
} }
} } // ns
#endif // BLACKSIMPLUGIN_FS9_FS9SDK_H #endif // guard

7
src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
View File

@@ -1675,6 +1675,13 @@ namespace BlackSimPlugin
position.Heading = situation.getHeading().value(CAngleUnit::deg()); position.Heading = situation.getHeading().value(CAngleUnit::deg());
position.Airspeed = static_cast<DWORD>(situation.getGroundSpeed().valueInteger(CSpeedUnit::kts())); position.Airspeed = static_cast<DWORD>(situation.getGroundSpeed().valueInteger(CSpeedUnit::kts()));
// sanity check
if (CBuildConfig::isLocalDeveloperDebugBuild() && situation.getGroundSpeed().isNegativeWithEpsilonConsidered())
{
BLACK_VERIFY_X(false, Q_FUNC_INFO, "Negative speed");
position.Airspeed = 0;
}
// MSFS has inverted pitch and bank angles // MSFS has inverted pitch and bank angles
position.Pitch = -situation.getPitch().value(CAngleUnit::deg()); position.Pitch = -situation.getPitch().value(CAngleUnit::deg());
position.Bank = -situation.getBank().value(CAngleUnit::deg()); position.Bank = -situation.getBank().value(CAngleUnit::deg());