diff --git a/src/gui/editors/aircraftpartsform.ui b/src/gui/editors/aircraftpartsform.ui index 731008015..bca349457 100644 --- a/src/gui/editors/aircraftpartsform.ui +++ b/src/gui/editors/aircraftpartsform.ui @@ -374,7 +374,7 @@ 100 - 11 + 12 @@ -384,7 +384,7 @@ 100 - 11 + 13 diff --git a/src/plugins/simulator/fsxcommon/simconnectdatadefinition.cpp b/src/plugins/simulator/fsxcommon/simconnectdatadefinition.cpp index 50535ba45..7085b7d4f 100644 --- a/src/plugins/simulator/fsxcommon/simconnectdatadefinition.cpp +++ b/src/plugins/simulator/fsxcommon/simconnectdatadefinition.cpp @@ -187,21 +187,21 @@ namespace swift::simplugin::fsxcommon "GENERAL ENG COMBUSTION:8", "Bool"); // 45 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"); // 53 hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft, "VELOCITY WORLD X", "Feet per second"); diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp index 0c36d7ad8..a42c76a6e 100644 --- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp +++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp @@ -753,7 +753,9 @@ namespace swift::simplugin::fsxcommon for (int index = 0; index < simulatorOwnAircraft.numberOfEngines; ++index) { - engines.push_back(CAircraftEngine(index + 1, helperList.value(index, false), powerList.value(index, 0))); + CONST DOUBLE engine_rpm = (powerList.value(index) - 20) * 100 / + 20; // convert to 0-100% range, -20 is idle power, 20 is max power, so 40 range + engines.push_back(CAircraftEngine(index + 1, helperList.value(index, false), engine_rpm)); } const CAircraftParts parts(lights, dtb(simulatorOwnAircraft.gearHandlePosition),