Skip to content

Commit 56043ef

Browse files
tzoblertzobler
committed
fix: change to GENERAL ENG RPM
1 parent 6e2397d commit 56043ef

3 files changed

Lines changed: 48 additions & 49 deletions

File tree

‎src/misc/aviation/aircraftengine.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ namespace swift::misc::aviation
2727
{
2828
m_power = power;
2929
if (!m_on) m_power = 0;
30-
if (m_power > 100) m_power = 100;
3130
if (m_power < 0) m_power = 0;
3231
}
3332

‎src/plugins/simulator/fsxcommon/simconnectdatadefinition.cpp‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -186,22 +186,22 @@ namespace swift::simplugin::fsxcommon
186186
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft,
187187
"GENERAL ENG COMBUSTION:8", "Bool");
188188
// 45
189-
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft,
190-
"GENERAL ENG THROTTLE LEVER POSITION:1", "percent");
191-
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft,
192-
"GENERAL ENG THROTTLE LEVER POSITION:2", "percent");
193-
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft,
194-
"GENERAL ENG THROTTLE LEVER POSITION:3", "percent");
195-
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft,
196-
"GENERAL ENG THROTTLE LEVER POSITION:4", "percent");
197-
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft,
198-
"GENERAL ENG THROTTLE LEVER POSITION:5", "percent");
199-
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft,
200-
"GENERAL ENG THROTTLE LEVER POSITION:6", "percent");
201-
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft,
202-
"GENERAL ENG THROTTLE LEVER POSITION:7", "percent");
203-
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft,
204-
"GENERAL ENG THROTTLE LEVER POSITION:8", "percent");
189+
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft, "GENERAL ENG RPM:1",
190+
"rpm");
191+
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft, "GENERAL ENG RPM:2",
192+
"rpm");
193+
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft, "GENERAL ENG RPM:3",
194+
"rpm");
195+
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft, "GENERAL ENG RPM:4",
196+
"rpm");
197+
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft, "GENERAL ENG RPM:5",
198+
"rpm");
199+
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft, "GENERAL ENG RPM:6",
200+
"rpm");
201+
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft, "GENERAL ENG RPM:7",
202+
"rpm");
203+
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft, "GENERAL ENG RPM:8",
204+
"rpm");
205205
// 53
206206
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft, "VELOCITY WORLD X",
207207
"Feet per second");
@@ -275,21 +275,21 @@ namespace swift::simplugin::fsxcommon
275275
"GENERAL ENG COMBUSTION:8", "Bool");
276276

277277
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataRemoteAircraftPartsWithoutLights,
278-
"GENERAL ENG THROTTLE LEVER POSITION:1", "percent");
278+
"GENERAL ENG RPM:1", "rpm");
279279
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataRemoteAircraftPartsWithoutLights,
280-
"GENERAL ENG THROTTLE LEVER POSITION:2", "percent");
280+
"GENERAL ENG RPM:2", "rpm");
281281
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataRemoteAircraftPartsWithoutLights,
282-
"GENERAL ENG THROTTLE LEVER POSITION:3", "percent");
282+
"GENERAL ENG RPM:3", "rpm");
283283
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataRemoteAircraftPartsWithoutLights,
284-
"GENERAL ENG THROTTLE LEVER POSITION:4", "percent");
284+
"GENERAL ENG RPM:4", "rpm");
285285
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataRemoteAircraftPartsWithoutLights,
286-
"GENERAL ENG THROTTLE LEVER POSITION:5", "percent");
286+
"GENERAL ENG RPM:5", "rpm");
287287
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataRemoteAircraftPartsWithoutLights,
288-
"GENERAL ENG THROTTLE LEVER POSITION:6", "percent");
288+
"GENERAL ENG RPM:6", "rpm");
289289
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataRemoteAircraftPartsWithoutLights,
290-
"GENERAL ENG THROTTLE LEVER POSITION:7", "percent");
290+
"GENERAL ENG RPM:7", "rpm");
291291
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataRemoteAircraftPartsWithoutLights,
292-
"GENERAL ENG THROTTLE LEVER POSITION:8", "percent");
292+
"GENERAL ENG RPM:8", "rpm");
293293

