Updated SDK

examples/src/facilities.rs

@@ -24,41 +24,41 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
                 Some(Notification::AirportList(data)) => {
                     for record in data {
                         // The returned list is quite large, so we look for a particular record
-                        if record.icao == "EGSC" {
+                        // if record.icao == "EGSC" {
-                            println!("{record:?}");
+                        //     println!("{record:?}");
-                            // there's no need to unsubscribe
+                        //     // there's no need to unsubscribe
-                            // because this is a one-off request, not a subscription
+                        //     // because this is a one-off request, not a subscription
-                        }
+                        // }
                     }
                 }
                 Some(Notification::WaypointList(data)) => {
                     for record in data {
                         // The returned list is quite large, so we look for a particular record
-                        if record.icao == "BRAIN" {
+                        // if record.icao == "BRAIN" {
-                            println!("{record:?}");
+                        //     println!("{record:?}");
-                            // we've got the entry we're interesting in - we can unsubscribe now
+                        //     // we've got the entry we're interesting in - we can unsubscribe now
-                            client.unsubscribe_to_facilities(FacilityType::Waypoint)?;
+                        //     client.unsubscribe_to_facilities(FacilityType::Waypoint)?;
-                        }
+                        // }
                     }
                 }
                 Some(Notification::NdbList(data)) => {
                     for record in data {
                         // The returned list is quite large, so we look for a particular record
-                        if record.icao == "CAM" {
+                        // if record.icao == "CAM" {
-                            println!("{record:?}");
+                        //     println!("{record:?}");
-                            // we've got the entry we're interesting in - we can unsubscribe now
+                        //     // we've got the entry we're interesting in - we can unsubscribe now
-                            client.unsubscribe_to_facilities(FacilityType::NDB)?;
+                        //     client.unsubscribe_to_facilities(FacilityType::NDB)?;
-                        }
+                        // }
                     }
                 }
                 Some(Notification::VorList(data)) => {
                     for record in data {
                         // The returned list is quite large, so we look for a particular record
-                        if record.icao == "LON" {
+                        // if record.icao == "LON" {
-                            println!("{record:?}");
+                        //     println!("{record:?}");
-                            // we've got the entry we're interesting in - we can unsubscribe now
+                        //     // we've got the entry we're interesting in - we can unsubscribe now
-                            client.unsubscribe_to_facilities(FacilityType::VOR)?;
+                        //     client.unsubscribe_to_facilities(FacilityType::VOR)?;
-                        }
+                        // }
                     }
                 }
                 _ => (),

simconnect-sdk/ffi/include/SimConnect.h

@@ -3,12 +3,11 @@
 // Copyright (c) Microsoft Corporation. All Rights Reserved.
 //
 //-----------------------------------------------------------------------------
+#pragma once
 
 #ifndef _SIMCONNECT_H_
 #define _SIMCONNECT_H_
 
-#pragma once
-
 // <ASOBO-MOD - GM - now in 64 bit
 #ifndef SIMCONNECT_H_NOMANIFEST
 #if _MSC_FULL_VER >= 140040130
@@ -42,6 +41,7 @@ static const float SIMCONNECT_CAMERA_IGNORE_FIELD = FLT_MAX; // Used to tell the
 
 static const DWORD SIMCONNECT_CLIENTDATA_MAX_SIZE = 8192;     // maximum value for SimConnect_CreateClientData dwSize parameter
 
+
 // Notification Group priority values
 static const DWORD SIMCONNECT_GROUP_PRIORITY_HIGHEST              =          1;      // highest priority
 static const DWORD SIMCONNECT_GROUP_PRIORITY_HIGHEST_MASKABLE     =   10000000;      // highest priority that allows events to be masked
@@ -92,7 +92,8 @@ static const DWORD SIMCONNECT_OPEN_CONFIGINDEX_LOCAL = -1; // ignore SimConnect.
 #define SIMCONNECT_USER_ENUM typedef DWORD
 
 // Receive data types
