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

refactor(fs): Move FSUIPC from fscommon to FS9

Browse Source 
With default settings, FSUIPC was not really used
by FS simulators (except FS9) as the transponder
mode readout was done with SB offsets through SimConnect.
For simplification, this removes FSUIPC from fscommon and moves it to FS9.
Therefor this also removes the option for FSX/P3D users to toggle FSUIPC.
This commit is contained in:
Lars Toenning
2024-04-11 23:25:40 +02:00
parent 93af5fef1c
commit 18d0b1eefc
9 changed files with 14 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,7 +59,6 @@ namespace BlackSimPlugin::FsxCommon
Q_ASSERT_X(sApp, Q_FUNC_INFO, "Missing global object");
m_simObjectTimer.setInterval(AddPendingAircraftIntervalMs);
m_useFsuipc = false;
// default model will be set in derived class
CSimulatorFsxCommon::registerHelp();
@@ -69,7 +68,6 @@ namespace BlackSimPlugin::FsxCommon
CSimulatorFsxCommon::~CSimulatorFsxCommon()
{
this->disconnectFrom();
// fsuipc is disconnected in CSimulatorFsCommon
}
bool CSimulatorFsxCommon::isConnected() const
@@ -95,12 +93,6 @@ namespace BlackSimPlugin::FsxCommon
return false;
}
// FSUIPC too
if (m_useFsuipc)
{
m_fsuipc->open();
}
// set structures and move on
this->triggerAutoTraceSendId(); // we trace the init phase, so in case something goes wrong there
this->initEvents();
@@ -127,7 +119,7 @@ namespace BlackSimPlugin::FsxCommon
m_simConnected = false;
}
// emit status and disconnect FSUIPC
// emit status
return CSimulatorFsCommon::disconnectFrom();
}
@@ -181,7 +173,6 @@ namespace BlackSimPlugin::FsxCommon
if (newTransponder.getTransponderMode() != m_simTransponder.getTransponderMode())
{
// use one way to transfer XPDR ident/mode not both
if (m_useSbOffsets)
{
byte ident = newTransponder.isIdentifying() ? 1U : 0U; // 1 is ident
@@ -205,11 +196,6 @@ namespace BlackSimPlugin::FsxCommon
}
changed = true;
}
else if (m_useFsuipc && m_fsuipc)
{
m_fsuipc->write(newTransponder);
changed = true;
}
}
// avoid changes of cockpit back to old values due to an outdated read back value
@@ -959,18 +945,6 @@ namespace BlackSimPlugin::FsxCommon
this->updateCockpit(myAircraft.getCom1System(), myAircraft.getCom2System(), xpdr, this->identifier());
}
void CSimulatorFsxCommon::updateOwnAircraftFromSimulatorFsuipc(const CTransponder &xpdr)
{
if (!m_useFsuipc) { return; }
if (m_skipCockpitUpdateCycles > 0) { return; }
const CSimulatedAircraft myAircraft(this->getOwnAircraft());
const bool changed = (myAircraft.getTransponderMode() != xpdr.getTransponderMode());
if (!changed) { return; }
CTransponder myXpdr = myAircraft.getTransponder();
myXpdr.setTransponderMode(xpdr.getTransponderMode());
this->updateCockpit(myAircraft.getCom1System(), myAircraft.getCom2System(), myXpdr, this->identifier());
}
bool CSimulatorFsxCommon::simulatorReportedObjectAdded(DWORD objectId)
{
if (this->isShuttingDownOrDisconnected()) { return true; } // pretend everything is fine
@@ -1518,26 +1492,6 @@ namespace BlackSimPlugin::FsxCommon
return;
}
m_dispatchErrors = 0;
if (m_useFsuipc && m_fsuipc)
{
if (m_dispatchProcCount % 10 == 0)
{
// slow updates, here only when SB/SimConnect is disabled as those do the same thing
if (!m_useSbOffsets)
{
CSimulatedAircraft fsuipcAircraft(this->getOwnAircraft());
const bool ok = m_fsuipc->read(fsuipcAircraft, true, false, false);
if (ok)
{
this->updateOwnAircraftFromSimulatorFsuipc(fsuipcAircraft.getTransponder());
}
}
}
else
{
// fast
}
}
}
bool CSimulatorFsxCommon::physicallyAddRemoteAircraftImpl(const CSimulatedAircraft &newRemoteAircraft, CSimulatorFsxCommon::AircraftAddMode addMode, const CSimConnectObject &correspondingSimObject)