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

FSUIPC Clang fixes

Browse Source
This commit is contained in:
Klaus Basan
2018-11-18 17:58:48 +01:00
parent 0ab4a18bda
commit 3f8ea99d14
3 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackmisc/simulation/fscommon/bcdconversions.cpp
View File

@@ -31,7 +31,7 @@ namespace BlackMisc
quint32 CBcdConversions::transponderCodeToBcd(const BlackMisc::Aviation::CTransponder &transponder) quint32 CBcdConversions::transponderCodeToBcd(const BlackMisc::Aviation::CTransponder &transponder)
{ {
// FSX documentation is wrong, we need to use kHz + 2 digits, not Hz // FSX documentation is wrong, we need to use kHz + 2 digits, not Hz
quint32 t = transponder.getTransponderCode(); quint32 t = static_cast<quint32>(transponder.getTransponderCode());
t = dec2Bcd(t); t = dec2Bcd(t);
return t; return t;
} }

3
src/blackmisc/simulation/fscommon/bcdconversions.h
View File

@@ -27,6 +27,9 @@ namespace BlackMisc
class BLACKMISC_EXPORT CBcdConversions class BLACKMISC_EXPORT CBcdConversions
{ {
public: public:
//! BCD -> decimal
static quint32 bcd2Dec(qint32 bcdNum) { return bcd2Dec(static_cast<quint32>(bcdNum)); }
//! BCD -> decimal //! BCD -> decimal
static quint32 bcd2Dec(quint32 bcdNum) { return hornerScheme(bcdNum, 0x10, 10); } static quint32 bcd2Dec(quint32 bcdNum) { return hornerScheme(bcdNum, 0x10, 10); }

52
src/plugins/simulator/fscommon/fsuipcimpl.cpp
View File

@@ -14,7 +14,7 @@
#endif #endif
#include "fsuipc.h" #include "fsuipc.h"
#include <windows.h> #include <Windows.h>
// bug in FSUIPC_User.h, windows.h not included, so we have to import it first // bug in FSUIPC_User.h, windows.h not included, so we have to import it first
#ifdef SWIFT_USING_FSUIPC32 #ifdef SWIFT_USING_FSUIPC32
@@ -85,7 +85,7 @@ namespace BlackSimPlugin
.arg(QLatin1Char(48 + (0x0f & (FSUIPC_Version >> 24)))) .arg(QLatin1Char(48 + (0x0f & (FSUIPC_Version >> 24))))
.arg(QLatin1Char(48 + (0x0f & (FSUIPC_Version >> 20)))) .arg(QLatin1Char(48 + (0x0f & (FSUIPC_Version >> 20))))
.arg(QLatin1Char(48 + (0x0f & (FSUIPC_Version >> 16)))) .arg(QLatin1Char(48 + (0x0f & (FSUIPC_Version >> 16))))
.arg((FSUIPC_Version & 0xffff) ? QString(QLatin1Char('a' + (FSUIPC_Version & 0xff) - 1)) : ""); .arg((FSUIPC_Version & 0xffff) ? QString(QLatin1Char('a' + static_cast<char>(FSUIPC_Version & 0xff) - 1)) : "");
this->m_fsuipcVersion = QString("FSUIPC %1 (%2)").arg(ver).arg(sim); this->m_fsuipcVersion = QString("FSUIPC %1 (%2)").arg(ver).arg(sim);
CLogMessage(this).info("FSUIPC connected: %1") << this->m_fsuipcVersion; CLogMessage(this).info("FSUIPC connected: %1") << this->m_fsuipcVersion;
} }
@@ -152,18 +152,18 @@ namespace BlackSimPlugin
visibilityLayers.sortBy(&CVisibilityLayer::getBase); visibilityLayers.sortBy(&CVisibilityLayer::getBase);
auto surfaceVisibility = visibilityLayers.frontOrDefault(); auto surfaceVisibility = visibilityLayers.frontOrDefault();
NewVis vis; NewVis vis;
vis.LowerAlt = surfaceVisibility.getBase().value(CLengthUnit::m()); vis.LowerAlt = static_cast<short>(surfaceVisibility.getBase().valueInteger(CLengthUnit::m()));
vis.UpperAlt = surfaceVisibility.getTop().value(CLengthUnit::m()); vis.UpperAlt = static_cast<ushort>(surfaceVisibility.getTop().valueInteger(CLengthUnit::m()));
// Range is measured in: 1/100ths sm // Range is measured in: 1/100ths sm
vis.Range = surfaceVisibility.getVisibility().value(CLengthUnit::SM()) * 100; vis.Range = static_cast<ushort>(surfaceVisibility.getVisibility().value(CLengthUnit::SM()) * 100);
vis.Spare = 0; vis.Spare = 0;
nw.Vis = vis; nw.Vis = vis;
for (const auto &visibilityLayer : visibilityLayers) for (const auto &visibilityLayer : visibilityLayers)
{ {
vis.LowerAlt = visibilityLayer.getBase().value(CLengthUnit::m()); vis.LowerAlt = static_cast<short>(visibilityLayer.getBase().valueInteger(CLengthUnit::m()));
vis.UpperAlt = visibilityLayer.getTop().value(CLengthUnit::m()); vis.UpperAlt = static_cast<ushort>(visibilityLayer.getTop().valueInteger(CLengthUnit::m()));
vis.Range = visibilityLayer.getVisibility().value(CLengthUnit::SM()) * 100; vis.Range = static_cast<ushort>(visibilityLayer.getVisibility().value(CLengthUnit::SM()) * 100);
vis.Spare = 0; vis.Spare = 0;
nw.UpperVis[nw.nUpperVisCtr++] = vis; nw.UpperVis[nw.nUpperVisCtr++] = vis;
} }
@@ -173,10 +173,10 @@ namespace BlackSimPlugin
for (const auto &temperatureLayer : temperatureLayers) for (const auto &temperatureLayer : temperatureLayers)
{ {
NewTemp temp; NewTemp temp;
temp.Alt = temperatureLayer.getLevel().value(CLengthUnit::m()); temp.Alt = static_cast<ushort>(temperatureLayer.getLevel().valueInteger(CLengthUnit::m()));
temp.Day = temperatureLayer.getTemperature().value(CTemperatureUnit::C()); temp.Day = static_cast<short>(temperatureLayer.getTemperature().valueInteger(CTemperatureUnit::C()));
temp.DayNightVar = 3; temp.DayNightVar = 3;
temp.DewPoint = temperatureLayer.getDewPoint().value(CTemperatureUnit::C()); temp.DewPoint = static_cast<short>(temperatureLayer.getDewPoint().value(CTemperatureUnit::C()));
nw.Temp[nw.nTempCtr++] = temp; nw.Temp[nw.nTempCtr++] = temp;
} }
@@ -197,7 +197,7 @@ namespace BlackSimPlugin
cloud.Deviation = 0; cloud.Deviation = 0;
cloud.Icing = 0; cloud.Icing = 0;
cloud.LowerAlt = cloudLayer.getBase().value(CLengthUnit::m()); cloud.LowerAlt = static_cast<ushort>(cloudLayer.getBase().valueInteger(CLengthUnit::m()));
cloud.PrecipBase = 0; cloud.PrecipBase = 0;
// Light rain - when the precipitation rate is < 2.5 mm (0.098 in) per hour // Light rain - when the precipitation rate is < 2.5 mm (0.098 in) per hour
@@ -220,7 +220,7 @@ namespace BlackSimPlugin
default: cloud.Type = 0; default: cloud.Type = 0;
} }
cloud.UpperAlt = cloudLayer.getTop().value(CLengthUnit::m()); cloud.UpperAlt = static_cast<ushort>(cloudLayer.getTop().valueInteger(CLengthUnit::m()));
nw.Cloud[nw.nCloudsCtr++] = cloud; nw.Cloud[nw.nCloudsCtr++] = cloud;
} }
@@ -229,14 +229,14 @@ namespace BlackSimPlugin
for (const auto &windLayer : as_const(windLayers)) for (const auto &windLayer : as_const(windLayers))
{ {
NewWind wind; NewWind wind;
wind.Direction = windLayer.getDirection().value(CAngleUnit::deg()) * 65536 / 360.0; wind.Direction = static_cast<ushort>(windLayer.getDirection().value(CAngleUnit::deg()) * 65536 / 360.0);
wind.GapAbove = 0; wind.GapAbove = 0;
wind.Gust = windLayer.getGustSpeed().value(CSpeedUnit::kts()); wind.Gust = static_cast<ushort>(windLayer.getGustSpeed().valueInteger(CSpeedUnit::kts()));
wind.Shear = 0; wind.Shear = 0;
wind.Speed = windLayer.getSpeed().value(CSpeedUnit::kts()); wind.Speed = static_cast<ushort>(windLayer.getSpeed().valueInteger(CSpeedUnit::kts()));
wind.SpeedFract = 0; wind.SpeedFract = 0;
wind.Turbulence = 0; wind.Turbulence = 0;
wind.UpperAlt = windLayer.getLevel().value(CLengthUnit::m()); wind.UpperAlt = static_cast<ushort>(windLayer.getLevel().valueInteger(CLengthUnit::m()));
wind.Variance = 0; wind.Variance = 0;
nw.Wind[nw.nWindsCtr++] = wind; nw.Wind[nw.nWindsCtr++] = wind;
} }
@@ -244,7 +244,7 @@ namespace BlackSimPlugin
NewPress press; NewPress press;
press.Drift = 0; press.Drift = 0;
// Pressure is measured in: 16 x mb // Pressure is measured in: 16 x mb
press.Pressure = gridPoint.getSurfacePressure().value(CPressureUnit::mbar()) * 16; press.Pressure = static_cast<ushort>(gridPoint.getSurfacePressure().value(CPressureUnit::mbar()) * 16);
nw.Press = press; nw.Press = press;
QByteArray weatherData(reinterpret_cast<const char *>(&nw), sizeof(NewWeather)); QByteArray weatherData(reinterpret_cast<const char *>(&nw), sizeof(NewWeather));
@@ -348,10 +348,10 @@ namespace BlackSimPlugin
CTransponder xpdr = aircraft.getTransponder(); CTransponder xpdr = aircraft.getTransponder();
// 2710 => 12710 => / 100.0 => 127.1 // 2710 => 12710 => / 100.0 => 127.1
com1ActiveRaw = (10000 + CBcdConversions::bcd2Dec(com1ActiveRaw)); com1ActiveRaw = static_cast<short>(10000 + CBcdConversions::bcd2Dec(com1ActiveRaw));
com2ActiveRaw = (10000 + CBcdConversions::bcd2Dec(com2ActiveRaw)); com2ActiveRaw = static_cast<short>(10000 + CBcdConversions::bcd2Dec(com2ActiveRaw));
com1StandbyRaw = (10000 + CBcdConversions::bcd2Dec(com1StandbyRaw)); com1StandbyRaw = static_cast<short>(10000 + CBcdConversions::bcd2Dec(com1StandbyRaw));
com2StandbyRaw = (10000 + CBcdConversions::bcd2Dec(com2StandbyRaw)); com2StandbyRaw = static_cast<short>(10000 + CBcdConversions::bcd2Dec(com2StandbyRaw));
com1.setFrequencyActiveMHz(com1ActiveRaw / 100.0); com1.setFrequencyActiveMHz(com1ActiveRaw / 100.0);
com2.setFrequencyActiveMHz(com2ActiveRaw / 100.0); com2.setFrequencyActiveMHz(com2ActiveRaw / 100.0);
com1.setFrequencyStandbyMHz(com1StandbyRaw / 100.0); com1.setFrequencyStandbyMHz(com1StandbyRaw / 100.0);
@@ -390,8 +390,8 @@ namespace BlackSimPlugin
situation.setPosition(position); situation.setPosition(position);
const double angleCorrectionFactor = 360.0 / 65536.0 / 65536.0; // see FSUIPC docu const double angleCorrectionFactor = 360.0 / 65536.0 / 65536.0; // see FSUIPC docu
pitchRaw = std::floor(pitchRaw * angleCorrectionFactor); pitchRaw = qRound(std::floor(pitchRaw * angleCorrectionFactor));
bankRaw = std::floor(bankRaw * angleCorrectionFactor); bankRaw = qRound(std::floor(bankRaw * angleCorrectionFactor));
// MSFS has inverted pitch and bank angles // MSFS has inverted pitch and bank angles
pitchRaw = ~pitchRaw; pitchRaw = ~pitchRaw;
@@ -450,7 +450,7 @@ namespace BlackSimPlugin
} }
CFsuipc::FsuipcWeatherMessage::FsuipcWeatherMessage(unsigned int offset, const QByteArray &data, int leftTrials) : CFsuipc::FsuipcWeatherMessage::FsuipcWeatherMessage(unsigned int offset, const QByteArray &data, int leftTrials) :
m_offset(offset), m_messageData(data), m_leftTrials(leftTrials) m_offset(static_cast<int>(offset)), m_messageData(data), m_leftTrials(leftTrials)
{ } { }
@@ -486,7 +486,7 @@ namespace BlackSimPlugin
DWORD dwResult; DWORD dwResult;
weatherMessage.m_leftTrials--; weatherMessage.m_leftTrials--;
FSUIPC_Write(weatherMessage.m_offset, weatherMessage.m_messageData.size(), reinterpret_cast<void *>(weatherMessage.m_messageData.data()), &dwResult); FSUIPC_Write(static_cast<DWORD>(weatherMessage.m_offset), static_cast<DWORD>(weatherMessage.m_messageData.size()), reinterpret_cast<void *>(weatherMessage.m_messageData.data()), &dwResult);
unsigned int timeStamp = 0; unsigned int timeStamp = 0;
FSUIPC_Read(0xC824, sizeof(timeStamp), &timeStamp, &dwResult); FSUIPC_Read(0xC824, sizeof(timeStamp), &timeStamp, &dwResult);