flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-18 11:25:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T437, adjusted CFsuipc class

Browse Source
This commit is contained in:
Klaus Basan
2018-11-20 03:04:47 +01:00
parent 39d2eba85b
commit 33116d3b21
3 changed files with 159 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/simulator/fscommon/fsuipc.h
View File

@@ -33,7 +33,7 @@ namespace BlackSimPlugin
virtual ~CFsuipc() override; virtual ~CFsuipc() override;
//! Open conenction with FSUIPC //! Open conenction with FSUIPC
bool connect(); bool connect(bool force = false);
//! Disconnect //! Disconnect
void disconnect(); void disconnect();
@@ -41,8 +41,11 @@ namespace BlackSimPlugin
//! Is connected? //! Is connected?
bool isConnected() const; bool isConnected() const;
//! Really open, means connected and data can be sent
bool isOpen() const;
//! Write variables //! Write variables
bool write(const BlackMisc::Simulation::CSimulatedAircraft &aircraft); bool write(const BlackMisc::Aviation::CTransponder &xpdr);
//! Write weather grid to simulator //! Write weather grid to simulator
bool write(const BlackMisc::Weather::CWeatherGrid &weatherGrid); bool write(const BlackMisc::Weather::CWeatherGrid &weatherGrid);
@@ -56,7 +59,6 @@ namespace BlackSimPlugin
//! \param situation update situation data //! \param situation update situation data
//! \param aircraftParts update parts //! \param aircraftParts update parts
//! \return read //! \return read
//!
bool read(BlackMisc::Simulation::CSimulatedAircraft &aircraft, bool cockpit, bool situation, bool aircraftParts); bool read(BlackMisc::Simulation::CSimulatedAircraft &aircraft, bool cockpit, bool situation, bool aircraftParts);
//! Error messages //! Error messages
@@ -85,6 +87,14 @@ namespace BlackSimPlugin
return errors; return errors;
} }
//! Message for index
static const QString &errorMessage(int index)
{
if (index >= 0 && index < errorMessages().size()) { return errorMessages().at(index); }
static const QString unknown("Unknown error message index");
return unknown;
}
//! Simulators //! Simulators
static const QStringList &simulators() static const QStringList &simulators()
{ {
@@ -96,6 +106,14 @@ namespace BlackSimPlugin
return sims; return sims;
} }
//! Simulator for index
static const QString &simulator(int index)
{
if (index >= 0 && index < simulators().size()) { return simulators().at(index); }
static const QString unknown("Unknown simulator index");
return unknown;
}
protected: protected:
//! \copydoc QObject::timerEvent //! \copydoc QObject::timerEvent
void timerEvent(QTimerEvent *event) override; void timerEvent(QTimerEvent *event) override;
@@ -107,6 +125,7 @@ namespace BlackSimPlugin
void processWeatherMessages(); void processWeatherMessages();
bool m_connected = false; bool m_connected = false;
int m_lastErrorIndex = 0;
QString m_lastErrorMessage; QString m_lastErrorMessage;
QString m_fsuipcVersion; QString m_fsuipcVersion;

18
src/plugins/simulator/fscommon/fsuipcdummy.cpp
View File

