Skip to content

Commit 29e4053

Browse files
mpapernompaperno
committed
[WASimModule] Add named key event aliases for published SimConnect Event IDs which do not match KEY ID macro names.
1 parent 1ee23bc commit 29e4053

1 file changed

Lines changed: 60 additions & 5 deletions

File tree

‎src/WASimModule/key_events.h‎

Lines changed: 60 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1617,7 +1617,6 @@ namespace WASimCommander {
16171617
{ "AP_SPD_VAR_SET_EX1", KEY_AP_SPD_VAR_SET_EX1 },
16181618
{ "AP_MACH_VAR_SET_EX1", KEY_AP_MACH_VAR_SET_EX1 },
16191619
{ "HEADING_BUG_SET_EX1", KEY_HEADING_BUG_SET_EX1 },
1620-
{ "AP_HEADING_BUG_SET_EX1", KEY_HEADING_BUG_SET_EX1 }, // SimConnect compat
16211620
{ "PARKING_BRAKE_SET", KEY_PARKING_BRAKE_SET },
16221621
{ "RUDDER_TRIM_RESET", KEY_RUDDER_TRIM_RESET },
16231622
{ "ENGINE_MODE_CRANK_SET", KEY_ENGINE_MODE_CRANK_SET },
@@ -1746,9 +1745,7 @@ namespace WASimCommander {
17461745
{ "TOGGLE_THROTTLE3_REVERSE_THRUST", KEY_TOGGLE_THROTTLE3_REVERSE_THRUST },
17471746
{ "TOGGLE_THROTTLE4_REVERSE_THRUST", KEY_TOGGLE_THROTTLE4_REVERSE_THRUST },
17481747
{ "SET_THROTTLE_REVERSE_THRUST_ON", KEY_SET_THROTTLE_REVERSE_THRUST_ON },
1749-
{ "SET_REVERSE_THRUST_ON", KEY_SET_THROTTLE_REVERSE_THRUST_ON }, // SimConnect compat
17501748
{ "SET_THROTTLE_REVERSE_THRUST_OFF", KEY_SET_THROTTLE_REVERSE_THRUST_OFF },
1751-
{ "SET_REVERSE_THRUST_OFF", KEY_SET_THROTTLE_REVERSE_THRUST_OFF }, // SimConnect compat
17521749
{ "SET_THROTTLE1_REVERSE_THRUST_ON", KEY_SET_THROTTLE1_REVERSE_THRUST_ON },
17531750
{ "SET_THROTTLE2_REVERSE_THRUST_ON", KEY_SET_THROTTLE2_REVERSE_THRUST_ON },
17541751
{ "SET_THROTTLE3_REVERSE_THRUST_ON", KEY_SET_THROTTLE3_REVERSE_THRUST_ON },
@@ -1762,9 +1759,7 @@ namespace WASimCommander {
17621759
{ "THROTTLE3_REVERSE_THRUST_HOLD", KEY_THROTTLE3_REVERSE_THRUST_HOLD },
17631760
{ "THROTTLE4_REVERSE_THRUST_HOLD", KEY_THROTTLE4_REVERSE_THRUST_HOLD },
17641761
{ "DECISION_HEIGHT_SET", KEY_DECISION_HEIGHT_SET },
1765-
{ "SET_DECISION_HEIGHT", KEY_DECISION_HEIGHT_SET }, // SimConnect compat
17661762
{ "DECISION_ALTITUDE_MSL_SET", KEY_DECISION_ALTITUDE_MSL_SET },
1767-
{ "SET_DECISION_ALTITUDE_MSL", KEY_DECISION_ALTITUDE_MSL_SET }, // SimConnect compat
17681763
{ "MASTER_WARNING_SET", KEY_MASTER_WARNING_SET },
17691764
{ "MASTER_WARNING_ON", KEY_MASTER_WARNING_ON },
17701765
{ "MASTER_WARNING_OFF", KEY_MASTER_WARNING_OFF },
@@ -1903,6 +1898,66 @@ namespace WASimCommander {
19031898
{ "CYCLIC_LATERAL_RIGHT", KEY_CYCLIC_LATERAL_RIGHT },
19041899
{ "CYCLIC_LONGITUDINAL_DOWN", KEY_CYCLIC_LONGITUDINAL_DOWN },
19051900
{ "CYCLIC_LONGITUDINAL_UP", KEY_CYCLIC_LONGITUDINAL_UP },
1901+
1902+
// Aliases for published Event IDs which do not match KEY IDs
1903+
{ "ADF1_WHOLE_DEC", KEY_ADF_WHOLE_DEC },
1904+
{ "ADF1_WHOLE_INC", KEY_ADF_WHOLE_INC },
1905+
{ "ALTITUDE_SLOT_INDEX_SET", KEY_AP_ALTITUDE_SLOT_INDEX_SET },
1906+
{ "ANTIDETONATION_TANK_VALVE_TOGGLE", KEY_TOGGLE_ANTIDETONATION_TANK_VALVE },
1907+
{ "AP_HEADING_BUG_SET_EX1", KEY_HEADING_BUG_SET_EX1 },
1908+
{ "AP_PANEL_MACH_HOLD_TOGGLE", KEY_AUTOPILOT_MACH_HOLD_CURRENT },
1909+
{ "AP_PANEL_SPEED_HOLD_TOGGLE", KEY_AUTOPILOT_AIRSPEED_HOLD_CURRENT },
1910+
{ "ATTITUDE_BARS_POSITION_DOWN", KEY_ATTITUDE_BARS_POSITION_DEC },
1911+
{ "ATTITUDE_BARS_POSITION_UP", KEY_ATTITUDE_BARS_POSITION_INC },
1912+
{ "ATTITUDE_CAGE_BUTTON", KEY_TOGGLE_ATTITUDE_CAGE },
1913+
{ "AUTORUDDER_TOGGLE", KEY_RUDDER_TRIM_DISABLED_TOGGLE }, // ??
1914+
{ "BACK_TO_FLY", KEY_NULL }, // Not a real Event ??
1915+
{ "COM_STBY_RADIO_SWAP", KEY_COM_STBY_RADIO_SWITCH_TO },
1916+
{ "DECREASE_AUTOBRAKE_CONTROL", KEY_DEC_AUTOBRAKE_CONTROL },
1917+
{ "DECREASE_DECISION_ALTITUDE_MSL", KEY_DECISION_ALTITUDE_MSL_DEC },
1918+
{ "DECREASE_DECISION_HEIGHT", KEY_DECISION_HEIGHT_DEC },
1919+
{ "INCREASE_DECISION_ALTITUDE_MSL", KEY_DECISION_ALTITUDE_MSL_INC },
1920+
{ "INCREASE_DECISION_HEIGHT", KEY_DECISION_HEIGHT_INC },
1921+
{ "SET_DECISION_ALTITUDE_MSL", KEY_DECISION_ALTITUDE_MSL_SET },
1922+
{ "FLIGHT_LEVEL_CHANGE", KEY_AP_FLIGHT_LEVEL_CHANGE },
1923+
{ "FLIGHT_LEVEL_CHANGE_OFF", KEY_AP_FLIGHT_LEVEL_CHANGE_OFF },
1924+
{ "FLIGHT_LEVEL_CHANGE_ON", KEY_AP_FLIGHT_LEVEL_CHANGE_ON },
1925+
{ "HEADING_SLOT_INDEX_SET", KEY_AP_HEADING_SLOT_INDEX_SET },
1926+
{ "INCREASE_AUTOBRAKE_CONTROL", KEY_INC_AUTOBRAKE_CONTROL },
1927+
{ "KNEEBOARD_VIEW", KEY_KNEEBOARD },
1928+
{ "MP_ACTIVATE_CHAT", KEY_MULTIPLAYER_ACTIVATE_CHAT },
1929+
{ "MP_BROADCAST_VOICE_CAPTURE_START", KEY_MULTIPLAYER_BROADCAST_VOICE_CAPTURE_START },
1930+
{ "MP_BROADCAST_VOICE_CAPTURE_STOP", KEY_MULTIPLAYER_BROADCAST_VOICE_CAPTURE_STOP },
1931+
{ "MP_CHAT", KEY_MULTIPLAYER_CHAT },
1932+
{ "MP_PAUSE_SESSION", KEY_MULTIPLAYER_PAUSE_SESSION },
1933+
{ "MP_PLAYER_CYCLE", KEY_MULTIPLAYER_PLAYER_CYCLE },
1934+
{ "MP_PLAYER_FOLLOW", KEY_MULTIPLAYER_PLAYER_FOLLOW },
1935+
{ "MP_TRANSFER_CONTROL", KEY_MULTIPLAYER_TRANSFER_CONTROL },
1936+
{ "MP_VOICE_CAPTURE_START", KEY_MULTIPLAYER_VOICE_CAPTURE_START },
1937+
{ "MP_VOICE_CAPTURE_STOP", KEY_MULTIPLAYER_VOICE_CAPTURE_STOP },
1938+
{ "NITROUS_TANK_VALVE_TOGGLE", KEY_TOGGLE_NITROUS_TANK_VALVE } ,
1939+
{ "PRESSURIZATION_PRESSURE_DUMP_SWTICH", KEY_PRESSURIZATION_PRESSURE_DUMP_SWITCH },
1940+
{ "RELOAD_USER_AIRCRAFT", KEY_CONTROL_RELOAD_USER_AIRCRAFT },
1941+
{ "REQUEST_FUEL_KEY", KEY_REQUEST_FUEL },
1942+
{ "ROTOR_BRAKE_SET", KEY_AXIS_ROTOR_BRAKE_SET },
1943+
{ "RPM_SLOT_INDEX_SET", KEY_AP_RPM_SLOT_INDEX_SET },
1944+
{ "SET_REVERSE_THRUST_OFF", KEY_SET_THROTTLE_REVERSE_THRUST_OFF },
1945+
{ "SET_REVERSE_THRUST_ON", KEY_SET_THROTTLE_REVERSE_THRUST_ON },
1946+
{ "SPEED_SLOT_INDEX_SET", KEY_AP_SPEED_SLOT_INDEX_SET },
1947+
{ "TOGGLE_AUTOFEATHER_ARM", KEY_TOGGLE_ARM_AUTOFEATHER },
1948+
{ "TOGGLE_DME", KEY_DME_TOGGLE } ,
1949+
{ "TOGGLE_PROPELLER_SYNC", KEY_TOGGLE_PROP_SYNC },
1950+
{ "TOGGLE_PUSHBACK", KEY_PUSHBACK_SET }, // ?
1951+
{ "TOW_PLANE_REQUEST", KEY_REQUEST_TOW_PLANE },
1952+
{ "TRUE_AIRSPEED_CAL_DEC", KEY_TRUE_AIRSPEED_CALIBRATE_DEC },
1953+
{ "TRUE_AIRSPEED_CAL_INC", KEY_TRUE_AIRSPEED_CALIBRATE_INC },
1954+
{ "VARIOMETER_SOUND_TOGGLE", KEY_TOGGLE_VARIOMETER_SWITCH }, // ?
1955+
{ "VERTICAL_SPEED_SET", KEY_AP_VS_SET },
1956+
{ "VIEW_AXIS_INDICATOR_CYCLE", KEY_AXIS_INDICATOR_CYCLE },
1957+
{ "VIEW_CAMERA_SELECT_START", KEY_VIEW_CAMERA_SELECT_STARTING },
1958+
{ "VIEW_WINDOW_TITLES_TOGGLE", KEY_WINDOW_TITLES_TOGGLE },
1959+
{ "VS_SLOT_INDEX_SET", KEY_AP_VS_SLOT_INDEX_SET },
1960+
19061961
};
19071962

19081963
const nameToIdMap_t::const_iterator el = namesMap.find(name);

0 commit comments

Comments
 (0)