flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-26 10:45:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

[skip ci] change to read "GENERAL ENG PCT MAX RPM"

Browse Source
This commit is contained in:
Thomas Zobler
2026-02-06 09:15:26 +01:00
parent 6e2397d3cb
commit 5202807ab6
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/misc/aviation/aircraftengine.cpp
View File

@@ -12,7 +12,7 @@ SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftEngine)
namespace swift::misc::aviation namespace swift::misc::aviation
{ {
CAircraftEngine::CAircraftEngine(int number, bool on, int enginePercentage) 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"); 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) void CAircraftEngine::setEnginePower(double power)
{ {
m_power = power; m_rpm_pct = power;
if (!m_on) m_power = 0; if (!m_on) m_rpm_pct = 0;
if (m_power > 100) m_power = 100; if (m_rpm_pct > 100) m_rpm_pct = 100;
if (m_power < 0) m_power = 0; if (m_rpm_pct < 0) m_rpm_pct = 0;
} }
QString CAircraftEngine::convertToQString(bool i18n) const QString CAircraftEngine::convertToQString(bool i18n) const

6
src/misc/aviation/aircraftengine.h
View File

@@ -46,7 +46,7 @@ namespace swift::misc::aviation
//! Set engine percentage (0..100) //! Set engine percentage (0..100)
void setEnginePower(double percentage); void setEnginePower(double percentage);
double getEnginePower() const { return m_power; } double getEnginePower() const { return m_rpm_pct; }
//! \copydoc swift::misc::mixin::String::toQString //! \copydoc swift::misc::mixin::String::toQString
QString convertToQString(bool i18n = false) const; QString convertToQString(bool i18n = false) const;
@@ -54,13 +54,13 @@ namespace swift::misc::aviation
private: private:
int m_number = 1; int m_number = 1;
bool m_on = false; bool m_on = false;
double m_power = 0.0; double m_rpm_pct = 0.0;
SWIFT_METACLASS( SWIFT_METACLASS(
CAircraftEngine, CAircraftEngine,
SWIFT_METAMEMBER(number, 0, DisabledForJson), SWIFT_METAMEMBER(number, 0, DisabledForJson),
SWIFT_METAMEMBER(on), SWIFT_METAMEMBER(on),
SWIFT_METAMEMBER(power)); SWIFT_METAMEMBER(rpm_pct));
}; };
} // namespace swift::misc::aviation } // namespace swift::misc::aviation

16
src/plugins/simulator/msfs2024/simconnectdatadefinitionmsfs2024.cpp
View File

@@ -188,21 +188,21 @@ namespace swift::simplugin::msfs2024common
"GENERAL ENG COMBUSTION:8", "Bool"); "GENERAL ENG COMBUSTION:8", "Bool");
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft, 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, 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, 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, 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, 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, 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, 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, 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", hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft, "VELOCITY WORLD X",
"Feet per second"); "Feet per second");

4
src/xswiftbus/datarefs.inc generated
View File

@@ -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) //! 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 //! 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? //! Can be written to?
static constexpr bool writable = true; static constexpr bool writable = true;
//! Dataref type //! Dataref type