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

Don't let FS9 overwrite an 8.33 kHz frequency

Browse Source
This commit is contained in:
oktal3700
2023-10-12 15:27:17 +01:00
committed by Lars Toenning
parent 67073d0193
commit 2f3dc5a4a1
3 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/blackmisc/simulation/ownaircraftprovider.cpp
View File

@@ -32,6 +32,18 @@ namespace BlackMisc::Simulation
return this->provider()->getOwnCallsign();
}
CComSystem COwnAircraftAware::getOwnComSystem(CComSystem::ComUnit unit) const
{
Q_ASSERT_X(this->provider(), Q_FUNC_INFO, "No object available");
return this->provider()->getOwnComSystem(unit);
}
CTransponder COwnAircraftAware::getOwnTransponder() const
{
Q_ASSERT_X(this->provider(), Q_FUNC_INFO, "No object available");
return this->provider()->getOwnTransponder();
}
CCoordinateGeodetic COwnAircraftAware::getOwnAircraftPosition() const
{
Q_ASSERT_X(this->provider(), Q_FUNC_INFO, "No object available");

6
src/blackmisc/simulation/ownaircraftprovider.h
View File

@@ -131,6 +131,12 @@ namespace BlackMisc
//! \copydoc IOwnAircraftProvider::getOwnCallsign
Aviation::CCallsign getOwnCallsign() const;
//! \copydoc IOwnAircraftProvider::getOwnComSystem
Aviation::CComSystem getOwnComSystem(Aviation::CComSystem::ComUnit unit) const;
//! \copydoc IOwnAircraftProvider::getOwnTransponder
Aviation::CTransponder getOwnTransponder() const;
//! \copydoc IOwnAircraftProvider::getOwnAircraftPosition
BlackMisc::Geo::CCoordinateGeodetic getOwnAircraftPosition() const;

24
src/plugins/simulator/fs9/simulatorfs9.cpp
View File

@@ -417,11 +417,25 @@ namespace BlackSimPlugin::Fs9
// To avoid jitters, I wait some update cylces to stabilize the values
if (m_skipCockpitUpdateCycles < 1)
{
this->updateCockpit(
simDataOwnAircraft.getCom1System(),
simDataOwnAircraft.getCom2System(),
simDataOwnAircraft.getTransponder(),
this->identifier());
const auto dontOverwrite = [](const CFrequency &from, const CFrequency &to) {
// don't overwrite 8.33 kHz frequencies
return CComSystem::isExclusiveWithin8_33kHzChannel(from) &&
from.valueInteger(CFrequencyUnit::kHz()) / 10 == to.valueInteger(CFrequencyUnit::kHz()) / 10;
};
CComSystem com1 = simDataOwnAircraft.getCom1System();
CComSystem com2 = simDataOwnAircraft.getCom2System();
const CComSystem oldCom1 = getOwnComSystem(CComSystem::Com1);
const CComSystem oldCom2 = getOwnComSystem(CComSystem::Com2);
if (dontOverwrite(oldCom1.getFrequencyActive(), com1.getFrequencyActive()))
com1.setFrequencyActive(oldCom1.getFrequencyActive());
if (dontOverwrite(oldCom1.getFrequencyStandby(), com1.getFrequencyStandby()))
com1.setFrequencyStandby(oldCom1.getFrequencyStandby());
if (dontOverwrite(oldCom2.getFrequencyActive(), com2.getFrequencyActive()))
com2.setFrequencyActive(oldCom2.getFrequencyActive());
if (dontOverwrite(oldCom2.getFrequencyStandby(), com2.getFrequencyStandby()))
com2.setFrequencyStandby(oldCom2.getFrequencyStandby());
this->updateCockpit(com1, com2, simDataOwnAircraft.getTransponder(), this->identifier());
}
else
{