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

Finishing FG service module calls

Browse Source
This commit is contained in:
Lars Toenning
2019-02-24 11:43:25 +01:00
committed by Mat Sutcliffe
parent 68f7ba6691
commit 43563496aa
4 changed files with 0 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/plugins/simulator/flightgear/fgswiftbusserviceproxy.cpp
View File

@@ -71,11 +71,6 @@ namespace BlackSimPlugin
m_dbusInterface->callDBus(QLatin1String("addTextMessage"), text);
}
void CXSwiftBusServiceProxy::updateAirportsInRange()
{
m_dbusInterface->callDBus(QLatin1String("updateAirportsInRange"));
}
QString CXSwiftBusServiceProxy::getAircraftModelPath() const
{
return m_dbusInterface->callDBusRet<QString>(QLatin1String("getAircraftModelPath"));
@@ -166,15 +161,6 @@ namespace BlackSimPlugin
m_dbusInterface->callDBusAsync(QLatin1String("isPaused"), setterCallback(o_paused));
}
bool CXSwiftBusServiceProxy::isUsingRealTime() const
{
return m_dbusInterface->callDBusRet<bool>(QLatin1String("isUsingRealTime"));
}
void CXSwiftBusServiceProxy::isUsingRealTimeAsync(bool *o_isRealTime)
{
m_dbusInterface->callDBusAsync(QLatin1String("isUsingRealTime"), setterCallback(o_isRealTime));
}
double CXSwiftBusServiceProxy::getLatitudeDeg() const
{
return m_dbusInterface->callDBusRet<double>(QLatin1String("getLatitudeDeg"));
@@ -220,24 +206,6 @@ namespace BlackSimPlugin
m_dbusInterface->callDBusAsync(QLatin1String("getGroundSpeedKts"), setterCallback(o_groundspeed));
}
double CXSwiftBusServiceProxy::getIndicatedAirspeedKias() const
{
return m_dbusInterface->callDBusRet<double>(QLatin1String("getIndicatedAirspeedKias"));
}
void CXSwiftBusServiceProxy::getIndicatedAirspeedKiasAsync(double *o_ias)
{
m_dbusInterface->callDBusAsync(QLatin1String("getIndicatedAirspeedKias"), setterCallback(o_ias));
}
double CXSwiftBusServiceProxy::getTrueAirspeedKias() const
{
return m_dbusInterface->callDBusRet<double>(QLatin1String("getTrueAirspeedKias"));
}
void CXSwiftBusServiceProxy::getTrueAirspeedKiasAsync(double *o_tas)
{
m_dbusInterface->callDBusAsync(QLatin1String("getTrueAirspeedKias"), setterCallback(o_tas));
}
double CXSwiftBusServiceProxy::getPitchDeg() const
{
return m_dbusInterface->callDBusRet<double>(QLatin1String("getPitchDeg"));
@@ -256,24 +224,6 @@ namespace BlackSimPlugin
m_dbusInterface->callDBusAsync(QLatin1String("getRollDeg"), setterCallback(o_roll));
}
double CXSwiftBusServiceProxy::getTrueHeadingDeg() const
{
return m_dbusInterface->callDBusRet<double>(QLatin1String("getTrueHeadingDeg"));
}
void CXSwiftBusServiceProxy::getTrueHeadingDegAsync(double *o_heading)
{
m_dbusInterface->callDBusAsync(QLatin1String("getTrueHeadingDeg"), setterCallback(o_heading));
}
bool CXSwiftBusServiceProxy::getAnyWheelOnGround() const
{
return m_dbusInterface->callDBusRet<bool>(QLatin1String("getAnyWheelOnGround"));
}
void CXSwiftBusServiceProxy::getAnyWheelOnGroundAsync(bool *o_anyWheel)
{
m_dbusInterface->callDBusAsync(QLatin1String("getAnyWheelOnGround"), setterCallback(o_anyWheel));
}
bool CXSwiftBusServiceProxy::getAllWheelsOnGround() const
{
return m_dbusInterface->callDBusRet<bool>(QLatin1String("getAllWheelsOnGround"));
@@ -458,16 +408,6 @@ namespace BlackSimPlugin
m_dbusInterface->callDBusAsync(QLatin1String("getGearDeployRatio"), setterCallback(o_gearDeployRatio));
}
int CXSwiftBusServiceProxy::getNumberOfEngines() const
{
return m_dbusInterface->callDBusRet<int>(QLatin1String("getNumberOfEngines"));
}
void CXSwiftBusServiceProxy::getNumberOfEnginesAsync(double *o_numberOfEngines)
{
m_dbusInterface->callDBusAsync(QLatin1String("getNumberOfEngines"), setterCallback(o_numberOfEngines));
}
QList<double> CXSwiftBusServiceProxy::getEngineN1Percentage() const
{
return m_dbusInterface->callDBusRet<QList<double>>(QLatin1String("getEngineN1Percentage"));

40
src/plugins/simulator/flightgear/fgswiftbusserviceproxy.h
View File

@@ -106,9 +106,6 @@ namespace BlackSimPlugin
//! \copydoc XSwiftBus::CService::addTextMessage
void addTextMessage(const QString &text);
//! \copydoc XSwiftBus::CService::updateAirportsInRange
void updateAirportsInRange();
//! \copydoc XSwiftBus::CService::getAircraftModelPath
//! @{
QString getAircraftModelPath() const;
@@ -169,12 +166,6 @@ namespace BlackSimPlugin
void isPausedAsync(bool *o_paused);
//! @}
//! \copydoc XSwiftBus::CService::isUsingRealTime
//! @{
bool isUsingRealTime() const;
void isUsingRealTimeAsync(bool *o_isRealTime);
//! @}
//! \copydoc XSwiftBus::CService::getLatitudeDeg
//! @{
double getLatitudeDeg() const;
@@ -205,18 +196,6 @@ namespace BlackSimPlugin
void getGroundSpeedKtsAsync(double *o_groundspeed);
//! @}
//! \copydoc XSwiftBus::CService::getIndicatedAirspeedKias
//! @{
double getIndicatedAirspeedKias() const;
void getIndicatedAirspeedKiasAsync(double *o_ias);
//! @}
//! \copydoc XSwiftBus::CService::getTrueAirspeedKias
//! @{
double getTrueAirspeedKias() const;
void getTrueAirspeedKiasAsync(double *o_tas);
//! @}
//! \copydoc XSwiftBus::CService::getPitchDeg
//! @{
double getPitchDeg() const;
@@ -229,18 +208,6 @@ namespace BlackSimPlugin
void getRollDegAsync(double *o_roll);
//! @}
//! \copydoc XSwiftBus::CService::getTrueHeadingDeg
//! @{
double getTrueHeadingDeg() const;
void getTrueHeadingDegAsync(double *o_heading);
//! @}
//! Get whether any wheel is on the ground
//! @{
bool getAnyWheelOnGround() const;
void getAnyWheelOnGroundAsync(bool *o_anyWheel);
//! @}
//! Get whether all wheels are on the ground
//! @{
bool getAllWheelsOnGround() const;
@@ -356,13 +323,6 @@ namespace BlackSimPlugin
void getGearDeployRatioAsync(double *o_gearDeployRatio);
//! @}
//! \copydoc XSwiftBus::CService::getNumberOfEngines
//! @{
int getNumberOfEngines() const;
void getNumberOfEnginesAsync(double *o_numberOfEngines);
//! @}
//! \copydoc XSwiftBus::CService::getEngineN1Percentage
//! @{
QList<double> getEngineN1Percentage() const;

7
src/plugins/simulator/flightgear/simulatorflightgear.cpp
View File

@@ -106,7 +106,6 @@ namespace BlackSimPlugin
m_pendingAddedTimer.setObjectName(this->objectName().append(":m_pendingAddedTimer"));
connect(&m_fastTimer, &QTimer::timeout, this, &CSimulatorXPlane::fastTimerTimeout);
connect(&m_slowTimer, &QTimer::timeout, this, &CSimulatorXPlane::slowTimerTimeout);
connect(&m_airportUpdater, &QTimer::timeout, this, &CSimulatorXPlane::updateAirportsInRange);
connect(&m_pendingAddedTimer, &QTimer::timeout, this, &CSimulatorXPlane::addNextPendingAircraft);
m_fastTimer.start(100);
m_slowTimer.start(1000);
@@ -357,7 +356,6 @@ namespace BlackSimPlugin
setSimulatorDetails("X-Plane", {}, "");
connect(m_serviceProxy, &CXSwiftBusServiceProxy::aircraftModelChanged, this, &CSimulatorXPlane::emitOwnAircraftModelChanged);
connect(m_serviceProxy, &CXSwiftBusServiceProxy::airportsInRangeUpdated, this, &CSimulatorXPlane::setAirportsInRange);
m_serviceProxy->updateAirportsInRange();
connect(m_trafficProxy, &CXSwiftBusTrafficProxy::simFrame, this, &CSimulatorXPlane::updateRemoteAircraft);
connect(m_trafficProxy, &CXSwiftBusTrafficProxy::remoteAircraftAdded, this, &CSimulatorXPlane::onRemoteAircraftAdded);
connect(m_trafficProxy, &CXSwiftBusTrafficProxy::remoteAircraftAddingFailed, this, &CSimulatorXPlane::onRemoteAircraftAddingFailed);
@@ -954,11 +952,6 @@ namespace BlackSimPlugin
m_dBusConnection = QDBusConnection { "default" };
}
void CSimulatorXPlane::updateAirportsInRange()
{
if (this->isConnected()) { m_serviceProxy->updateAirportsInRange(); }
}
void CSimulatorXPlane::onRemoteAircraftAdded(const QString &callsign)
{
const CCallsign cs(callsign);

3
src/plugins/simulator/flightgear/simulatorflightgear.h
View File

@@ -186,9 +186,6 @@ namespace BlackSimPlugin
//! \remark this is where the interpolated data are set
void updateRemoteAircraft();
//! Update airports
void updateAirportsInRange();
//! Request elevation and CG from XPlane @{
void requestRemoteAircraftDataFromXPlane();
void requestRemoteAircraftDataFromXPlane(const BlackMisc::Aviation::CCallsignSet &callsigns);