-SIMCONNECT_ENUM SIMCONNECT_RECV_ID{
+SIMCONNECT_ENUM SIMCONNECT_RECV_ID
+{
     SIMCONNECT_RECV_ID_NULL,
     SIMCONNECT_RECV_ID_EXCEPTION,
     SIMCONNECT_RECV_ID_OPEN,
@@ -127,10 +128,18 @@ SIMCONNECT_ENUM SIMCONNECT_RECV_ID{
     SIMCONNECT_RECV_ID_FACILITY_DATA,
     SIMCONNECT_RECV_ID_FACILITY_DATA_END,
     SIMCONNECT_RECV_ID_FACILITY_MINIMAL_LIST,
+    SIMCONNECT_RECV_ID_JETWAY_DATA,
+    SIMCONNECT_RECV_ID_CONTROLLERS_LIST,
+    SIMCONNECT_RECV_ID_ACTION_CALLBACK,
+    SIMCONNECT_RECV_ID_ENUMERATE_INPUT_EVENTS,
+    SIMCONNECT_RECV_ID_GET_INPUT_EVENT,
+    SIMCONNECT_RECV_ID_SUBSCRIBE_INPUT_EVENT,
+    SIMCONNECT_RECV_ID_ENUMERATE_INPUT_EVENT_PARAMS,
 };
 
 // Data data types
-SIMCONNECT_ENUM SIMCONNECT_DATATYPE{
+SIMCONNECT_ENUM SIMCONNECT_DATATYPE
+{
     SIMCONNECT_DATATYPE_INVALID,        // invalid data type
     SIMCONNECT_DATATYPE_INT32,          // 32-bit integer number
     SIMCONNECT_DATATYPE_INT64,          // 64-bit integer number
@@ -154,7 +163,8 @@ SIMCONNECT_ENUM SIMCONNECT_DATATYPE{
 };
 
 // Exception error types
-SIMCONNECT_ENUM SIMCONNECT_EXCEPTION{
+SIMCONNECT_ENUM SIMCONNECT_EXCEPTION
+{
     SIMCONNECT_EXCEPTION_NONE,
 
     SIMCONNECT_EXCEPTION_ERROR,
@@ -194,10 +204,17 @@ SIMCONNECT_ENUM SIMCONNECT_EXCEPTION{
     SIMCONNECT_EXCEPTION_OBJECT_AI,
     SIMCONNECT_EXCEPTION_OBJECT_ATC,
     SIMCONNECT_EXCEPTION_OBJECT_SCHEDULE,
+    SIMCONNECT_EXCEPTION_JETWAY_DATA,
+    SIMCONNECT_EXCEPTION_ACTION_NOT_FOUND,
+    SIMCONNECT_EXCEPTION_NOT_AN_ACTION,
+    SIMCONNECT_EXCEPTION_INCORRECT_ACTION_PARAMS,
+    SIMCONNECT_EXCEPTION_GET_INPUT_EVENT_FAILED,
+    SIMCONNECT_EXCEPTION_SET_INPUT_EVENT_FAILED,
 };
 
 // Object types
-SIMCONNECT_ENUM SIMCONNECT_SIMOBJECT_TYPE{
+SIMCONNECT_ENUM SIMCONNECT_SIMOBJECT_TYPE
+{
     SIMCONNECT_SIMOBJECT_TYPE_USER,
     SIMCONNECT_SIMOBJECT_TYPE_ALL,
     SIMCONNECT_SIMOBJECT_TYPE_AIRCRAFT,
@@ -207,13 +224,15 @@ SIMCONNECT_ENUM SIMCONNECT_SIMOBJECT_TYPE{
 };
 
 // EventState values
-SIMCONNECT_ENUM SIMCONNECT_STATE{
+SIMCONNECT_ENUM SIMCONNECT_STATE
+{
     SIMCONNECT_STATE_OFF,
     SIMCONNECT_STATE_ON,
 };
 
 // Object Data Request Period values
-SIMCONNECT_ENUM SIMCONNECT_PERIOD{
+SIMCONNECT_ENUM SIMCONNECT_PERIOD
+{
     SIMCONNECT_PERIOD_NEVER,
     SIMCONNECT_PERIOD_ONCE,
     SIMCONNECT_PERIOD_VISUAL_FRAME,
@@ -221,13 +240,16 @@ SIMCONNECT_ENUM SIMCONNECT_PERIOD{
     SIMCONNECT_PERIOD_SECOND,
 };
 
-SIMCONNECT_ENUM SIMCONNECT_MISSION_END{
+SIMCONNECT_ENUM SIMCONNECT_MISSION_END
+{
     SIMCONNECT_MISSION_FAILED,
     SIMCONNECT_MISSION_CRASHED,
-    SIMCONNECT_MISSION_SUCCEEDED};
+    SIMCONNECT_MISSION_SUCCEEDED
+};
 
 // ClientData Request Period values
-SIMCONNECT_ENUM SIMCONNECT_CLIENT_DATA_PERIOD{
+SIMCONNECT_ENUM SIMCONNECT_CLIENT_DATA_PERIOD
+{
     SIMCONNECT_CLIENT_DATA_PERIOD_NEVER,
     SIMCONNECT_CLIENT_DATA_PERIOD_ONCE,
     SIMCONNECT_CLIENT_DATA_PERIOD_VISUAL_FRAME,
@@ -235,7 +257,8 @@ SIMCONNECT_ENUM SIMCONNECT_CLIENT_DATA_PERIOD{
     SIMCONNECT_CLIENT_DATA_PERIOD_SECOND,
 };
 
-SIMCONNECT_ENUM SIMCONNECT_TEXT_TYPE{
+SIMCONNECT_ENUM SIMCONNECT_TEXT_TYPE
+{
     SIMCONNECT_TEXT_TYPE_SCROLL_BLACK,
     SIMCONNECT_TEXT_TYPE_SCROLL_WHITE,
     SIMCONNECT_TEXT_TYPE_SCROLL_RED,
@@ -255,7 +278,8 @@ SIMCONNECT_ENUM SIMCONNECT_TEXT_TYPE{
     SIMCONNECT_TEXT_TYPE_MENU = 0x0200,
 };
 
-SIMCONNECT_ENUM SIMCONNECT_TEXT_RESULT{
+SIMCONNECT_ENUM SIMCONNECT_TEXT_RESULT
+{
     SIMCONNECT_TEXT_RESULT_MENU_SELECT_1,
     SIMCONNECT_TEXT_RESULT_MENU_SELECT_2,
     SIMCONNECT_TEXT_RESULT_MENU_SELECT_3,
@@ -273,14 +297,16 @@ SIMCONNECT_ENUM SIMCONNECT_TEXT_RESULT{
     SIMCONNECT_TEXT_RESULT_TIMEOUT,
 };
 
-SIMCONNECT_ENUM SIMCONNECT_WEATHER_MODE{
+SIMCONNECT_ENUM SIMCONNECT_WEATHER_MODE
+{
     SIMCONNECT_WEATHER_MODE_THEME,
     SIMCONNECT_WEATHER_MODE_RWW,
     SIMCONNECT_WEATHER_MODE_CUSTOM,
     SIMCONNECT_WEATHER_MODE_GLOBAL,
 };
 
-SIMCONNECT_ENUM SIMCONNECT_FACILITY_LIST_TYPE{
+SIMCONNECT_ENUM SIMCONNECT_FACILITY_LIST_TYPE
+{
     SIMCONNECT_FACILITY_LIST_TYPE_AIRPORT,
     SIMCONNECT_FACILITY_LIST_TYPE_WAYPOINT,
     SIMCONNECT_FACILITY_LIST_TYPE_NDB,
@@ -288,7 +314,8 @@ SIMCONNECT_ENUM SIMCONNECT_FACILITY_LIST_TYPE{
     SIMCONNECT_FACILITY_LIST_TYPE_COUNT // invalid 
 };
 
-SIMCONNECT_ENUM SIMCONNECT_FACILITY_DATA_TYPE{
+SIMCONNECT_ENUM SIMCONNECT_FACILITY_DATA_TYPE
+{
     SIMCONNECT_FACILITY_DATA_AIRPORT,
     SIMCONNECT_FACILITY_DATA_RUNWAY,
     SIMCONNECT_FACILITY_DATA_START,
@@ -312,6 +339,15 @@ SIMCONNECT_ENUM SIMCONNECT_FACILITY_DATA_TYPE{
     SIMCONNECT_FACILITY_DATA_NDB,
     SIMCONNECT_FACILITY_DATA_WAYPOINT,
     SIMCONNECT_FACILITY_DATA_ROUTE,
+    SIMCONNECT_FACILITY_DATA_PAVEMENT,
+    SIMCONNECT_FACILITY_DATA_APPROACH_LIGHTS,
+    SIMCONNECT_FACILITY_DATA_VASI,
+};
+
+SIMCONNECT_ENUM SIMCONNECT_INPUT_EVENT_TYPE : DWORD
+{
+    SIMCONNECT_INPUT_EVENT_TYPE_DOUBLE,
+    SIMCONNECT_INPUT_EVENT_TYPE_STRING
 };
 
 SIMCONNECT_ENUM_FLAGS SIMCONNECT_VOR_FLAGS;            // flags for SIMCONNECT_RECV_ID_VOR_LIST 
@@ -373,7 +409,8 @@ static const DWORD SIMCONNECT_SOUND_SYSTEM_EVENT_DATA_MASTER = 0x00000001; // So
 
 #ifdef ENABLE_SIMCONNECT_EXPERIMENTAL
 
-SIMCONNECT_ENUM_FLAGS SIMCONNECT_PICK_FLAGS{
+SIMCONNECT_ENUM_FLAGS SIMCONNECT_PICK_FLAGS
+{
     SIMCONNECT_PICK_GROUND           = 0x01,    // pick ground/ pick result item is ground location
     SIMCONNECT_PICK_AI               = 0x02,    // pick AI    / pick result item is AI, (dwSimObjectID is valid)
     SIMCONNECT_PICK_SCENERY          = 0x04,    // pick scenery/ pick result item is scenery object (hSceneryObject is valid)
@@ -396,6 +433,7 @@ SIMCONNECT_USER_ENUM SIMCONNECT_CLIENT_EVENT_ID;           // client-defined cli
 SIMCONNECT_USER_ENUM SIMCONNECT_CLIENT_DATA_ID;            //client-defined client data ID
 SIMCONNECT_USER_ENUM SIMCONNECT_CLIENT_DATA_DEFINITION_ID; //client-defined client data definition ID
 
+
 //----------------------------------------------------------------------------
 //        Struct definitions
 //----------------------------------------------------------------------------
@@ -529,10 +567,12 @@ SIMCONNECT_REFSTRUCT SIMCONNECT_RECV_SIMOBJECT_DATA : public SIMCONNECT_RECV //
 };
 
 SIMCONNECT_REFSTRUCT SIMCONNECT_RECV_SIMOBJECT_DATA_BYTYPE : public SIMCONNECT_RECV_SIMOBJECT_DATA           // when dwID == SIMCONNECT_RECV_ID_SIMOBJECT_DATA_BYTYPE
-                                                             {};
+{
+};
 
 SIMCONNECT_REFSTRUCT SIMCONNECT_RECV_CLIENT_DATA : public SIMCONNECT_RECV_SIMOBJECT_DATA    // when dwID == SIMCONNECT_RECV_ID_CLIENT_DATA
-                                                   {};
+{
+};
 
 SIMCONNECT_REFSTRUCT SIMCONNECT_RECV_WEATHER_OBSERVATION : public SIMCONNECT_RECV // when dwID == SIMCONNECT_RECV_ID_WEATHER_OBSERVATION
 {
@@ -577,7 +617,8 @@ SIMCONNECT_REFSTRUCT SIMCONNECT_RECV_CUSTOM_ACTION : public SIMCONNECT_RECV_EVEN
     SIMCONNECT_STRINGV( szPayLoad);      // Variable length string payload associated with the mission action.  
 };
 
-SIMCONNECT_REFSTRUCT SIMCONNECT_RECV_EVENT_WEATHER_MODE : public SIMCONNECT_RECV_EVENT{
+SIMCONNECT_REFSTRUCT SIMCONNECT_RECV_EVENT_WEATHER_MODE : public SIMCONNECT_RECV_EVENT
+{
     // No event specific data - the new weather mode is in the base structure dwData member.
 };
 
@@ -601,7 +642,8 @@ SIMCONNECT_REFSTRUCT SIMCONNECT_RECV_LIST_TEMPLATE : public SIMCONNECT_RECV
 // SIMCONNECT_DATA_FACILITY_AIRPORT
 SIMCONNECT_REFSTRUCT SIMCONNECT_DATA_FACILITY_AIRPORT
 {
-    SIMCONNECT_STRING(Icao, 9); // ICAO of the object
+    SIMCONNECT_STRING(Ident, 6);    // ICAO of the object
+    SIMCONNECT_STRING(Region, 3);   // ICAO of the object
     double  Latitude;               // degrees
     double  Longitude;              // degrees
     double  Altitude;               // meters   
@@ -613,6 +655,7 @@ SIMCONNECT_REFSTRUCT SIMCONNECT_RECV_AIRPORT_LIST : public SIMCONNECT_RECV_FACIL
     SIMCONNECT_FIXEDTYPE_DATAV(SIMCONNECT_DATA_FACILITY_AIRPORT, rgData, dwArraySize, U1 /*member of UnmanagedType enum*/, SIMCONNECT_DATA_FACILITY_AIRPORT /*cli type*/);
 };
 
+
 // SIMCONNECT_DATA_FACILITY_WAYPOINT
 SIMCONNECT_REFSTRUCT SIMCONNECT_DATA_FACILITY_WAYPOINT : public SIMCONNECT_DATA_FACILITY_AIRPORT
 {
@@ -671,7 +714,7 @@ SIMCONNECT_REFSTRUCT SIMCONNECT_RECV_FACILITY_DATA_END : public SIMCONNECT_RECV
     DWORD RequestId;
 };
 
-SIMCONNECT_REFSTRUCT SIMCONNECT_ICAO
+SIMCONNECT_STRUCT SIMCONNECT_ICAO
 {
     char Type;
     SIMCONNECT_STRING(Ident, 5 + 1);
@@ -687,6 +730,13 @@ SIMCONNECT_STRUCT SIMCONNECT_DATA_LATLONALT
     double  Altitude;
 };
 
+SIMCONNECT_STRUCT SIMCONNECT_DATA_PBH
+{
+    float  Pitch;
+    float  Bank;
+    float  Heading;
+};
+
 SIMCONNECT_REFSTRUCT SIMCONNECT_FACILITY_MINIMAL
 {
     SIMCONNECT_ICAO icao;
@@ -717,6 +767,7 @@ SIMCONNECT_REFSTRUCT SIMCONNECT_RECV_PICK : public SIMCONNECT_RECV // when dwID
 
 #endif //ENABLE_SIMCONNECT_EXPERIMENTAL
 
+
 // SIMCONNECT_DATATYPE_INITPOSITION
 SIMCONNECT_STRUCT SIMCONNECT_DATA_INITPOSITION
 {
@@ -730,6 +781,7 @@ SIMCONNECT_STRUCT SIMCONNECT_DATA_INITPOSITION
     DWORD   Airspeed;   // knots
 };
 
+
 // SIMCONNECT_DATATYPE_MARKERSTATE
 SIMCONNECT_STRUCT SIMCONNECT_DATA_MARKERSTATE
 {
@@ -756,16 +808,100 @@ SIMCONNECT_STRUCT SIMCONNECT_DATA_XYZ
     double  z;
 };
 
+SIMCONNECT_REFSTRUCT SIMCONNECT_JETWAY_DATA
+{
+    SIMCONNECT_STRING(AirportIcao, 8);
+    int ParkingIndex;
+    SIMCONNECT_DATA_LATLONALT Lla;
+    SIMCONNECT_DATA_PBH Pbh;
+    int Status;
+    int Door;
+    SIMCONNECT_DATA_XYZ ExitDoorRelativePos;
+    SIMCONNECT_DATA_XYZ MainHandlePos;
+    SIMCONNECT_DATA_XYZ SecondaryHandle;
+    SIMCONNECT_DATA_XYZ WheelGroundLock;
+    DWORD JetwayObjectId;
+    DWORD AttachedObjectId;
+};
+
+SIMCONNECT_REFSTRUCT SIMCONNECT_RECV_JETWAY_DATA : public SIMCONNECT_RECV_LIST_TEMPLATE
+{
+    SIMCONNECT_FIXEDTYPE_DATAV(SIMCONNECT_JETWAY_DATA, rgData, dwArraySize, U1 /*member of UnmanagedType enum*/, SIMCONNECT_JETWAY_DATA /*cli type*/);
+};
+
+SIMCONNECT_REFSTRUCT SIMCONNECT_RECV_ACTION_CALLBACK : public SIMCONNECT_RECV // when dwID == SIMCONNECT_RECV_ID_ACTION_CALLBACK
+{
+    SIMCONNECT_STRING(szActionID, MAX_PATH);
+    DWORD	cbRequestId;
+};
+
+SIMCONNECT_REFSTRUCT SIMCONNECT_INPUT_EVENT_DESCRIPTOR
+{
+    SIMCONNECT_STRING(Name, 64);     // Input event name
+    unsigned __int64	Hash;        // Hash
+    SIMCONNECT_INPUT_EVENT_TYPE	eType;
+};
+
+SIMCONNECT_REFSTRUCT SIMCONNECT_RECV_ENUMERATE_INPUT_EVENTS : public SIMCONNECT_RECV_LIST_TEMPLATE
+{
+    SIMCONNECT_FIXEDTYPE_DATAV(SIMCONNECT_INPUT_EVENT_DESCRIPTOR, rgData, dwArraySize, U1 /*member of UnmanagedType enum*/, SIMCONNECT_INPUT_EVENT_DESCRIPTOR /*cli type*/);
+};
+
+SIMCONNECT_REFSTRUCT SIMCONNECT_RECV_GET_INPUT_EVENT : public SIMCONNECT_RECV // when dwID == SIMCONNECT_RECV_ID_GET_INPUT_EVENT
+{
+    DWORD dwRequestID;
+    SIMCONNECT_INPUT_EVENT_TYPE eType;
+    SIMCONNECT_DATAV(Value, eType,);
+};
+
+SIMCONNECT_REFSTRUCT SIMCONNECT_RECV_SUBSCRIBE_INPUT_EVENT : public SIMCONNECT_RECV
+{
+    UINT64	Hash;
+    SIMCONNECT_INPUT_EVENT_TYPE	eType;
+    SIMCONNECT_DATAV(Value, eType,);
+};
+
+SIMCONNECT_REFSTRUCT SIMCONNECT_RECV_ENUMERATE_INPUT_EVENT_PARAMS : public SIMCONNECT_RECV
+{
+    UINT64 Hash;
+    SIMCONNECT_STRING(Value, MAX_PATH);
+};
+
+
+SIMCONNECT_REFSTRUCT SIMCONNECT_VERSION_BASE_TYPE
+{
+    unsigned short Major;
+    unsigned short Minor;
+    unsigned short Revision;
+    unsigned short Build;
+};
+
+SIMCONNECT_REFSTRUCT SIMCONNECT_CONTROLLER_ITEM
+{
+    SIMCONNECT_STRING(DeviceName, 256);
+    unsigned int DeviceId;
+    unsigned int ProductId;
+    unsigned int CompositeID;
+    SIMCONNECT_VERSION_BASE_TYPE HardwareVersion;
+};
+
+SIMCONNECT_REFSTRUCT SIMCONNECT_RECV_CONTROLLERS_LIST : public SIMCONNECT_RECV_LIST_TEMPLATE
+{
+    SIMCONNECT_FIXEDTYPE_DATAV(SIMCONNECT_CONTROLLER_ITEM, rgData, dwArraySize, U1 /*member of UnmanagedType enum*/, SIMCONNECT_CONTROLLER_ITEM /*cli type*/);
+};
+
 #pragma pack(pop)
 
 //----------------------------------------------------------------------------
 //        End of Struct definitions
 //----------------------------------------------------------------------------
 
+
 #if !defined(SIMCONNECTAPI)
 #define SIMCONNECTAPI extern "C" HRESULT __stdcall
 #endif
 
+
 typedef void (CALLBACK *DispatchProc)(SIMCONNECT_RECV* pData, DWORD cbData, void* pContext);
 
 SIMCONNECTAPI SimConnect_MapClientEventToSimEvent(HANDLE hSimConnect, SIMCONNECT_CLIENT_EVENT_ID EventID, const char * EventName = "");
@@ -847,5 +983,18 @@ SIMCONNECTAPI SimConnect_SubscribeToFacilities_EX1(HANDLE hSimConnect, SIMCONNEC
 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);
+SIMCONNECTAPI SimConnect_RequestJetwayData(HANDLE hSimConnect, const char * AirportIcao, DWORD ArrayCount, int * Indexes);
+SIMCONNECTAPI SimConnect_EnumerateControllers(HANDLE hSimConnect);
+SIMCONNECTAPI SimConnect_MapInputEventToClientEvent_EX1(HANDLE hSimConnect, SIMCONNECT_INPUT_GROUP_ID GroupID, const char * szInputDefinition, SIMCONNECT_CLIENT_EVENT_ID DownEventID, DWORD DownValue = 0, SIMCONNECT_CLIENT_EVENT_ID UpEventID = (SIMCONNECT_CLIENT_EVENT_ID)SIMCONNECT_UNUSED, DWORD UpValue = 0, BOOL bMaskable = FALSE);
+SIMCONNECTAPI SimConnect_ExecuteAction(HANDLE hSimConnect, DWORD cbRequestID, const char * szActionID, DWORD cbUnitSize, void * pParamValues);
+SIMCONNECTAPI SimConnect_EnumerateInputEvents(HANDLE hSimConnect, SIMCONNECT_DATA_REQUEST_ID RequestID);
+SIMCONNECTAPI SimConnect_GetInputEvent(HANDLE hSimConnect, SIMCONNECT_DATA_REQUEST_ID RequestID, UINT64 Hash);
+SIMCONNECTAPI SimConnect_SetInputEvent(HANDLE hSimConnect, UINT64 Hash, DWORD cbUnitSize, void * Value);
+SIMCONNECTAPI SimConnect_SubscribeInputEvent(HANDLE hSimConnect, UINT64 Hash);
+SIMCONNECTAPI SimConnect_UnsubscribeInputEvent(HANDLE hSimConnect, UINT64 Hash);
+SIMCONNECTAPI SimConnect_EnumerateInputEventParams(HANDLE hSimConnect, UINT64 Hash);
+SIMCONNECTAPI SimConnect_AddFacilityDataDefinitionFilter(HANDLE hSimConnect, SIMCONNECT_DATA_DEFINITION_ID DefineID, const char * szFilterPath, DWORD cbUnitSize, void * pFilterData);
+SIMCONNECTAPI SimConnect_ClearAllFacilityDataDefinitionFilters(HANDLE hSimConnect, SIMCONNECT_DATA_DEFINITION_ID DefineID);
+
 
 #endif // _SIMCONNECT_H_

simconnect-sdk/ffi/version.txt

@@ -1 +1 @@
-0.20.5.0
+0.24.3.0 

simconnect-sdk/src/domain/facilities.rs

@@ -44,8 +44,10 @@ impl FacilityType {
 /// Information on a single airport in the facilities cache.
 #[derive(Debug, Clone)]
 pub struct Airport {
-    /// ICAO of the facility.
+    /// Ident of the facility.
-    pub icao: String,
+    pub ident: String,
+    /// Region of the facility.
+    pub region: String,
     /// Latitude of the airport in facility.
     pub lat: f64,
     /// Longitude of the airport in facility.
@@ -57,8 +59,10 @@ pub struct Airport {
 /// Information on a single waypoint in the facilities cache.
 #[derive(Debug, Clone)]
 pub struct Waypoint {
-    /// ICAO of the facility.
+    /// Ident of the facility.
-    pub icao: String,
+    pub ident: String,
+    /// Region of the facility.
+    pub region: String,
     /// Latitude of the airport in facility.
     pub lat: f64,
     /// Longitude of the airport in facility.
@@ -72,8 +76,10 @@ pub struct Waypoint {
 /// Information on a single NDB station in the facilities cache.
 #[derive(Debug, Clone)]
 pub struct NDB {
-    /// ICAO of the facility.
+    /// Ident of the facility.
-    pub icao: String,
+    pub ident: String,
+    /// Region of the facility.
+    pub region: String,
     /// Latitude of the airport in facility.
     pub lat: f64,
     /// Longitude of the airport in facility.
@@ -89,8 +95,10 @@ pub struct NDB {
 /// Information on a single VOR station in the facilities cache.
 #[derive(Debug, Clone)]
 pub struct VOR {
-    /// ICAO of the facility.
+    /// Ident of the facility.
-    pub icao: String,
+    pub ident: String,
+    /// Region of the facility.
+    pub region: String,
     /// Latitude of the airport in facility.
     pub lat: f64,
     /// Longitude of the airport in facility.

simconnect-sdk/src/simconnect/base.rs

@@ -242,7 +242,8 @@ impl SimConnect {
                             let record = unsafe { event.rgData.get_unchecked(i) };
 
                             Airport {
-                                icao: fixed_c_str_to_string(&record.Icao),
+                                ident: fixed_c_str_to_string(&record.Ident),
+                                region: fixed_c_str_to_string(&record.Region),
                                 lat: record.Latitude,
                                 lon: record.Longitude,
                                 alt: record.Altitude,
@@ -270,7 +271,8 @@ impl SimConnect {
                             let record = unsafe { event.rgData.get_unchecked(i) };
 
                             Waypoint {
-                                icao: fixed_c_str_to_string(&record._base.Icao),
+                                ident: fixed_c_str_to_string(&record._base.Ident),
+                                region: fixed_c_str_to_string(&record._base.Region),
                                 lat: record._base.Latitude,
                                 lon: record._base.Longitude,
                                 alt: record._base.Altitude,
@@ -299,7 +301,8 @@ impl SimConnect {
                             let record = unsafe { event.rgData.get_unchecked(i) };
 
                             NDB {
-                                icao: fixed_c_str_to_string(&record._base._base.Icao),
+                                ident: fixed_c_str_to_string(&record._base._base.Ident),
+                                region: fixed_c_str_to_string(&record._base._base.Region),
                                 lat: record._base._base.Latitude,
                                 lon: record._base._base.Longitude,
                                 alt: record._base._base.Altitude,
@@ -342,7 +345,8 @@ impl SimConnect {
                                 == bindings::SIMCONNECT_RECV_ID_VOR_LIST_HAS_DME;
 
                             VOR {
-                                icao: fixed_c_str_to_string(&record._base._base._base.Icao),
+                                ident: fixed_c_str_to_string(&record._base._base._base.Ident),
+                                region: fixed_c_str_to_string(&record._base._base._base.Region),
                                 lat: record._base._base._base.Latitude,
                                 lon: record._base._base._base.Longitude,
                                 alt: record._base._base._base.Altitude,