From 5202807ab6362874e92d9e73015016c19b66ac39 Mon Sep 17 00:00:00 2001 From: Thomas Zobler Date: Fri, 6 Feb 2026 09:15:26 +0100 Subject: [PATCH] [skip ci] change to read "GENERAL ENG PCT MAX RPM" --- src/misc/aviation/aircraftengine.cpp | 10 +++++----- src/misc/aviation/aircraftengine.h | 6 +++--- .../simconnectdatadefinitionmsfs2024.cpp | 16 ++++++++-------- src/xswiftbus/datarefs.inc | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/misc/aviation/aircraftengine.cpp b/src/misc/aviation/aircraftengine.cpp index 642ef0933..cb24dc13a 100644 --- a/src/misc/aviation/aircraftengine.cpp +++ b/src/misc/aviation/aircraftengine.cpp @@ -12,7 +12,7 @@ SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftEngine) namespace swift::misc::aviation { CAircraftEngine::CAircraftEngine(int number, bool on, int enginePercentage) - : m_number(number), m_on(on), m_power(enginePercentage) + : m_number(number), m_on(on), m_rpm_pct(enginePercentage) { Q_ASSERT_X(number > 0, "CAircraftEngine", "Engine numbers have to be > 1"); } @@ -25,10 +25,10 @@ namespace swift::misc::aviation void CAircraftEngine::setEnginePower(double power) { - m_power = power; - if (!m_on) m_power = 0; - if (m_power > 100) m_power = 100; - if (m_power < 0) m_power = 0; + m_rpm_pct = power; + if (!m_on) m_rpm_pct = 0; + if (m_rpm_pct > 100) m_rpm_pct = 100; + if (m_rpm_pct < 0) m_rpm_pct = 0; } QString CAircraftEngine::convertToQString(bool i18n) const diff --git a/src/misc/aviation/aircraftengine.h b/src/misc/aviation/aircraftengine.h index c195fe43a..a59f84138 100644 --- a/src/misc/aviation/aircraftengine.h +++ b/src/misc/aviation/aircraftengine.h @@ -46,7 +46,7 @@ namespace swift::misc::aviation //! Set engine percentage (0..100) void setEnginePower(double percentage); - double getEnginePower() const { return m_power; } + double getEnginePower() const { return m_rpm_pct; } //! \copydoc swift::misc::mixin::String::toQString QString convertToQString(bool i18n = false) const; @@ -54,13 +54,13 @@ namespace swift::misc::aviation private: int m_number = 1; bool m_on = false; - double m_power = 0.0; + double m_rpm_pct = 0.0; SWIFT_METACLASS( CAircraftEngine, SWIFT_METAMEMBER(number, 0, DisabledForJson), SWIFT_METAMEMBER(on), - SWIFT_METAMEMBER(power)); + SWIFT_METAMEMBER(rpm_pct)); }; } // namespace swift::misc::aviation diff --git a/src/plugins/simulator/msfs2024/simconnectdatadefinitionmsfs2024.cpp b/src/plugins/simulator/msfs2024/simconnectdatadefinitionmsfs2024.cpp index 459958239..4500c97eb 100644 --- a/src/plugins/simulator/msfs2024/simconnectdatadefinitionmsfs2024.cpp +++ b/src/plugins/simulator/msfs2024/simconnectdatadefinitionmsfs2024.cpp @@ -188,21 +188,21 @@ namespace swift::simplugin::msfs2024common "GENERAL ENG COMBUSTION:8", "Bool"); hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft, - "GENERAL ENG THROTTLE LEVER POSITION:1", "percent"); + "GENERAL ENG PCT MAX RPM:1", "percent"); hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft, - "GENERAL ENG THROTTLE LEVER POSITION:2", "percent"); + "GENERAL ENG PCT MAX RPM:2", "percent"); hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft, - "GENERAL ENG THROTTLE LEVER POSITION:3", "percent"); + "GENERAL ENG PCT MAX RPM:3", "percent"); hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft, - "GENERAL ENG THROTTLE LEVER POSITION:4", "percent"); + "GENERAL ENG PCT MAX RPM:4", "percent"); hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft, - "GENERAL ENG THROTTLE LEVER POSITION:5", "percent"); + "GENERAL ENG PCT MAX RPM:5", "percent"); hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft, - "GENERAL ENG THROTTLE LEVER POSITION:6", "percent"); + "GENERAL ENG PCT MAX RPM:6", "percent"); hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft, - "GENERAL ENG THROTTLE LEVER POSITION:7", "percent"); + "GENERAL ENG PCT MAX RPM:7", "percent"); hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft, - "GENERAL ENG THROTTLE LEVER POSITION:8", "percent"); + "GENERAL ENG PCT MAX RPM:8", "percent"); hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft, "VELOCITY WORLD X", "Feet per second"); diff --git a/src/xswiftbus/datarefs.inc b/src/xswiftbus/datarefs.inc index 13c86c48b..4ed8fa55a 100644 --- a/src/xswiftbus/datarefs.inc +++ b/src/xswiftbus/datarefs.inc @@ -27689,10 +27689,10 @@ namespace xplane }; //! Switch, 0 or 1. This is to turn COM1 on to get a clearance without turning the rest of the avionics on. (boolean) - struct gnd_com_power_on + struct gnd_com_rpm_pct_on { //! Dataref name - static constexpr const char *name() { return "sim/cockpit2/switches/gnd_com_power_on"; } + static constexpr const char *name() { return "sim/cockpit2/switches/gnd_com_rpm_pct_on"; } //! Can be written to? static constexpr bool writable = true; //! Dataref type