diff --git a/samples/miscdbus/servicetool.cpp b/samples/miscdbus/servicetool.cpp index c7864aa5a..0cae25a45 100644 --- a/samples/miscdbus/servicetool.cpp +++ b/samples/miscdbus/servicetool.cpp @@ -139,9 +139,8 @@ namespace swift::sample << tsqv.userType() << Qt::endl; // Aviation - const CComSystem comSystem = - CComSystem("DBUS COM1", CPhysicalQuantitiesConstants::FrequencyInternationalAirDistress(), - CPhysicalQuantitiesConstants::FrequencyUnicom()); + const CComSystem comSystem = CComSystem("DBUS COM1", CPhysicalQuantitiesConstants::FrequencyUnicom(), + CPhysicalQuantitiesConstants::FrequencyUnicom()); testServiceInterface.receiveComUnit(comSystem); qtout << "Send COM via interface " << comSystem << Qt::endl; diff --git a/src/misc/aviation/comsystem.cpp b/src/misc/aviation/comsystem.cpp index 247344043..977a912b9 100644 --- a/src/misc/aviation/comsystem.cpp +++ b/src/misc/aviation/comsystem.cpp @@ -61,13 +61,6 @@ namespace swift::misc::aviation this->setFrequencyActive(physical_quantities::CPhysicalQuantitiesConstants::FrequencyUnicom()); } - void CComSystem::setActiveInternationalAirDistress() - { - this->toggleActiveStandby(); - this->setFrequencyActive( - physical_quantities::CPhysicalQuantitiesConstants::FrequencyInternationalAirDistress()); - } - CComSystem CComSystem::getCom1System(double activeFrequencyMHz, double standbyFrequencyMHz) { return CComSystem( diff --git a/src/misc/aviation/comsystem.h b/src/misc/aviation/comsystem.h index 676691e6a..fac643ac0 100644 --- a/src/misc/aviation/comsystem.h +++ b/src/misc/aviation/comsystem.h @@ -89,9 +89,6 @@ namespace swift::misc::aviation //! Set UNICOM frequency as active void setActiveUnicom(); - //! Set International Air Distress 121.5MHz - void setActiveInternationalAirDistress(); - //! Get channel spacing ChannelSpacing getChannelSpacing() const { return m_channelSpacing; } diff --git a/src/misc/pq/constants.h b/src/misc/pq/constants.h index fd724dcb2..780b8ab0b 100644 --- a/src/misc/pq/constants.h +++ b/src/misc/pq/constants.h @@ -8,7 +8,6 @@ #include "misc/pq/frequency.h" #include "misc/pq/pressure.h" -#include "misc/pq/temperature.h" #include "misc/swiftmiscexport.h" namespace swift::misc::physical_quantities @@ -19,20 +18,6 @@ namespace swift::misc::physical_quantities class SWIFT_MISC_EXPORT CPhysicalQuantitiesConstants { public: - //! Triple point of purified water, 0.01°C - static const CTemperature &TemperatureTriplePointOfVSMOW() - { - static CTemperature t(-273.16, CTemperatureUnit::K()); - return t; - } - - //! Temperature absolute Zero in °C - static const CTemperature &TemperatureAbsoluteZeroC() - { - static CTemperature t(-273.15, CTemperatureUnit::C()); - return t; - } - //! International Standard Atmosphere pressure at mean sea level, 1013.25hPa static const CPressure &ISASeaLevelPressure() { @@ -40,47 +25,12 @@ namespace swift::misc::physical_quantities return p; } - //! ICAO standard pressure datum for flight levels, 1013.2hPa - static const CPressure &ICAOFlightLevelPressure() - { - static CPressure p(1013.2, CPressureUnit::mbar()); - return p; - } - - //! Standard pressure datum for flight levels in USA, Canada, parts of Latin America, 29.92inHg - static const CPressure &USFlightLevelPressure() - { - static CPressure p(29.92, CPressureUnit::inHg()); - return p; - } - - //! Standard pressure datum for flight levels expressed in mmHg, such as in Russia, 760mmHg - static const CPressure &RuFlightLevelPressure() - { - static CPressure p(760, CPressureUnit::mmHg()); - return p; - } - //! Unicom frequency static const CFrequency &FrequencyUnicom() { static CFrequency f(122.8, CFrequencyUnit::MHz()); return f; } - - //! Civil aircraft emergency frequency - static const CFrequency &FrequencyInternationalAirDistress() - { - static CFrequency f(121.5, CFrequencyUnit::MHz()); - return f; - } - - //! Military aircraft emergency frequency - static const CFrequency &FrequencyMilitaryAirDistress() - { - static CFrequency f(243.0, CFrequencyUnit::MHz()); - return f; - } }; } // namespace swift::misc::physical_quantities