diff --git a/CHANGELOG.md b/CHANGELOG.md index 7adf758..8fcc62b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ file. This change log follows the conventions of ## [Unreleased] +### Changed +- Updated to MSFS SDK v0.20.5.0. + ## [v0.2.1] - 2022-10-29 ### Added diff --git a/simconnect-sdk/ffi/include/SimConnect.h b/simconnect-sdk/ffi/include/SimConnect.h index 2a73f38..8158dc3 100644 --- a/simconnect-sdk/ffi/include/SimConnect.h +++ b/simconnect-sdk/ffi/include/SimConnect.h @@ -14,10 +14,10 @@ #if _MSC_FULL_VER >= 140040130 #if defined(_M_IX86) || defined(_M_X64) //#pragma comment(linker,"/manifestdependency:\"type='win32' " \ -// "name='" "Microsoft..SimConnect" "' " \ +// "name='" "Microsoft.FlightSimulator.SimConnect" "' " \ // "version='" "" "' " \ // "processorArchitecture='amd64' " \ -// "publicKeyToken='" "" "'\"") +// "publicKeyToken='" "dd3546d27f3ecf37" "'\"") #endif // #if defined(_M_IX86) || defined(_M_X64) #endif // #if _MSC_FULL_VER >= 140040130 #endif // #ifndef SIMCONNECT_H_NOMANIFEST @@ -126,6 +126,7 @@ SIMCONNECT_ENUM SIMCONNECT_RECV_ID{ SIMCONNECT_RECV_ID_EVENT_EX1, SIMCONNECT_RECV_ID_FACILITY_DATA, SIMCONNECT_RECV_ID_FACILITY_DATA_END, + SIMCONNECT_RECV_ID_FACILITY_MINIMAL_LIST, }; // Data data types @@ -589,6 +590,14 @@ SIMCONNECT_REFSTRUCT SIMCONNECT_RECV_FACILITIES_LIST : public SIMCONNECT_RECV DWORD dwOutOf; // total number of transmissions the list is chopped into }; +SIMCONNECT_REFSTRUCT SIMCONNECT_RECV_LIST_TEMPLATE : public SIMCONNECT_RECV +{ + DWORD dwRequestID; + DWORD dwArraySize; + DWORD dwEntryNumber; // when the array of items is too big for one send, which send this is (0..dwOutOf-1) + DWORD dwOutOf; // total number of transmissions the list is chopped into +}; + // SIMCONNECT_DATA_FACILITY_AIRPORT SIMCONNECT_REFSTRUCT SIMCONNECT_DATA_FACILITY_AIRPORT { @@ -662,6 +671,33 @@ SIMCONNECT_REFSTRUCT SIMCONNECT_RECV_FACILITY_DATA_END : public SIMCONNECT_RECV DWORD RequestId; }; +SIMCONNECT_REFSTRUCT SIMCONNECT_ICAO +{ + char Type; + SIMCONNECT_STRING(Ident, 5 + 1); + SIMCONNECT_STRING(Region, 2 + 1); + SIMCONNECT_STRING(Airport, 4 + 1); +}; + +// SIMCONNECT_DATA_LATLONALT +SIMCONNECT_STRUCT SIMCONNECT_DATA_LATLONALT +{ + double Latitude; + double Longitude; + double Altitude; +}; + +SIMCONNECT_REFSTRUCT SIMCONNECT_FACILITY_MINIMAL +{ + SIMCONNECT_ICAO icao; + SIMCONNECT_DATA_LATLONALT lla; +}; + +SIMCONNECT_REFSTRUCT SIMCONNECT_RECV_FACILITY_MINIMAL_LIST : public SIMCONNECT_RECV_LIST_TEMPLATE +{ + SIMCONNECT_FIXEDTYPE_DATAV(SIMCONNECT_FACILITY_MINIMAL, rgData, dwArraySize, U1 /*member of UnmanagedType enum*/, SIMCONNECT_FACILITY_MINIMAL /*cli type*/); +}; + #ifdef ENABLE_SIMCONNECT_EXPERIMENTAL SIMCONNECT_REFSTRUCT SIMCONNECT_RECV_PICK : public SIMCONNECT_RECV // when dwID == SIMCONNECT_RECV_ID_RESERVED_KEY @@ -712,14 +748,6 @@ SIMCONNECT_STRUCT SIMCONNECT_DATA_WAYPOINT double percentThrottle; }; -// SIMCONNECT_DATA_LATLONALT -SIMCONNECT_STRUCT SIMCONNECT_DATA_LATLONALT -{ - double Latitude; - double Longitude; - double Altitude; -}; - // SIMCONNECT_DATA_XYZ SIMCONNECT_STRUCT SIMCONNECT_DATA_XYZ { @@ -818,5 +846,6 @@ SIMCONNECTAPI SimConnect_RequestFacilityData(HANDLE hSimConnect, SIMCONNECT_DATA SIMCONNECTAPI SimConnect_SubscribeToFacilities_EX1(HANDLE hSimConnect, SIMCONNECT_FACILITY_LIST_TYPE type, SIMCONNECT_DATA_REQUEST_ID newElemInRangeRequestID, SIMCONNECT_DATA_REQUEST_ID oldElemOutRangeRequestID); SIMCONNECTAPI SimConnect_UnsubscribeToFacilities_EX1(HANDLE hSimConnect, SIMCONNECT_FACILITY_LIST_TYPE type, bool bUnsubscribeNewInRange, bool bUnsubscribeOldOutRange); SIMCONNECTAPI SimConnect_RequestFacilitiesList_EX1(HANDLE hSimConnect, SIMCONNECT_FACILITY_LIST_TYPE type, SIMCONNECT_DATA_REQUEST_ID RequestID); +SIMCONNECTAPI SimConnect_RequestFacilityData_EX1(HANDLE hSimConnect, SIMCONNECT_DATA_DEFINITION_ID DefineID, SIMCONNECT_DATA_REQUEST_ID RequestID, const char *ICAO, const char *Region = "", char Type = 0); #endif // _SIMCONNECT_H_ diff --git a/simconnect-sdk/ffi/lib/SimConnect.dll b/simconnect-sdk/ffi/lib/SimConnect.dll index 6b25958..bd88ec1 100644 Binary files a/simconnect-sdk/ffi/lib/SimConnect.dll and b/simconnect-sdk/ffi/lib/SimConnect.dll differ diff --git a/simconnect-sdk/ffi/lib/SimConnect.lib b/simconnect-sdk/ffi/lib/SimConnect.lib index 9dcfcc1..6b3c7c3 100644 Binary files a/simconnect-sdk/ffi/lib/SimConnect.lib and b/simconnect-sdk/ffi/lib/SimConnect.lib differ diff --git a/simconnect-sdk/ffi/version.txt b/simconnect-sdk/ffi/version.txt index 02e5117..52b9d13 100644 --- a/simconnect-sdk/ffi/version.txt +++ b/simconnect-sdk/ffi/version.txt @@ -1 +1 @@ -0.19.3.0 +0.20.5.0