From b3e5539ec28958cb064e9bc061d46202cb787107 Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Fri, 3 Feb 2023 00:15:52 +0100 Subject: [PATCH] Enable 8.33 kHz frequency spacing support Related to #186 --- src/blackgui/components/textmessagecomponent.cpp | 2 +- src/blackgui/editors/cockpitcomform.ui | 16 ++++++++-------- src/blackmisc/aviation/comsystem.h | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/blackgui/components/textmessagecomponent.cpp b/src/blackgui/components/textmessagecomponent.cpp index ac7f30b5e..d8853e021 100644 --- a/src/blackgui/components/textmessagecomponent.cpp +++ b/src/blackgui/components/textmessagecomponent.cpp @@ -448,7 +448,7 @@ namespace BlackGui::Components CAtcStationList f2Stations; if (sGui && sGui->getIContextNetwork()) { - const CComSystem::ChannelSpacing spacing = CComSystem::ChannelSpacing25KHz; + const CComSystem::ChannelSpacing spacing = CComSystem::ChannelSpacing8_33KHz; f1Stations = sGui->getIContextNetwork()->getOnlineStationsForFrequency(freq1, spacing); f2Stations = sGui->getIContextNetwork()->getOnlineStationsForFrequency(freq2, spacing); } diff --git a/src/blackgui/editors/cockpitcomform.ui b/src/blackgui/editors/cockpitcomform.ui index 4d7aea7a4..7b692b407 100644 --- a/src/blackgui/editors/cockpitcomform.ui +++ b/src/blackgui/editors/cockpitcomform.ui @@ -35,10 +35,10 @@ 118.000000000000000 - 136.974999999999994 + 136.998 - 0.025000000000000 + 0.0 119.000000000000000 @@ -88,10 +88,10 @@ 118.000000000000000 - 136.974999999999994 + 136.998 - 0.025000000000000 + 0.0 119.000000000000000 @@ -153,10 +153,10 @@ 118.000000000000000 - 136.974999999999994 + 136.998 - 0.025000000000000 + 0.0 119.000000000000000 @@ -172,10 +172,10 @@ 118.000000000000000 - 136.974999999999994 + 136.998 - 0.025000000000000 + 0.0 119.000000000000000 diff --git a/src/blackmisc/aviation/comsystem.h b/src/blackmisc/aviation/comsystem.h index a1fbb723f..e10542ba0 100644 --- a/src/blackmisc/aviation/comsystem.h +++ b/src/blackmisc/aviation/comsystem.h @@ -155,7 +155,7 @@ namespace BlackMisc::Aviation static void registerMetadata(); private: - ChannelSpacing m_channelSpacing = ChannelSpacing25KHz; //!< channel spacing + ChannelSpacing m_channelSpacing = ChannelSpacing8_33KHz; //!< channel spacing //! Give me channel spacing in KHz //! \remarks Just a helper method, that is why no CFrequency is returned