diff --git a/src/plugins/simulator/fsx/fsuipc.cpp b/src/plugins/simulator/fscommon/fsuipc.cpp similarity index 99% rename from src/plugins/simulator/fsx/fsuipc.cpp rename to src/plugins/simulator/fscommon/fsuipc.cpp index 54b991bcc..1117f01c1 100644 --- a/src/plugins/simulator/fsx/fsuipc.cpp +++ b/src/plugins/simulator/fscommon/fsuipc.cpp @@ -26,7 +26,7 @@ using namespace BlackMisc::PhysicalQuantities; namespace BlackSimPlugin { - namespace Fsx + namespace FsCommon { CFsuipc::CFsuipc() : m_connected(false), m_validReadValues(false) @@ -85,6 +85,11 @@ namespace BlackSimPlugin this->read(); } + void CFsuipc::write() + { + + } + void CFsuipc::read() { DWORD dwResult; diff --git a/src/plugins/simulator/fsx/fsuipc.h b/src/plugins/simulator/fscommon/fsuipc.h similarity index 93% rename from src/plugins/simulator/fsx/fsuipc.h rename to src/plugins/simulator/fscommon/fsuipc.h index e3afb51f3..366231998 100644 --- a/src/plugins/simulator/fsx/fsuipc.h +++ b/src/plugins/simulator/fscommon/fsuipc.h @@ -12,7 +12,7 @@ namespace BlackSimPlugin { - namespace Fsx + namespace FsCommon { //! Class representing a FSUIPC "interface" class CFsuipc @@ -37,9 +37,15 @@ namespace BlackSimPlugin //! Valid read values bool validReadValues() const { return m_validReadValues; } + //! Get own aircraft from FSUIPC + const BlackMisc::Aviation::CAircraft &getOwnAircraft() const { return m_aircraft; } + //! Process reading and writing variables void process(); + //! Write variables + void write(); + //! Error messages static const QStringList &errorMessages() { diff --git a/src/plugins/simulator/fsx/plugin_fsx.pro b/src/plugins/simulator/fsx/plugin_fsx.pro index 33a03d3fc..5d1a3c85a 100644 --- a/src/plugins/simulator/fsx/plugin_fsx.pro +++ b/src/plugins/simulator/fsx/plugin_fsx.pro @@ -9,7 +9,7 @@ TEMPLATE = lib CONFIG += plugin shared CONFIG += blackmisc blackcore blacksim -LIBS += -lSimConnect -lFSUIPC_User +LIBS += -lsimulator_fscommon -lSimConnect -lFSUIPC_User # required for FSUIPC win32:!win32-g++*: QMAKE_LFLAGS += /NODEFAULTLIB:LIBC.lib @@ -17,6 +17,8 @@ win32:!win32-g++*: QMAKE_LFLAGS += /NODEFAULTLIB:LIBC.lib DEPENDPATH += . ../../../../src INCLUDEPATH += . ../../../../src +LIBS += -ldxguid -lole32 + SOURCES += *.cpp HEADERS += *.h diff --git a/src/plugins/simulator/fsx/simulator_fsx.cpp b/src/plugins/simulator/fsx/simulator_fsx.cpp index 5d42b473b..8e128c141 100644 --- a/src/plugins/simulator/fsx/simulator_fsx.cpp +++ b/src/plugins/simulator/fsx/simulator_fsx.cpp @@ -48,7 +48,7 @@ namespace BlackSimPlugin m_simulatorInfo(CSimulatorInfo::FSX()), m_simconnectTimerId(-1), m_skipCockpitUpdateCycles(0), - m_fsuipc(new CFsuipc()) + m_fsuipc(new FsCommon::CFsuipc()) { CFsxSimulatorSetup setup; setup.init(); // this fetches important settings on local side diff --git a/src/plugins/simulator/fsx/simulator_fsx.h b/src/plugins/simulator/fsx/simulator_fsx.h index 569e12943..f50e11398 100644 --- a/src/plugins/simulator/fsx/simulator_fsx.h +++ b/src/plugins/simulator/fsx/simulator_fsx.h @@ -8,7 +8,7 @@ #include "simconnect_datadefinition.h" #include "simconnect_object.h" -#include "fsuipc.h" +#include "../fscommon/fsuipc.h" #include "blackcore/simulator.h" #include "blackcore/interpolator_linear.h" #include "blackmisc/avaircraft.h" @@ -218,7 +218,7 @@ namespace BlackSimPlugin int m_simconnectTimerId; int m_skipCockpitUpdateCycles; //!< Skip some update cycles to allow changes in simulator cockpit to be set QFutureWatcher m_watcherConnect; - QScopedPointer m_fsuipc; + QScopedPointer m_fsuipc; }; }