diff --git a/src/blackmisc/aviation/atcstation.cpp b/src/blackmisc/aviation/atcstation.cpp index 12e55b2c6..ee5ca1855 100644 --- a/src/blackmisc/aviation/atcstation.cpp +++ b/src/blackmisc/aviation/atcstation.cpp @@ -280,11 +280,6 @@ namespace BlackMisc::Aviation return true; } - bool CAtcStation::isComUnitTunedIn25KHz(const CComSystem &comUnit) const - { - return comUnit.isActiveFrequencyWithin25kHzChannel(this->getFrequency()); - } - bool CAtcStation::isComUnitTunedInChannelSpacing(const CComSystem &comUnit) const { return comUnit.isActiveFrequencySameFrequency(this->getFrequency()); diff --git a/src/blackmisc/aviation/atcstation.h b/src/blackmisc/aviation/atcstation.h index 4d397b01a..3c9baf0c6 100644 --- a/src/blackmisc/aviation/atcstation.h +++ b/src/blackmisc/aviation/atcstation.h @@ -197,9 +197,6 @@ namespace BlackMisc::Aviation //! Booked now? bool isBookedNow() const; - //! Tuned in within 25KHz channel spacing - bool isComUnitTunedIn25KHz(const Aviation::CComSystem &comUnit) const; - //! Tuned in within channel spacing bool isComUnitTunedInChannelSpacing(const Aviation::CComSystem &comUnit) const; diff --git a/src/blackmisc/aviation/atcstationlist.cpp b/src/blackmisc/aviation/atcstationlist.cpp index 34563d00f..939451792 100644 --- a/src/blackmisc/aviation/atcstationlist.cpp +++ b/src/blackmisc/aviation/atcstationlist.cpp @@ -29,14 +29,6 @@ namespace BlackMisc::Aviation CSequence(other) { } - CAtcStationList CAtcStationList::findIfComUnitTunedIn25KHz(const CComSystem &comUnit) const - { - return this->findBy([&](const CAtcStation & atcStation) - { - return atcStation.isComUnitTunedIn25KHz(comUnit); - }); - } - CAtcStationList CAtcStationList::findIfComUnitTunedInChannelSpacing(const CComSystem &comUnit) const { return this->findBy([&](const CAtcStation & atcStation) diff --git a/src/blackmisc/aviation/atcstationlist.h b/src/blackmisc/aviation/atcstationlist.h index 3fbb1c1f1..5713b399b 100644 --- a/src/blackmisc/aviation/atcstationlist.h +++ b/src/blackmisc/aviation/atcstationlist.h @@ -45,9 +45,6 @@ namespace BlackMisc::Aviation //! Construct from a base class object. CAtcStationList(const CSequence &other); - //! Find 0..n stations tuned in frequency of COM unit (with 25kHz channel spacing) - CAtcStationList findIfComUnitTunedIn25KHz(const CComSystem &comUnit) const; - //! Find 0..n stations tuned in frequency of COM unit (with channel spacing) CAtcStationList findIfComUnitTunedInChannelSpacing(const CComSystem &comUnit) const; diff --git a/src/blackmisc/simulation/simulatedaircraft.cpp b/src/blackmisc/simulation/simulatedaircraft.cpp index da68b7e63..0dfc26a26 100644 --- a/src/blackmisc/simulation/simulatedaircraft.cpp +++ b/src/blackmisc/simulation/simulatedaircraft.cpp @@ -563,18 +563,6 @@ namespace BlackMisc::Simulation m_pilot.setCallsign(callsign); } - bool CSimulatedAircraft::isActiveFrequencyWithin8_33kHzChannel(const CFrequency &comFrequency) const - { - return m_com1system.isActiveFrequencyWithin8_33kHzChannel(comFrequency) || - m_com2system.isActiveFrequencyWithin8_33kHzChannel(comFrequency); - } - - bool CSimulatedAircraft::isActiveFrequencyWithin25kHzChannel(const CFrequency &comFrequency) const - { - return m_com1system.isActiveFrequencyWithin25kHzChannel(comFrequency) || - m_com2system.isActiveFrequencyWithin25kHzChannel(comFrequency); - } - bool CSimulatedAircraft::isActiveFrequencyWithinChannelSpacing(const CFrequency &comFrequency) const { return m_com1system.isActiveFrequencySameFrequency(comFrequency) || diff --git a/src/blackmisc/simulation/simulatedaircraft.h b/src/blackmisc/simulation/simulatedaircraft.h index 5eb6f6a4e..0ed3dbd04 100644 --- a/src/blackmisc/simulation/simulatedaircraft.h +++ b/src/blackmisc/simulation/simulatedaircraft.h @@ -290,12 +290,6 @@ namespace BlackMisc //! Identical COM system? bool hasSameComData(const Aviation::CComSystem &com1, const Aviation::CComSystem &com2, const Aviation::CTransponder &transponder); - //! Is any (COM1/2) active frequency within 8.3383kHz channel? - bool isActiveFrequencyWithin8_33kHzChannel(const PhysicalQuantities::CFrequency &comFrequency) const; - - //! Is any (COM1/2) active frequency within 25kHz channel? - bool isActiveFrequencyWithin25kHzChannel(const PhysicalQuantities::CFrequency &comFrequency) const; - //! Is any (COM1/2) active frequency within the COM units channel spacing? bool isActiveFrequencyWithinChannelSpacing(const PhysicalQuantities::CFrequency &comFrequency) const;