294294
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraftTitle, "TITLE",
295295
nullptr, SIMCONNECT_DATATYPE_STRING256);

‎src/plugins/simulator/msfs2024/simconnectdatadefinitionmsfs2024.cpp‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -187,22 +187,22 @@ namespace swift::simplugin::msfs2024common
187187
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft,
188188
"GENERAL ENG COMBUSTION:8", "Bool");
189189

190-
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft,
191-
"GENERAL ENG THROTTLE LEVER POSITION:1", "percent");
192-
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft,
193-
"GENERAL ENG THROTTLE LEVER POSITION:2", "percent");
194-
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft,
195-
"GENERAL ENG THROTTLE LEVER POSITION:3", "percent");
196-
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft,
197-
"GENERAL ENG THROTTLE LEVER POSITION:4", "percent");
198-
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft,
199-
"GENERAL ENG THROTTLE LEVER POSITION:5", "percent");
200-
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft,
201-
"GENERAL ENG THROTTLE LEVER POSITION:6", "percent");
202-
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft,
203-
"GENERAL ENG THROTTLE LEVER POSITION:7", "percent");
204-
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft,
205-
"GENERAL ENG THROTTLE LEVER POSITION:8", "percent");
190+
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft, "GENERAL ENG RPM:1",
191+
"rpm");
192+
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft, "GENERAL ENG RPM:2",
193+
"rpm");
194+
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft, "GENERAL ENG RPM:3",
195+
"rpm");
196+
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft, "GENERAL ENG RPM:4",
197+
"rpm");
198+
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft, "GENERAL ENG RPM:5",
199+
"rpm");
200+
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft, "GENERAL ENG RPM:6",
201+
"rpm");
202+
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft, "GENERAL ENG RPM:7",
203+
"rpm");
204+
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft, "GENERAL ENG RPM:8",
205+
"rpm");
206206

207207
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraft, "VELOCITY WORLD X",
208208
"Feet per second");
@@ -279,21 +279,21 @@ namespace swift::simplugin::msfs2024common
279279
"GENERAL ENG COMBUSTION:8", "Bool");
280280

281281
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataRemoteAircraftPartsWithoutLights,
282-
"GENERAL ENG THROTTLE LEVER POSITION:1", "percent");
282+
"GENERAL ENG RPM:1", "rpm");
283283
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataRemoteAircraftPartsWithoutLights,
284-
"GENERAL ENG THROTTLE LEVER POSITION:2", "percent");
284+
"GENERAL ENG RPM:2", "rpm");
285285
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataRemoteAircraftPartsWithoutLights,
286-
"GENERAL ENG THROTTLE LEVER POSITION:3", "percent");
286+
"GENERAL ENG RPM:3", "rpm");
287287
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataRemoteAircraftPartsWithoutLights,
288-
"GENERAL ENG THROTTLE LEVER POSITION:4", "percent");
288+
"GENERAL ENG RPM:4", "rpm");
289289
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataRemoteAircraftPartsWithoutLights,
290-
"GENERAL ENG THROTTLE LEVER POSITION:5", "percent");
290+
"GENERAL ENG RPM:5", "rpm");
291291
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataRemoteAircraftPartsWithoutLights,
292-
"GENERAL ENG THROTTLE LEVER POSITION:6", "percent");
292+
"GENERAL ENG RPM:6", "rpm");
293293
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataRemoteAircraftPartsWithoutLights,
294-
"GENERAL ENG THROTTLE LEVER POSITION:7", "percent");
294+
"GENERAL ENG RPM:7", "rpm");
295295
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataRemoteAircraftPartsWithoutLights,
296-
"GENERAL ENG THROTTLE LEVER POSITION:8", "percent");
296+
"GENERAL ENG RPM:8", "rpm");
297297

298298
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataOwnAircraftTitle, "TITLE",
299299
nullptr, SIMCONNECT_DATATYPE_STRING256);

0 commit comments

Comments
 (0)