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

refactor(msfs): Use common method to get transponder info

Browse Source
This commit is contained in:
Lars Toenning
2025-07-12 11:35:52 +02:00
parent 57ae33a8d2
commit 6ecd75a999
3 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/simulator/fsxcommon/simconnectdatadefinition.cpp
View File

@@ -81,8 +81,7 @@ namespace swift::simplugin::fsxcommon
hr += initRemoteAircraftSimDataSet(hSimConnect); hr += initRemoteAircraftSimDataSet(hSimConnect);
hr += initSimulatorEnvironment(hSimConnect); hr += initSimulatorEnvironment(hSimConnect);
hr += initSbDataArea(hSimConnect); hr += initSbDataArea(hSimConnect);
if (simInfo.isMSFS()) { hr += initMSFSTransponder(hSimConnect); } if (simInfo.isMSFS() || simInfo.isMSFS2024()) { hr += initMSFSTransponder(hSimConnect); }
if (simInfo.isMSFS2024()) { hr += initMSFS2024Transponder(hSimConnect); }
return hr; return hr;
} }
@@ -423,22 +422,6 @@ namespace swift::simplugin::fsxcommon
return hr; return hr;
} }
HRESULT CSimConnectDefinitions::initMSFS2024Transponder(const HANDLE hSimConnect)
{
HRESULT hr = s_ok();
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataTransponderModeMSFS,
"TRANSPONDER STATE:1", "Enum");
hr += SimConnect_AddToDataDefinition(hSimConnect, CSimConnectDefinitions::DataTransponderModeMSFS,
"TRANSPONDER IDENT:1", "Bool");
if (isFailure(hr))
{
CLogMessage(static_cast<CSimConnectDefinitions *>(nullptr))
.error(u"SimConnect error: MSFS2024 transponder data definitions %1")
<< hr;
}
return hr;
}
DataDefinitionRemoteAircraftPartsWithoutLights::DataDefinitionRemoteAircraftPartsWithoutLights() DataDefinitionRemoteAircraftPartsWithoutLights::DataDefinitionRemoteAircraftPartsWithoutLights()
{ {
this->resetToInvalid(); this->resetToInvalid();

3
src/plugins/simulator/fsxcommon/simconnectdatadefinition.h
View File

@@ -345,9 +345,6 @@ namespace swift::simplugin::fsxcommon
//! Initialize data definition for MSFS transponder //! Initialize data definition for MSFS transponder
static HRESULT initMSFSTransponder(const HANDLE hSimConnect); static HRESULT initMSFSTransponder(const HANDLE hSimConnect);
//! Initialize data definition for MSFS transponder
static HRESULT initMSFS2024Transponder(const HANDLE hSimConnect);
}; };
} // namespace swift::simplugin::fsxcommon } // namespace swift::simplugin::fsxcommon

2
src/plugins/simulator/fsxcommon/simulatorfsxsimconnectproc.cpp
View File

@@ -126,7 +126,7 @@ namespace swift::simplugin::fsxcommon
const QString exceptionString( const QString exceptionString(
CSimConnectUtilities::simConnectExceptionToString(static_cast<DWORD>(exception->dwException))); CSimConnectUtilities::simConnectExceptionToString(static_cast<DWORD>(exception->dwException)));
const QString sendIdDetails = simulatorFsxP3D->getSendIdTraceDetails(sendId); const QString sendIdDetails = simulatorFsxP3D->getSendIdTraceDetails(sendId);
CLogMessage(simulatorFsxP3D).warning(u"Caught simConnect exception: '%1' '%2' | send details: '%3'") CLogMessage(simulatorFsxP3D).warning(u"Caught SimConnect exception: '%1' '%2' | send details: '%3'")
<< exceptionString << ex << (sendIdDetails.isEmpty() ? "N/A" : sendIdDetails); << exceptionString << ex << (sendIdDetails.isEmpty() ? "N/A" : sendIdDetails);
} }
break; // SIMCONNECT_RECV_ID_EXCEPTION break; // SIMCONNECT_RECV_ID_EXCEPTION