@@ -12,6 +12,8 @@
#include "fsuipc.h" #include "fsuipc.h"
using namespace BlackMisc::Simulation; using namespace BlackMisc::Simulation;
using namespace BlackMisc::Aviation;
using namespace BlackMisc::Weather;
namespace BlackSimPlugin namespace BlackSimPlugin
{ {
@@ -28,8 +30,9 @@ namespace BlackSimPlugin
CFsuipc::~CFsuipc() CFsuipc::~CFsuipc()
{ } { }
bool CFsuipc::connect() bool CFsuipc::connect(bool force)
{ {
Q_UNUSED(force);
return false; return false;
} }
@@ -41,13 +44,18 @@ namespace BlackSimPlugin
return false; return false;
} }
bool CFsuipc::write(const CSimulatedAircraft &aircraft) bool CFsuipc::isOpen() const
{ {
Q_UNUSED(aircraft);
return false; return false;
} }
bool CFsuipc::write(const BlackMisc::Weather::CWeatherGrid &weatherGrid) bool CFsuipc::write(const CTransponder &xpdr)
{
Q_UNUSED(xpdr);
return false;
}
bool CFsuipc::write(const CWeatherGrid &weatherGrid)
{ {
Q_UNUSED(weatherGrid); Q_UNUSED(weatherGrid);
return false; return false;
@@ -55,7 +63,7 @@ namespace BlackSimPlugin
QString CFsuipc::getVersion() const QString CFsuipc::getVersion() const
{ {
return "N/A"; return QStringLiteral("N/A");
} }
bool CFsuipc::read(CSimulatedAircraft &aircraft, bool cockpit, bool situation, bool aircraftParts) bool CFsuipc::read(CSimulatedAircraft &aircraft, bool cockpit, bool situation, bool aircraftParts)

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

@@ -67,42 +67,55 @@ namespace BlackSimPlugin
this->disconnect(); this->disconnect();
} }
bool CFsuipc::connect() bool CFsuipc::connect(bool force)
{ {
DWORD result; DWORD result;
this->m_lastErrorMessage = ""; m_lastErrorMessage = "";
if (this->m_connected) return this->m_connected; // already connected m_lastErrorIndex = 0;
if (!force && m_connected) { return m_connected; } // already connected
if (FSUIPC_Open(SIM_ANY, &result)) if (FSUIPC_Open(SIM_ANY, &result))
{ {
this->m_connected = true; m_connected = true; // temp status
int simIndex = static_cast<int>(FSUIPC_FS_Version); if (this->isOpen())
QString sim( {
(simIndex >= 0 && simIndex < CFsuipc::simulators().size()) ? const int simIndex = static_cast<int>(FSUIPC_FS_Version);
CFsuipc::simulators().at(simIndex) : const QString sim = CFsuipc::simulator(simIndex);
"Unknown FS"); QString ver = QStringLiteral("%1.%2.%3.%4%5").arg(QLatin1Char(48 + (0x0f & (FSUIPC_Version >> 28))))
QString ver("%1.%2.%3.%4%5"); .arg(QLatin1Char(48 + (0x0f & (FSUIPC_Version >> 24))))
ver = ver.arg(QLatin1Char(48 + (0x0f & (FSUIPC_Version >> 28)))) .arg(QLatin1Char(48 + (0x0f & (FSUIPC_Version >> 20))))
.arg(QLatin1Char(48 + (0x0f & (FSUIPC_Version >> 24)))) .arg(QLatin1Char(48 + (0x0f & (FSUIPC_Version >> 16))))
.arg(QLatin1Char(48 + (0x0f & (FSUIPC_Version >> 20)))) .arg((FSUIPC_Version & 0xffff) ? QString(QLatin1Char('a' + static_cast<char>(FSUIPC_Version & 0xff) - 1)) : "");
.arg(QLatin1Char(48 + (0x0f & (FSUIPC_Version >> 16)))) m_fsuipcVersion = QString("FSUIPC %1 (%2)").arg(ver, sim);
.arg((FSUIPC_Version & 0xffff) ? QString(QLatin1Char('a' + static_cast<char>(FSUIPC_Version & 0xff) - 1)) : ""); CLogMessage(this).info("FSUIPC connected: %1") << m_fsuipcVersion;
this->m_fsuipcVersion = QString("FSUIPC %1 (%2)").arg(ver).arg(sim); }
CLogMessage(this).info("FSUIPC connected: %1") << this->m_fsuipcVersion; else
{
CLogMessage(this).warning("FSUIPC opened, but verification failed");
m_connected = false;
FSUIPC_Close(); // under any circumstances close
}
} }
else else
{ {
this->m_connected = false; const int index = static_cast<int>(result);
int index = static_cast<int>(result); m_lastErrorIndex = index;
this->m_lastErrorMessage = CFsuipc::errorMessages().at(index); m_lastErrorMessage = CFsuipc::errorMessages().at(index);
CLogMessage(this).info("FSUIPC not connected: %1") << this->m_lastErrorMessage; CLogMessage(this).warning("FSUIPC not connected: %1") << m_lastErrorMessage;
m_connected = false;
FSUIPC_Close(); // under any circumstances close
} }
return this->m_connected;
return m_connected;
} }
void CFsuipc::disconnect() void CFsuipc::disconnect()
{ {
if (m_connected)
{
CLogMessage(this).info("Closing FSUIPC: %1") << m_fsuipcVersion;
}
FSUIPC_Close(); // Closing when it wasn't open is okay, so this is safe here FSUIPC_Close(); // Closing when it wasn't open is okay, so this is safe here
this->m_connected = false; m_connected = false;
} }
bool CFsuipc::isConnected() const bool CFsuipc::isConnected() const
@@ -110,17 +123,36 @@ namespace BlackSimPlugin
return m_connected; return m_connected;
} }
bool CFsuipc::write(const CSimulatedAircraft &aircraft) bool CFsuipc::isOpen() const
{ {
if (!this->isConnected()) { return false; } if (!this->isConnected()) { return false; }
Q_UNUSED(aircraft); // test read
DWORD dwResult;
//! \fixme FSUIPC write values not yet implemented char localFsTimeRaw[3];
if (FSUIPC_Read(0x0238, 3, localFsTimeRaw, &dwResult) && FSUIPC_Process(&dwResult))
{
return dwResult == 0;
}
return false; return false;
} }
bool CFsuipc::write(const BlackMisc::Weather::CWeatherGrid &weatherGrid) bool CFsuipc::write(const CTransponder &xpdr)
{
if (!this->isConnected()) { return false; }
// should be the same as writing via SimConnect data area
DWORD dwResult;
byte xpdrModeSb3Raw = xpdr.isInStandby() ? 1U : 0U;
byte xpdrIdentSb3Raw = xpdr.isIdentifying() ? 1U : 0U;
const bool ok =
FSUIPC_Write(0x7b91, 1, &xpdrModeSb3Raw, &dwResult) &&
FSUIPC_Write(0x7b93, 1, &xpdrIdentSb3Raw, &dwResult);
if (ok) { FSUIPC_Process(&dwResult); }
return ok && dwResult == 0;
}
bool CFsuipc::write(const CWeatherGrid &weatherGrid)
{ {
if (!this->isConnected()) { return false; } if (!this->isConnected()) { return false; }
@@ -247,6 +279,7 @@ namespace BlackSimPlugin
press.Pressure = static_cast<ushort>(gridPoint.getSurfacePressure().value(CPressureUnit::mbar()) * 16); press.Pressure = static_cast<ushort>(gridPoint.getSurfacePressure().value(CPressureUnit::mbar()) * 16);
nw.Press = press; nw.Press = press;
// writing will take place in
QByteArray weatherData(reinterpret_cast<const char *>(&nw), sizeof(NewWeather)); QByteArray weatherData(reinterpret_cast<const char *>(&nw), sizeof(NewWeather));
m_weatherMessageQueue.append(FsuipcWeatherMessage(0xC800, weatherData, 5)); m_weatherMessageQueue.append(FsuipcWeatherMessage(0xC800, weatherData, 5));
return true; return true;
@@ -259,12 +292,12 @@ namespace BlackSimPlugin
bool CFsuipc::read(CSimulatedAircraft &aircraft, bool cockpit, bool situation, bool aircraftParts) bool CFsuipc::read(CSimulatedAircraft &aircraft, bool cockpit, bool situation, bool aircraftParts)
{ {
DWORD dwResult; DWORD dwResult = 0;
char localFsTimeRaw[3]; char localFsTimeRaw[3];
char modelNameRaw[256]; char modelNameRaw[256];
qint16 com1ActiveRaw = 0, com2ActiveRaw = 0, com1StandbyRaw = 0, com2StandbyRaw = 0; qint16 com1ActiveRaw = 0, com2ActiveRaw = 0, com1StandbyRaw = 0, com2StandbyRaw = 0;
qint16 transponderCodeRaw = 0; qint16 transponderCodeRaw = 0;
qint8 xpdrModeSb3Raw = 0, xpdrIdentSb3Raw = 0; byte xpdrModeSb3Raw = 1, xpdrIdentSb3Raw = 1;
qint32 groundspeedRaw = 0, pitchRaw = 0, bankRaw = 0, headingRaw = 0; qint32 groundspeedRaw = 0, pitchRaw = 0, bankRaw = 0, headingRaw = 0;
qint64 altitudeRaw = 0; qint64 altitudeRaw = 0;
double pressureAltitudeRaw = 0; // 34B0 double pressureAltitudeRaw = 0; // 34B0
@@ -288,51 +321,59 @@ namespace BlackSimPlugin
bool situationN = !situation; bool situationN = !situation;
bool aircraftPartsN = ! aircraftParts; bool aircraftPartsN = ! aircraftParts;
if (FSUIPC_Read(0x0238, 3, localFsTimeRaw, &dwResult) && //! \todo KB 2018-11 BUG fix for broken connection, needs to go as soon as issue is fixed
if (!FSUIPC_Read(0x0238, 3, localFsTimeRaw, &dwResult))
{
FSUIPC_Close();
FSUIPC_Open(SIM_ANY, &dwResult);
}
// COM settings if (
(cockpitN || FSUIPC_Read(0x034e, 2, &com1ActiveRaw, &dwResult)) && FSUIPC_Read(0x0238, 3, localFsTimeRaw, &dwResult) &&
(cockpitN || FSUIPC_Read(0x3118, 2, &com2ActiveRaw, &dwResult)) &&
(cockpitN || FSUIPC_Read(0x311a, 2, &com1StandbyRaw, &dwResult)) &&
(cockpitN || FSUIPC_Read(0x311c, 2, &com2StandbyRaw, &dwResult)) &&
(cockpitN || FSUIPC_Read(0x0354, 2, &transponderCodeRaw, &dwResult)) &&
// COM Settings, transponder, SB3 // COM settings
(cockpitN || FSUIPC_Read(0x7b91, 1, &xpdrModeSb3Raw, &dwResult)) && (cockpitN || FSUIPC_Read(0x034e, 2, &com1ActiveRaw, &dwResult)) &&
(cockpitN || FSUIPC_Read(0x7b93, 1, &xpdrIdentSb3Raw, &dwResult)) && (cockpitN || FSUIPC_Read(0x3118, 2, &com2ActiveRaw, &dwResult)) &&
(cockpitN || FSUIPC_Read(0x311a, 2, &com1StandbyRaw, &dwResult)) &&
(cockpitN || FSUIPC_Read(0x311c, 2, &com2StandbyRaw, &dwResult)) &&
(cockpitN || FSUIPC_Read(0x0354, 2, &transponderCodeRaw, &dwResult)) &&
// Speeds, situation // COM Settings, transponder, SB3
(situationN || FSUIPC_Read(0x02b4, 4, &groundspeedRaw, &dwResult)) && (cockpitN || FSUIPC_Read(0x7b91, 1, &xpdrModeSb3Raw, &dwResult)) &&
(situationN || FSUIPC_Read(0x0578, 4, &pitchRaw, &dwResult)) && (cockpitN || FSUIPC_Read(0x7b93, 1, &xpdrIdentSb3Raw, &dwResult)) &&
(situationN || FSUIPC_Read(0x057c, 4, &bankRaw, &dwResult)) &&
(situationN || FSUIPC_Read(0x0580, 4, &headingRaw, &dwResult)) &&
(situationN || FSUIPC_Read(0x0570, 8, &altitudeRaw, &dwResult)) &&
// Position // Speeds, situation
(situationN || FSUIPC_Read(0x0560, 8, &latitudeRaw, &dwResult)) && (situationN || FSUIPC_Read(0x02b4, 4, &groundspeedRaw, &dwResult)) &&
(situationN || FSUIPC_Read(0x0568, 8, &longitudeRaw, &dwResult)) && (situationN || FSUIPC_Read(0x0578, 4, &pitchRaw, &dwResult)) &&
(situationN || FSUIPC_Read(0x0020, 4, &groundAltitudeRaw, &dwResult)) && (situationN || FSUIPC_Read(0x057c, 4, &bankRaw, &dwResult)) &&
(situationN || FSUIPC_Read(0x34B0, 8, &pressureAltitudeRaw, &dwResult)) && (situationN || FSUIPC_Read(0x0580, 4, &headingRaw, &dwResult)) &&
(situationN || FSUIPC_Read(0x0570, 8, &altitudeRaw, &dwResult)) &&
// model name // Position
FSUIPC_Read(0x3d00, 256, &modelNameRaw, &dwResult) && (situationN || FSUIPC_Read(0x0560, 8, &latitudeRaw, &dwResult)) &&
(situationN || FSUIPC_Read(0x0568, 8, &longitudeRaw, &dwResult)) &&
(situationN || FSUIPC_Read(0x0020, 4, &groundAltitudeRaw, &dwResult)) &&
(situationN || FSUIPC_Read(0x34B0, 8, &pressureAltitudeRaw, &dwResult)) &&
// aircraft parts // model name
(aircraftPartsN || FSUIPC_Read(0x0D0C, 2, &lightsRaw, &dwResult)) && FSUIPC_Read(0x3d00, 256, &modelNameRaw, &dwResult) &&
(aircraftPartsN || FSUIPC_Read(0x0366, 2, &onGroundRaw, &dwResult)) &&
(aircraftPartsN || FSUIPC_Read(0x0BDC, 4, &flapsControlRaw, &dwResult)) &&
(aircraftPartsN || FSUIPC_Read(0x0BE8, 4, &gearControlRaw, &dwResult)) &&
(aircraftPartsN || FSUIPC_Read(0x0BD0, 4, &spoilersControlRaw, &dwResult)) &&
// engines // aircraft parts
(aircraftPartsN || FSUIPC_Read(0x0AEC, 2, &numberOfEngines, &dwResult)) && (aircraftPartsN || FSUIPC_Read(0x0D0C, 2, &lightsRaw, &dwResult)) &&
(aircraftPartsN || FSUIPC_Read(0x0894, 2, &engine1CombustionFlag, &dwResult)) && (aircraftPartsN || FSUIPC_Read(0x0366, 2, &onGroundRaw, &dwResult)) &&
(aircraftPartsN || FSUIPC_Read(0x092C, 2, &engine2CombustionFlag, &dwResult)) && (aircraftPartsN || FSUIPC_Read(0x0BDC, 4, &flapsControlRaw, &dwResult)) &&
(aircraftPartsN || FSUIPC_Read(0x09C4, 2, &engine3CombustionFlag, &dwResult)) && (aircraftPartsN || FSUIPC_Read(0x0BE8, 4, &gearControlRaw, &dwResult)) &&
(aircraftPartsN || FSUIPC_Read(0x0A5C, 2, &engine4CombustionFlag, &dwResult)) && (aircraftPartsN || FSUIPC_Read(0x0BD0, 4, &spoilersControlRaw, &dwResult)) &&
// If we wanted other reads/writes at the same time, we could put them here // engines
FSUIPC_Process(&dwResult)) (aircraftPartsN || FSUIPC_Read(0x0AEC, 2, &numberOfEngines, &dwResult)) &&
(aircraftPartsN || FSUIPC_Read(0x0894, 2, &engine1CombustionFlag, &dwResult)) &&
(aircraftPartsN || FSUIPC_Read(0x092C, 2, &engine2CombustionFlag, &dwResult)) &&
(aircraftPartsN || FSUIPC_Read(0x09C4, 2, &engine3CombustionFlag, &dwResult)) &&
(aircraftPartsN || FSUIPC_Read(0x0A5C, 2, &engine4CombustionFlag, &dwResult)) &&
// If we wanted other reads/writes at the same time, we could put them here
FSUIPC_Process(&dwResult))
{ {
read = true; read = true;
@@ -359,18 +400,14 @@ namespace BlackSimPlugin
transponderCodeRaw = static_cast<qint16>(CBcdConversions::bcd2Dec(transponderCodeRaw)); transponderCodeRaw = static_cast<qint16>(CBcdConversions::bcd2Dec(transponderCodeRaw));
xpdr.setTransponderCode(transponderCodeRaw); xpdr.setTransponderCode(transponderCodeRaw);
// Mode by SB3 // Mode by SB3
xpdr.setTransponderMode(xpdrModeSb3Raw == 0 ? CTransponder::ModeC : CTransponder::StateStandby);
if (xpdrIdentSb3Raw != 0) if (xpdrIdentSb3Raw != 0)
{ {
//! \fixme Reset value for FSUIPC // will be reset in CFsuipc::write
xpdr.setTransponderMode(CTransponder::StateIdent); xpdr.setTransponderMode(CTransponder::StateIdent);
} }
else
{
xpdr.setTransponderMode(
xpdrModeSb3Raw == 0 ? CTransponder::ModeC : CTransponder::StateStandby
);
}
aircraft.setCockpit(com1, com2, xpdr); aircraft.setCockpit(com1, com2, xpdr);
} // cockpit } // cockpit
@@ -421,12 +458,12 @@ namespace BlackSimPlugin
if (aircraftParts) if (aircraftParts)
{ {
CAircraftLights lights(lightsRaw & (1 << 4), lightsRaw & (1 << 2), lightsRaw & (1 << 3), lightsRaw & (1 << 1), const CAircraftLights lights(lightsRaw & (1 << 4), lightsRaw & (1 << 2), lightsRaw & (1 << 3), lightsRaw & (1 << 1),
lightsRaw & (1 << 0), lightsRaw & (1 << 8)); lightsRaw & (1 << 0), lightsRaw & (1 << 8));
QList<bool> helperList { engine1CombustionFlag != 0, engine2CombustionFlag != 0, const QList<bool> helperList { engine1CombustionFlag != 0, engine2CombustionFlag != 0,
engine3CombustionFlag != 0, engine4CombustionFlag != 0 engine3CombustionFlag != 0, engine4CombustionFlag != 0
}; };
CAircraftEngineList engines; CAircraftEngineList engines;
for (int index = 0; index < numberOfEngines; ++index) for (int index = 0; index < numberOfEngines; ++index)
@@ -440,6 +477,14 @@ namespace BlackSimPlugin
aircraft.setParts(parts); aircraft.setParts(parts);
} // parts } // parts
} // read } // read
const int result = static_cast<int>(dwResult);
if (m_lastErrorIndex != result && result > 0)
{
m_lastErrorIndex = result;
m_lastErrorMessage = CFsuipc::errorMessages().at(result);
CLogMessage(this).warning("FSUIPC read error '%1'") << m_lastErrorMessage;
}
return read; return read;
} }