diff --git a/Scripts/DCS-BIOS/doc/Addresses.h b/Scripts/DCS-BIOS/doc/Addresses.h index 41ca3ca2b..9eab115fb 100644 --- a/Scripts/DCS-BIOS/doc/Addresses.h +++ b/Scripts/DCS-BIOS/doc/Addresses.h @@ -13087,8 +13087,8 @@ #define F_4E_PLT_AFCS_ALT_HOLD_AM 0x2A56, 0x0100 #define F_4E_PLT_AFCS_AUTOPILOT 0x2A52, 0x8000, 15 #define F_4E_PLT_AFCS_AUTOPILOT_AM 0x2A52, 0x8000 -#define F_4E_PLT_AFCS_EMERGENCY_RELEASE 0x2B5E, 0x0800, 11 -#define F_4E_PLT_AFCS_EMERGENCY_RELEASE_AM 0x2B5E, 0x0800 +#define F_4E_PLT_AFCS_EMERGENCY_RELEASE 0x2B76, 0x0002, 1 +#define F_4E_PLT_AFCS_EMERGENCY_RELEASE_AM 0x2B76, 0x0002 #define F_4E_PLT_AFCS_STAB_AUG_PITCH 0x2A52, 0x4000, 14 #define F_4E_PLT_AFCS_STAB_AUG_PITCH_AM 0x2A52, 0x4000 #define F_4E_PLT_AFCS_STAB_AUG_ROLL 0x2A52, 0x2000, 13 @@ -13196,14 +13196,17 @@ #define F_4E_PLT_COCKPIT_MIRROR_RIGHT_AM 0x2A4A, 0x8000 #define F_4E_PLT_COCKPIT_MIRROR_TOP 0x2A4A, 0x2000, 13 #define F_4E_PLT_COCKPIT_MIRROR_TOP_AM 0x2A4A, 0x2000 -#define F_4E_PLT_COCKPIT_PRESSURE_EMERGENCY_RELEASE 0x2B76, 0x2000, 13 -#define F_4E_PLT_COCKPIT_PRESSURE_EMERGENCY_RELEASE_AM 0x2B76, 0x2000 +#define F_4E_PLT_COCKPIT_PRESSURE_EMERGENCY_RELEASE 0x2B76, 0x8000, 15 +#define F_4E_PLT_COCKPIT_PRESSURE_EMERGENCY_RELEASE_AM 0x2B76, 0x8000 +#define F_4E_PLT_CONTROLS_FLAPS_INDICATOR 0x2AE4, 0x0200, 9 +#define F_4E_PLT_CONTROLS_FLAPS_INDICATOR_AM 0x2AE4, 0x0200 #define F_4E_PLT_CONTROLS_FLAPS_SLATS 0x2AE4, 0x0018, 3 #define F_4E_PLT_CONTROLS_FLAPS_SLATS_EMERGENCY 0x2B0A, 0xFFFF, 0 #define F_4E_PLT_CONTROLS_FLAPS_SLATS_EMERGENCY_A 0x2B0A #define F_4E_PLT_CONTROLS_PEDAL_ADJUST 0x2B0C, 0xFFFF, 0 #define F_4E_PLT_CONTROLS_PEDAL_ADJUST_A 0x2B0C #define F_4E_PLT_CONTROLS_RUDDER_TRIM 0x2AE4, 0x0060, 5 +#define F_4E_PLT_CONTROLS_SLATS_INDICATOR 0x2AE4, 0x0C00, 10 #define F_4E_PLT_CONTROLS_SLATS_OVERRIDE 0x2AE4, 0x0100, 8 #define F_4E_PLT_CONTROLS_SLATS_OVERRIDE_AM 0x2AE4, 0x0100 #define F_4E_PLT_CONTROLS_SLATS_OVERRIDE_COVER 0x2AE4, 0x0080, 7 @@ -13239,27 +13242,27 @@ #define F_4E_PLT_ENGINE_TACH_R_LARGE_A 0x2AEA #define F_4E_PLT_ENGINE_TACH_R_SMALL 0x2AEC, 0xFFFF, 0 #define F_4E_PLT_ENGINE_TACH_R_SMALL_A 0x2AEC -#define F_4E_PLT_EXT_LIGHT_ANTI_COLL 0x2B5E, 0x000C, 2 -#define F_4E_PLT_EXT_LIGHT_FLASH_MODE 0x2B5E, 0x0030, 4 -#define F_4E_PLT_EXT_LIGHT_FORMATION_BRIGHTNESS 0x2B78, 0xFFFF, 0 -#define F_4E_PLT_EXT_LIGHT_FORMATION_BRIGHTNESS_A 0x2B78 -#define F_4E_PLT_EXT_LIGHT_FORMATION_MODE 0x2B76, 0xC000, 14 -#define F_4E_PLT_EXT_LIGHT_TAIL_BRIGHTNESS 0x2B5E, 0x00C0, 6 -#define F_4E_PLT_EXT_LIGHT_TAXI_LAND 0x2B76, 0x1800, 11 -#define F_4E_PLT_EXT_LIGHT_WING_BRIGHTNESS 0x2B5E, 0x0300, 8 -#define F_4E_PLT_FUEL_AIR_REFUEL 0x2B1A, 0x0800, 11 -#define F_4E_PLT_FUEL_AIR_REFUEL_AM 0x2B1A, 0x0800 +#define F_4E_PLT_EXT_LIGHT_ANTI_COLL 0x2B5E, 0x0300, 8 +#define F_4E_PLT_EXT_LIGHT_FLASH_MODE 0x2B5E, 0x0C00, 10 +#define F_4E_PLT_EXT_LIGHT_FORMATION_BRIGHTNESS 0x2B7A, 0xFFFF, 0 +#define F_4E_PLT_EXT_LIGHT_FORMATION_BRIGHTNESS_A 0x2B7A +#define F_4E_PLT_EXT_LIGHT_FORMATION_MODE 0x2B78, 0x0030, 4 +#define F_4E_PLT_EXT_LIGHT_TAIL_BRIGHTNESS 0x2B5E, 0x3000, 12 +#define F_4E_PLT_EXT_LIGHT_TAXI_LAND 0x2B78, 0x000C, 2 +#define F_4E_PLT_EXT_LIGHT_WING_BRIGHTNESS 0x2B5E, 0xC000, 14 +#define F_4E_PLT_FUEL_AIR_REFUEL 0x2B36, 0x0200, 9 +#define F_4E_PLT_FUEL_AIR_REFUEL_AM 0x2B36, 0x0200 #define F_4E_PLT_FUEL_BOOST_PUMP_L 0x2B4A, 0xFFFF, 0 #define F_4E_PLT_FUEL_BOOST_PUMP_L_A 0x2B4A -#define F_4E_PLT_FUEL_BOOST_PUMP_L_CHECK 0x2B1A, 0x8000, 15 -#define F_4E_PLT_FUEL_BOOST_PUMP_L_CHECK_AM 0x2B1A, 0x8000 +#define F_4E_PLT_FUEL_BOOST_PUMP_L_CHECK 0x2B36, 0x2000, 13 +#define F_4E_PLT_FUEL_BOOST_PUMP_L_CHECK_AM 0x2B36, 0x2000 #define F_4E_PLT_FUEL_BOOST_PUMP_R 0x2B4C, 0xFFFF, 0 #define F_4E_PLT_FUEL_BOOST_PUMP_R_A 0x2B4C -#define F_4E_PLT_FUEL_BOOST_PUMP_R_CHECK 0x2B36, 0x0100, 8 -#define F_4E_PLT_FUEL_BOOST_PUMP_R_CHECK_AM 0x2B36, 0x0100 -#define F_4E_PLT_FUEL_EXTERNAL_TANKS_FEED 0x2B1A, 0x6000, 13 -#define F_4E_PLT_FUEL_FEED_TANK_CHECK 0x2B36, 0x0200, 9 -#define F_4E_PLT_FUEL_FEED_TANK_CHECK_AM 0x2B36, 0x0200 +#define F_4E_PLT_FUEL_BOOST_PUMP_R_CHECK 0x2B36, 0x4000, 14 +#define F_4E_PLT_FUEL_BOOST_PUMP_R_CHECK_AM 0x2B36, 0x4000 +#define F_4E_PLT_FUEL_EXTERNAL_TANKS_FEED 0x2B36, 0x1800, 11 +#define F_4E_PLT_FUEL_FEED_TANK_CHECK 0x2B36, 0x8000, 15 +#define F_4E_PLT_FUEL_FEED_TANK_CHECK_AM 0x2B36, 0x8000 #define F_4E_PLT_FUEL_FLOW_L 0x2B4E, 0xFFFF, 0 #define F_4E_PLT_FUEL_FLOW_L_A 0x2B4E #define F_4E_PLT_FUEL_FLOW_R 0x2B50, 0xFFFF, 0 @@ -13267,14 +13270,14 @@ #define F_4E_PLT_FUEL_GAUGE_TAPE 0x2B44, 0xFFFF, 0 #define F_4E_PLT_FUEL_GAUGE_TAPE_A 0x2B44 #define F_4E_PLT_FUEL_GAUGE_VALUE_A 0x2B46 -#define F_4E_PLT_FUEL_REFUEL_SELECTOR 0x2B1A, 0x0400, 10 -#define F_4E_PLT_FUEL_REFUEL_SELECTOR_AM 0x2B1A, 0x0400 -#define F_4E_PLT_FUEL_REFUEL_SELECTOR_COVER 0x2B1A, 0x0200, 9 -#define F_4E_PLT_FUEL_REFUEL_SELECTOR_COVER_AM 0x2B1A, 0x0200 -#define F_4E_PLT_FUEL_WING_FUEL_DUMP 0x2B1A, 0x1000, 12 -#define F_4E_PLT_FUEL_WING_FUEL_DUMP_AM 0x2B1A, 0x1000 -#define F_4E_PLT_FUEL_WING_INTERNAL_FEED 0x2B1A, 0x0100, 8 -#define F_4E_PLT_FUEL_WING_INTERNAL_FEED_AM 0x2B1A, 0x0100 +#define F_4E_PLT_FUEL_REFUEL_SELECTOR 0x2B36, 0x0100, 8 +#define F_4E_PLT_FUEL_REFUEL_SELECTOR_AM 0x2B36, 0x0100 +#define F_4E_PLT_FUEL_REFUEL_SELECTOR_COVER 0x2B12, 0x8000, 15 +#define F_4E_PLT_FUEL_REFUEL_SELECTOR_COVER_AM 0x2B12, 0x8000 +#define F_4E_PLT_FUEL_WING_FUEL_DUMP 0x2B36, 0x0400, 10 +#define F_4E_PLT_FUEL_WING_FUEL_DUMP_AM 0x2B36, 0x0400 +#define F_4E_PLT_FUEL_WING_INTERNAL_FEED 0x2B12, 0x4000, 14 +#define F_4E_PLT_FUEL_WING_INTERNAL_FEED_AM 0x2B12, 0x4000 #define F_4E_PLT_GEAR_ANTI_SKID 0x2AA2, 0x0200, 9 #define F_4E_PLT_GEAR_ANTI_SKID_AM 0x2AA2, 0x0200 #define F_4E_PLT_GEAR_ANTI_SKID_INOP 0x2AA2, 0x0400, 10 @@ -13296,8 +13299,8 @@ #define F_4E_PLT_GEAR_LEVER_EMERGENCY_AM 0x2A8A, 0x4000 #define F_4E_PLT_GEAR_LEVER_LIGHT 0x2A8A, 0x8000, 15 #define F_4E_PLT_GEAR_LEVER_LIGHT_AM 0x2A8A, 0x8000 -#define F_4E_PLT_GEAR_NWS 0x2B5E, 0x0400, 10 -#define F_4E_PLT_GEAR_NWS_AM 0x2B5E, 0x0400 +#define F_4E_PLT_GEAR_NWS 0x2B76, 0x0001, 0 +#define F_4E_PLT_GEAR_NWS_AM 0x2B76, 0x0001 #define F_4E_PLT_GEAR_WHEELS_LIGHT 0x2AA2, 0x0100, 8 #define F_4E_PLT_GEAR_WHEELS_LIGHT_AM 0x2AA2, 0x0100 #define F_4E_PLT_HYDRAULIC_PC1 0x2ACE, 0xFFFF, 0 @@ -13353,21 +13356,21 @@ #define F_4E_PLT_KY_28_P_MODE_DIM_A 0x2A02 #define F_4E_PLT_KY_28_P_MODE_TEST 0x2A00, 0x0001, 0 #define F_4E_PLT_KY_28_P_MODE_TEST_AM 0x2A00, 0x0001 -#define F_4E_PLT_MASTER_ARM_SW 0x2B1A, 0x0080, 7 -#define F_4E_PLT_MASTER_ARM_SW_AM 0x2B1A, 0x0080 -#define F_4E_PLT_O2_FLOW 0x2B12, 0xFFFF, 0 -#define F_4E_PLT_O2_FLOW_A 0x2B12 -#define F_4E_PLT_O2_LITERS 0x2B16, 0xFFFF, 0 -#define F_4E_PLT_O2_LITERS_A 0x2B16 -#define F_4E_PLT_O2_MIXTURE 0x2AE4, 0x1000, 12 -#define F_4E_PLT_O2_MIXTURE_AM 0x2AE4, 0x1000 -#define F_4E_PLT_O2_MODE 0x2AE4, 0x0C00, 10 -#define F_4E_PLT_O2_PRESSURE 0x2B14, 0xFFFF, 0 -#define F_4E_PLT_O2_PRESSURE_A 0x2B14 -#define F_4E_PLT_O2_SUPPLY 0x2AE4, 0x2000, 13 -#define F_4E_PLT_O2_SUPPLY_AM 0x2AE4, 0x2000 -#define F_4E_PLT_O2_TEST 0x2AE4, 0x0200, 9 -#define F_4E_PLT_O2_TEST_AM 0x2AE4, 0x0200 +#define F_4E_PLT_MASTER_ARM_SW 0x2B12, 0x2000, 13 +#define F_4E_PLT_MASTER_ARM_SW_AM 0x2B12, 0x2000 +#define F_4E_PLT_O2_FLOW 0x2B14, 0xFFFF, 0 +#define F_4E_PLT_O2_FLOW_A 0x2B14 +#define F_4E_PLT_O2_LITERS 0x2B18, 0xFFFF, 0 +#define F_4E_PLT_O2_LITERS_A 0x2B18 +#define F_4E_PLT_O2_MIXTURE 0x2B12, 0x0004, 2 +#define F_4E_PLT_O2_MIXTURE_AM 0x2B12, 0x0004 +#define F_4E_PLT_O2_MODE 0x2B12, 0x0003, 0 +#define F_4E_PLT_O2_PRESSURE 0x2B16, 0xFFFF, 0 +#define F_4E_PLT_O2_PRESSURE_A 0x2B16 +#define F_4E_PLT_O2_SUPPLY 0x2B12, 0x0008, 3 +#define F_4E_PLT_O2_SUPPLY_AM 0x2B12, 0x0008 +#define F_4E_PLT_O2_TEST 0x2AE4, 0x8000, 15 +#define F_4E_PLT_O2_TEST_AM 0x2AE4, 0x8000 #define F_4E_PLT_PNEUMATIC_GAUGE 0x2ACC, 0xFFFF, 0 #define F_4E_PLT_PNEUMATIC_GAUGE_A 0x2ACC #define F_4E_PLT_RADAR_ALT_BUG 0x2A70, 0xFFFF, 0 @@ -13382,18 +13385,18 @@ #define F_4E_PLT_RADAR_ALT_PUSH_TEST_AM 0x2A56, 0x2000 #define F_4E_PLT_RADAR_ALT_WARN_LIGHT 0x2A56, 0x4000, 14 #define F_4E_PLT_RADAR_ALT_WARN_LIGHT_AM 0x2A56, 0x4000 -#define F_4E_PLT_THROTTLE_CM_DISPENSE 0x2B76, 0x0010, 4 -#define F_4E_PLT_THROTTLE_CM_DISPENSE_AM 0x2B76, 0x0010 -#define F_4E_PLT_THROTTLE_DETENT_L 0x2B76, 0x0020, 5 -#define F_4E_PLT_THROTTLE_DETENT_L_AM 0x2B76, 0x0020 -#define F_4E_PLT_THROTTLE_DETENT_R 0x2B76, 0x0040, 6 -#define F_4E_PLT_THROTTLE_DETENT_R_AM 0x2B76, 0x0040 -#define F_4E_PLT_THROTTLE_IGNITION_L 0x2B5E, 0x4000, 14 -#define F_4E_PLT_THROTTLE_IGNITION_L_AM 0x2B5E, 0x4000 -#define F_4E_PLT_THROTTLE_IGNITION_R 0x2B5E, 0x8000, 15 -#define F_4E_PLT_THROTTLE_IGNITION_R_AM 0x2B5E, 0x8000 -#define F_4E_PLT_THROTTLE_MIC 0x2B76, 0x000C, 2 -#define F_4E_PLT_THROTTLE_SPEED_BRAKE 0x2B76, 0x0003, 0 +#define F_4E_PLT_THROTTLE_CM_DISPENSE 0x2B76, 0x0400, 10 +#define F_4E_PLT_THROTTLE_CM_DISPENSE_AM 0x2B76, 0x0400 +#define F_4E_PLT_THROTTLE_DETENT_L 0x2B76, 0x0800, 11 +#define F_4E_PLT_THROTTLE_DETENT_L_AM 0x2B76, 0x0800 +#define F_4E_PLT_THROTTLE_DETENT_R 0x2B76, 0x1000, 12 +#define F_4E_PLT_THROTTLE_DETENT_R_AM 0x2B76, 0x1000 +#define F_4E_PLT_THROTTLE_IGNITION_L 0x2B76, 0x0010, 4 +#define F_4E_PLT_THROTTLE_IGNITION_L_AM 0x2B76, 0x0010 +#define F_4E_PLT_THROTTLE_IGNITION_R 0x2B76, 0x0020, 5 +#define F_4E_PLT_THROTTLE_IGNITION_R_AM 0x2B76, 0x0020 +#define F_4E_PLT_THROTTLE_MIC 0x2B76, 0x0300, 8 +#define F_4E_PLT_THROTTLE_SPEED_BRAKE 0x2B76, 0x00C0, 6 #define F_4E_PLT_WCA_ALT_ENCODER_OUT 0x2ADA, 0x0020, 5 #define F_4E_PLT_WCA_ALT_ENCODER_OUT_AM 0x2ADA, 0x0020 #define F_4E_PLT_WCA_ANTI_ICE_L 0x2ADC, 0x0008, 3 @@ -13473,8 +13476,8 @@ #define F_4E_PLT_WCA_WARN_LIGHT_TEST 0x2AAA, 0x0C00, 10 #define F_4E_PLT_WCA_WINDSHIELD_TEMP 0x2ADC, 0x0200, 9 #define F_4E_PLT_WCA_WINDSHIELD_TEMP_AM 0x2ADC, 0x0200 -#define F_4E_WSO_AFCS_EMERGENCY_RELEASE 0x2B5E, 0x2000, 13 -#define F_4E_WSO_AFCS_EMERGENCY_RELEASE_AM 0x2B5E, 0x2000 +#define F_4E_WSO_AFCS_EMERGENCY_RELEASE 0x2B76, 0x0008, 3 +#define F_4E_WSO_AFCS_EMERGENCY_RELEASE_AM 0x2B76, 0x0008 #define F_4E_WSO_AOA_AURAL_TONE 0x2A80, 0xFFFF, 0 #define F_4E_WSO_AOA_AURAL_TONE_A 0x2A80 #define F_4E_WSO_AOA_INDEXER_BRIGHTNESS 0x2A84, 0xFFFF, 0 @@ -13576,10 +13579,13 @@ #define F_4E_WSO_COCKPIT_MIRROR_LEFT_AM 0x2A52, 0x0200 #define F_4E_WSO_COCKPIT_MIRROR_RIGHT 0x2A52, 0x0400, 10 #define F_4E_WSO_COCKPIT_MIRROR_RIGHT_AM 0x2A52, 0x0400 +#define F_4E_WSO_CONTROLS_FLAPS_INDICATOR 0x2AE4, 0x1000, 12 +#define F_4E_WSO_CONTROLS_FLAPS_INDICATOR_AM 0x2AE4, 0x1000 #define F_4E_WSO_CONTROLS_FLAPS_SLATS_EMERGENCY 0x2B0E, 0xFFFF, 0 #define F_4E_WSO_CONTROLS_FLAPS_SLATS_EMERGENCY_A 0x2B0E #define F_4E_WSO_CONTROLS_PEDAL_ADJUST 0x2B10, 0xFFFF, 0 #define F_4E_WSO_CONTROLS_PEDAL_ADJUST_A 0x2B10 +#define F_4E_WSO_CONTROLS_SLATS_INDICATOR 0x2AE4, 0x6000, 13 #define F_4E_WSO_ENGINE_TACH_L_LARGE 0x2B02, 0xFFFF, 0 #define F_4E_WSO_ENGINE_TACH_L_LARGE_A 0x2B02 #define F_4E_WSO_ENGINE_TACH_L_SMALL 0x2B04, 0xFFFF, 0 @@ -13595,55 +13601,55 @@ #define F_4E_WSO_GEAR_INDICATOR_LEFT 0x2AA6, 0x3000, 12 #define F_4E_WSO_GEAR_INDICATOR_NOSE 0x2AA6, 0xC000, 14 #define F_4E_WSO_GEAR_INDICATOR_RIGHT 0x2AAA, 0x0300, 8 -#define F_4E_WSO_GEAR_NWS 0x2B5E, 0x1000, 12 -#define F_4E_WSO_GEAR_NWS_AM 0x2B5E, 0x1000 +#define F_4E_WSO_GEAR_NWS 0x2B76, 0x0004, 2 +#define F_4E_WSO_GEAR_NWS_AM 0x2B76, 0x0004 #define F_4E_WSO_ICS_AMPLIFIER 0x2A0E, 0x0003, 0 #define F_4E_WSO_ICS_INTERCOM_VOL 0x2A0C, 0xFFFF, 0 #define F_4E_WSO_ICS_INTERCOM_VOL_A 0x2A0C #define F_4E_WSO_ICS_MODE 0x2A0E, 0x000C, 2 #define F_4E_WSO_IFF_CHALLENGE_DIM 0x2B5A, 0xFFFF, 0 #define F_4E_WSO_IFF_CHALLENGE_DIM_A 0x2B5A -#define F_4E_WSO_IFF_CHALLENGE_LIGHT 0x2B42, 0x2000, 13 -#define F_4E_WSO_IFF_CHALLENGE_LIGHT_AM 0x2B42, 0x2000 -#define F_4E_WSO_IFF_CHALLENGE_TEST_BUTTON 0x2B42, 0x1000, 12 -#define F_4E_WSO_IFF_CHALLENGE_TEST_BUTTON_AM 0x2B42, 0x1000 +#define F_4E_WSO_IFF_CHALLENGE_LIGHT 0x2B58, 0x0800, 11 +#define F_4E_WSO_IFF_CHALLENGE_LIGHT_AM 0x2B58, 0x0800 +#define F_4E_WSO_IFF_CHALLENGE_TEST_BUTTON 0x2B58, 0x0400, 10 +#define F_4E_WSO_IFF_CHALLENGE_TEST_BUTTON_AM 0x2B58, 0x0400 #define F_4E_WSO_IFF_CODE_A 0x2B52 -#define F_4E_WSO_IFF_CODE_HUNDREDS 0x2B3A, 0xF000, 12 -#define F_4E_WSO_IFF_CODE_INC_HUNDREDS 0x2B3E, 0x1000, 12 -#define F_4E_WSO_IFF_CODE_INC_HUNDREDS_AM 0x2B3E, 0x1000 -#define F_4E_WSO_IFF_CODE_INC_ONES 0x2B3E, 0x4000, 14 -#define F_4E_WSO_IFF_CODE_INC_ONES_AM 0x2B3E, 0x4000 -#define F_4E_WSO_IFF_CODE_INC_TENS 0x2B3E, 0x2000, 13 -#define F_4E_WSO_IFF_CODE_INC_TENS_AM 0x2B3E, 0x2000 -#define F_4E_WSO_IFF_CODE_INC_THOUSANDS 0x2B36, 0x8000, 15 -#define F_4E_WSO_IFF_CODE_INC_THOUSANDS_AM 0x2B36, 0x8000 -#define F_4E_WSO_IFF_CODE_ONES 0x2B36, 0x3C00, 10 -#define F_4E_WSO_IFF_CODE_TENS 0x2B3A, 0x0F00, 8 -#define F_4E_WSO_IFF_CODE_THOUSANDS 0x2B3E, 0x0F00, 8 +#define F_4E_WSO_IFF_CODE_HUNDREDS 0x2B3E, 0x0F00, 8 +#define F_4E_WSO_IFF_CODE_INC_HUNDREDS 0x2B42, 0x0400, 10 +#define F_4E_WSO_IFF_CODE_INC_HUNDREDS_AM 0x2B42, 0x0400 +#define F_4E_WSO_IFF_CODE_INC_ONES 0x2B42, 0x1000, 12 +#define F_4E_WSO_IFF_CODE_INC_ONES_AM 0x2B42, 0x1000 +#define F_4E_WSO_IFF_CODE_INC_TENS 0x2B42, 0x0800, 11 +#define F_4E_WSO_IFF_CODE_INC_TENS_AM 0x2B42, 0x0800 +#define F_4E_WSO_IFF_CODE_INC_THOUSANDS 0x2B42, 0x0200, 9 +#define F_4E_WSO_IFF_CODE_INC_THOUSANDS_AM 0x2B42, 0x0200 +#define F_4E_WSO_IFF_CODE_ONES 0x2B3A, 0x0F00, 8 +#define F_4E_WSO_IFF_CODE_TENS 0x2B3A, 0xF000, 12 +#define F_4E_WSO_IFF_CODE_THOUSANDS 0x2B3E, 0xF000, 12 #define F_4E_WSO_IFF_COMBAT_TREE_CHALLENGE_DIM 0x2B5C, 0xFFFF, 0 #define F_4E_WSO_IFF_COMBAT_TREE_CHALLENGE_DIM_A 0x2B5C -#define F_4E_WSO_IFF_COMBAT_TREE_CHALLENGE_TEST_BUTTON 0x2B58, 0x0200, 9 -#define F_4E_WSO_IFF_COMBAT_TREE_CHALLENGE_TEST_BUTTON_AM 0x2B58, 0x0200 -#define F_4E_WSO_IFF_COMBAT_TREE_CHALLENGE_TEST_LIGHT 0x2B58, 0x0400, 10 -#define F_4E_WSO_IFF_COMBAT_TREE_CHALLENGE_TEST_LIGHT_AM 0x2B58, 0x0400 -#define F_4E_WSO_IFF_COMBAT_TREE_MODE_2 0x2B58, 0x3000, 12 -#define F_4E_WSO_IFF_COMBAT_TREE_MODE_3 0x2B58, 0xC000, 14 -#define F_4E_WSO_IFF_COMBAT_TREE_TEST 0x2B58, 0x0800, 11 -#define F_4E_WSO_IFF_COMBAT_TREE_TEST_AM 0x2B58, 0x0800 +#define F_4E_WSO_IFF_COMBAT_TREE_CHALLENGE_TEST_BUTTON 0x2B58, 0x8000, 15 +#define F_4E_WSO_IFF_COMBAT_TREE_CHALLENGE_TEST_BUTTON_AM 0x2B58, 0x8000 +#define F_4E_WSO_IFF_COMBAT_TREE_CHALLENGE_TEST_LIGHT 0x2B5E, 0x0001, 0 +#define F_4E_WSO_IFF_COMBAT_TREE_CHALLENGE_TEST_LIGHT_AM 0x2B5E, 0x0001 +#define F_4E_WSO_IFF_COMBAT_TREE_MODE_2 0x2B5E, 0x000C, 2 +#define F_4E_WSO_IFF_COMBAT_TREE_MODE_3 0x2B5E, 0x0030, 4 +#define F_4E_WSO_IFF_COMBAT_TREE_TEST 0x2B5E, 0x0002, 1 +#define F_4E_WSO_IFF_COMBAT_TREE_TEST_AM 0x2B5E, 0x0002 #define F_4E_WSO_IFF_MODE_A 0x2B56 -#define F_4E_WSO_IFF_MODE_DEC 0x2B3E, 0x8000, 15 -#define F_4E_WSO_IFF_MODE_DEC_AM 0x2B3E, 0x8000 -#define F_4E_WSO_IFF_MODE_DEC_HUNDREDS 0x2B42, 0x0200, 9 -#define F_4E_WSO_IFF_MODE_DEC_HUNDREDS_AM 0x2B42, 0x0200 -#define F_4E_WSO_IFF_MODE_DEC_ONES 0x2B42, 0x0800, 11 -#define F_4E_WSO_IFF_MODE_DEC_ONES_AM 0x2B42, 0x0800 -#define F_4E_WSO_IFF_MODE_DEC_TENS 0x2B42, 0x0400, 10 -#define F_4E_WSO_IFF_MODE_DEC_TENS_AM 0x2B42, 0x0400 -#define F_4E_WSO_IFF_MODE_DEC_THOUSANDS 0x2B42, 0x0100, 8 -#define F_4E_WSO_IFF_MODE_DEC_THOUSANDS_AM 0x2B42, 0x0100 -#define F_4E_WSO_IFF_MODE_INC 0x2B36, 0x4000, 14 -#define F_4E_WSO_IFF_MODE_INC_AM 0x2B36, 0x4000 -#define F_4E_WSO_IFF_TEST_CHALLENGE 0x2B42, 0xC000, 14 +#define F_4E_WSO_IFF_MODE_DEC 0x2B42, 0x2000, 13 +#define F_4E_WSO_IFF_MODE_DEC_AM 0x2B42, 0x2000 +#define F_4E_WSO_IFF_MODE_DEC_HUNDREDS 0x2B42, 0x8000, 15 +#define F_4E_WSO_IFF_MODE_DEC_HUNDREDS_AM 0x2B42, 0x8000 +#define F_4E_WSO_IFF_MODE_DEC_ONES 0x2B58, 0x0200, 9 +#define F_4E_WSO_IFF_MODE_DEC_ONES_AM 0x2B58, 0x0200 +#define F_4E_WSO_IFF_MODE_DEC_TENS 0x2B58, 0x0100, 8 +#define F_4E_WSO_IFF_MODE_DEC_TENS_AM 0x2B58, 0x0100 +#define F_4E_WSO_IFF_MODE_DEC_THOUSANDS 0x2B42, 0x4000, 14 +#define F_4E_WSO_IFF_MODE_DEC_THOUSANDS_AM 0x2B42, 0x4000 +#define F_4E_WSO_IFF_MODE_INC 0x2B42, 0x0100, 8 +#define F_4E_WSO_IFF_MODE_INC_AM 0x2B42, 0x0100 +#define F_4E_WSO_IFF_TEST_CHALLENGE 0x2B58, 0x3000, 12 #define F_4E_WSO_INS_ALIGN 0x2A7E, 0x8000, 15 #define F_4E_WSO_INS_ALIGN_AM 0x2A7E, 0x8000 #define F_4E_WSO_INS_ALIGN_DIM 0x2A86, 0xFFFF, 0 @@ -13715,15 +13721,15 @@ #define F_4E_WSO_NAV_WIND_STRENGTH_VALUE_A 0x2AA8 #define F_4E_WSO_O2_FLOW 0x2B1C, 0xFFFF, 0 #define F_4E_WSO_O2_FLOW_A 0x2B1C -#define F_4E_WSO_O2_MIXTURE 0x2B1A, 0x0001, 0 -#define F_4E_WSO_O2_MIXTURE_AM 0x2B1A, 0x0001 -#define F_4E_WSO_O2_MODE 0x2AE4, 0xC000, 14 +#define F_4E_WSO_O2_MIXTURE 0x2B12, 0x0040, 6 +#define F_4E_WSO_O2_MIXTURE_AM 0x2B12, 0x0040 +#define F_4E_WSO_O2_MODE 0x2B12, 0x0030, 4 #define F_4E_WSO_O2_PRESSURE 0x2B1E, 0xFFFF, 0 #define F_4E_WSO_O2_PRESSURE_A 0x2B1E -#define F_4E_WSO_O2_SUPPLY 0x2B1A, 0x0002, 1 -#define F_4E_WSO_O2_SUPPLY_AM 0x2B1A, 0x0002 -#define F_4E_WSO_THROTTLE_MIC 0x2B76, 0x0600, 9 -#define F_4E_WSO_THROTTLE_SPEED_BRAKE 0x2B76, 0x0180, 7 +#define F_4E_WSO_O2_SUPPLY 0x2B12, 0x0080, 7 +#define F_4E_WSO_O2_SUPPLY_AM 0x2B12, 0x0080 +#define F_4E_WSO_THROTTLE_MIC 0x2B78, 0x0003, 0 +#define F_4E_WSO_THROTTLE_SPEED_BRAKE 0x2B76, 0x6000, 13 #define F_4E_WSO_WCA_CANOPY_UNLOCKED 0x2ADE, 0x0020, 5 #define F_4E_WSO_WCA_CANOPY_UNLOCKED_AM 0x2ADE, 0x0020 #define F_4E_WSO_WCA_INS_OUT 0x2ADE, 0x0040, 6 @@ -13737,7 +13743,7 @@ #define F_4E_WSO_WRCS_ALT_RANGE 0x2B22, 0xFFFF, 0 #define F_4E_WSO_WRCS_ALT_RANGE_A 0x2B22 #define F_4E_WSO_WRCS_ALT_RANGE_VALUE_A 0x2B34 -#define F_4E_WSO_WRCS_BIT_MODE 0x2B1A, 0x001C, 2 +#define F_4E_WSO_WRCS_BIT_MODE 0x2B12, 0x0700, 8 #define F_4E_WSO_WRCS_DRAG_COEFFICIENT 0x2B20, 0xFFFF, 0 #define F_4E_WSO_WRCS_DRAG_COEFFICIENT_A 0x2B20 #define F_4E_WSO_WRCS_DRAG_COEFFICIENT_VALUE_A 0x2B38 @@ -13747,16 +13753,16 @@ #define F_4E_WSO_WRCS_NS_DISTANCE 0x2B28, 0xFFFF, 0 #define F_4E_WSO_WRCS_NS_DISTANCE_A 0x2B28 #define F_4E_WSO_WRCS_NS_DISTANCE_VALUE_A 0x2B2C -#define F_4E_WSO_WRCS_RANGE_MULTIPLIER 0x2B1A, 0x0040, 6 -#define F_4E_WSO_WRCS_RANGE_MULTIPLIER_AM 0x2B1A, 0x0040 +#define F_4E_WSO_WRCS_RANGE_MULTIPLIER 0x2B12, 0x1000, 12 +#define F_4E_WSO_WRCS_RANGE_MULTIPLIER_AM 0x2B12, 0x1000 #define F_4E_WSO_WRCS_RELEASE_ADVANCE 0x2B2A, 0xFFFF, 0 #define F_4E_WSO_WRCS_RELEASE_ADVANCE_A 0x2B2A #define F_4E_WSO_WRCS_RELEASE_ADVANCE_VALUE_A 0x2B3C #define F_4E_WSO_WRCS_RELEASE_RANGE 0x2B24, 0xFFFF, 0 #define F_4E_WSO_WRCS_RELEASE_RANGE_A 0x2B24 #define F_4E_WSO_WRCS_RELEASE_RANGE_VALUE_A 0x2B40 -#define F_4E_WSO_WRCS_TARGET_FIND_MODE 0x2B1A, 0x0020, 5 -#define F_4E_WSO_WRCS_TARGET_FIND_MODE_AM 0x2B1A, 0x0020 +#define F_4E_WSO_WRCS_TARGET_FIND_MODE 0x2B12, 0x0800, 11 +#define F_4E_WSO_WRCS_TARGET_FIND_MODE_AM 0x2B12, 0x0800 #define F_5E_3_ACC 0x768E, 0x0004, 2 #define F_5E_3_ACCELEROMETER 0x76A0, 0xFFFF, 0 #define F_5E_3_ACCELEROMETER_A 0x76A0 diff --git a/Scripts/DCS-BIOS/doc/doc_assets/F-4E.jsonp b/Scripts/DCS-BIOS/doc/doc_assets/F-4E.jsonp index fe2d0e6b2..72df1f115 100644 --- a/Scripts/DCS-BIOS/doc/doc_assets/F-4E.jsonp +++ b/Scripts/DCS-BIOS/doc/doc_assets/F-4E.jsonp @@ -1434,6 +1434,24 @@ docdata["F-4E"] = } }, "PLT Control Surfaces": { + "PLT_CONTROLS_FLAPS_INDICATOR": { + "category": "PLT Control Surfaces", + "control_type": "metadata", + "description": "Flaps Indicator", + "identifier": "PLT_CONTROLS_FLAPS_INDICATOR", + "inputs": [ ], + "outputs": [ { + "address": 10980, + "address_mask_identifier": "F_4E_PLT_CONTROLS_FLAPS_INDICATOR_AM", + "address_mask_shift_identifier": "F_4E_PLT_CONTROLS_FLAPS_INDICATOR", + "description": "Flaps Indicator", + "mask": 512, + "max_value": 1, + "shift_by": 9, + "suffix": "", + "type": "integer" + } ] + }, "PLT_CONTROLS_FLAPS_SLATS": { "category": "PLT Control Surfaces", "control_type": "selector", @@ -1530,6 +1548,23 @@ docdata["F-4E"] = "type": "integer" } ] }, + "PLT_CONTROLS_SLATS_INDICATOR": { + "category": "PLT Control Surfaces", + "control_type": "metadata", + "description": "Slats Indicator", + "identifier": "PLT_CONTROLS_SLATS_INDICATOR", + "inputs": [ ], + "outputs": [ { + "address": 10980, + "address_mask_shift_identifier": "F_4E_PLT_CONTROLS_SLATS_INDICATOR", + "description": "Slats Indicator", + "mask": 3072, + "max_value": 2, + "shift_by": 10, + "suffix": "", + "type": "integer" + } ] + }, "PLT_CONTROLS_SLATS_OVERRIDE": { "category": "PLT Control Surfaces", "control_type": "selector", @@ -2259,9 +2294,9 @@ docdata["F-4E"] = "address": 11102, "address_mask_shift_identifier": "F_4E_PLT_EXT_LIGHT_ANTI_COLL", "description": "selector position", - "mask": 12, + "mask": 768, "max_value": 2, - "shift_by": 2, + "shift_by": 8, "suffix": "", "type": "integer" } ] @@ -2283,9 +2318,9 @@ docdata["F-4E"] = "address": 11102, "address_mask_shift_identifier": "F_4E_PLT_EXT_LIGHT_FLASH_MODE", "description": "selector position", - "mask": 48, + "mask": 3072, "max_value": 2, - "shift_by": 4, + "shift_by": 10, "suffix": "", "type": "integer" } ] @@ -2307,9 +2342,9 @@ docdata["F-4E"] = "address": 11102, "address_mask_shift_identifier": "F_4E_PLT_EXT_LIGHT_TAIL_BRIGHTNESS", "description": "selector position", - "mask": 192, + "mask": 12288, "max_value": 2, - "shift_by": 6, + "shift_by": 12, "suffix": "", "type": "integer" } ] @@ -2331,9 +2366,9 @@ docdata["F-4E"] = "address": 11102, "address_mask_shift_identifier": "F_4E_PLT_EXT_LIGHT_WING_BRIGHTNESS", "description": "selector position", - "mask": 768, + "mask": 49152, "max_value": 2, - "shift_by": 8, + "shift_by": 14, "suffix": "", "type": "integer" } ] @@ -2358,13 +2393,13 @@ docdata["F-4E"] = "interface": "action" } ], "outputs": [ { - "address": 11034, + "address": 11062, "address_mask_identifier": "F_4E_PLT_FUEL_AIR_REFUEL_AM", "address_mask_shift_identifier": "F_4E_PLT_FUEL_AIR_REFUEL", "description": "selector position", - "mask": 2048, + "mask": 512, "max_value": 1, - "shift_by": 11, + "shift_by": 9, "suffix": "", "type": "integer" } ] @@ -2406,13 +2441,13 @@ docdata["F-4E"] = "interface": "action" } ], "outputs": [ { - "address": 11034, + "address": 11062, "address_mask_identifier": "F_4E_PLT_FUEL_BOOST_PUMP_L_CHECK_AM", "address_mask_shift_identifier": "F_4E_PLT_FUEL_BOOST_PUMP_L_CHECK", "description": "selector position", - "mask": 32768, + "mask": 8192, "max_value": 1, - "shift_by": 15, + "shift_by": 13, "suffix": "", "type": "integer" } ] @@ -2458,9 +2493,9 @@ docdata["F-4E"] = "address_mask_identifier": "F_4E_PLT_FUEL_BOOST_PUMP_R_CHECK_AM", "address_mask_shift_identifier": "F_4E_PLT_FUEL_BOOST_PUMP_R_CHECK", "description": "selector position", - "mask": 256, + "mask": 16384, "max_value": 1, - "shift_by": 8, + "shift_by": 14, "suffix": "", "type": "integer" } ] @@ -2479,12 +2514,12 @@ docdata["F-4E"] = "max_value": 2 } ], "outputs": [ { - "address": 11034, + "address": 11062, "address_mask_shift_identifier": "F_4E_PLT_FUEL_EXTERNAL_TANKS_FEED", "description": "selector position", - "mask": 24576, + "mask": 6144, "max_value": 2, - "shift_by": 13, + "shift_by": 11, "suffix": "", "type": "integer" } ] @@ -2512,9 +2547,9 @@ docdata["F-4E"] = "address_mask_identifier": "F_4E_PLT_FUEL_FEED_TANK_CHECK_AM", "address_mask_shift_identifier": "F_4E_PLT_FUEL_FEED_TANK_CHECK", "description": "selector position", - "mask": 512, + "mask": 32768, "max_value": 1, - "shift_by": 9, + "shift_by": 15, "suffix": "", "type": "integer" } ] @@ -2606,13 +2641,13 @@ docdata["F-4E"] = "interface": "action" } ], "outputs": [ { - "address": 11034, + "address": 11062, "address_mask_identifier": "F_4E_PLT_FUEL_REFUEL_SELECTOR_AM", "address_mask_shift_identifier": "F_4E_PLT_FUEL_REFUEL_SELECTOR", "description": "selector position", - "mask": 1024, + "mask": 256, "max_value": 1, - "shift_by": 10, + "shift_by": 8, "suffix": "", "type": "integer" } ] @@ -2635,13 +2670,13 @@ docdata["F-4E"] = "interface": "action" } ], "outputs": [ { - "address": 11034, + "address": 11026, "address_mask_identifier": "F_4E_PLT_FUEL_REFUEL_SELECTOR_COVER_AM", "address_mask_shift_identifier": "F_4E_PLT_FUEL_REFUEL_SELECTOR_COVER", "description": "selector position", - "mask": 512, + "mask": 32768, "max_value": 1, - "shift_by": 9, + "shift_by": 15, "suffix": "", "type": "integer" } ] @@ -2664,13 +2699,13 @@ docdata["F-4E"] = "interface": "action" } ], "outputs": [ { - "address": 11034, + "address": 11062, "address_mask_identifier": "F_4E_PLT_FUEL_WING_FUEL_DUMP_AM", "address_mask_shift_identifier": "F_4E_PLT_FUEL_WING_FUEL_DUMP", "description": "selector position", - "mask": 4096, + "mask": 1024, "max_value": 1, - "shift_by": 12, + "shift_by": 10, "suffix": "", "type": "integer" } ] @@ -2693,13 +2728,13 @@ docdata["F-4E"] = "interface": "action" } ], "outputs": [ { - "address": 11034, + "address": 11026, "address_mask_identifier": "F_4E_PLT_FUEL_WING_INTERNAL_FEED_AM", "address_mask_shift_identifier": "F_4E_PLT_FUEL_WING_INTERNAL_FEED", "description": "selector position", - "mask": 256, + "mask": 16384, "max_value": 1, - "shift_by": 8, + "shift_by": 14, "suffix": "", "type": "integer" } ] @@ -3881,12 +3916,12 @@ docdata["F-4E"] = "max_value": 2 } ], "outputs": [ { - "address": 11126, + "address": 11128, "address_mask_shift_identifier": "F_4E_PLT_EXT_LIGHT_TAXI_LAND", "description": "selector position", - "mask": 6144, + "mask": 12, "max_value": 2, - "shift_by": 11, + "shift_by": 2, "suffix": "", "type": "integer" } ] @@ -3900,7 +3935,7 @@ docdata["F-4E"] = "identifier": "PLT_O2_FLOW", "inputs": [ ], "outputs": [ { - "address": 11026, + "address": 11028, "address_identifier": "F_4E_PLT_O2_FLOW_A", "address_mask_shift_identifier": "F_4E_PLT_O2_FLOW", "description": "gauge position", @@ -3918,7 +3953,7 @@ docdata["F-4E"] = "identifier": "PLT_O2_LITERS", "inputs": [ ], "outputs": [ { - "address": 11030, + "address": 11032, "address_identifier": "F_4E_PLT_O2_LITERS_A", "address_mask_shift_identifier": "F_4E_PLT_O2_LITERS", "description": "gauge position", @@ -3947,13 +3982,13 @@ docdata["F-4E"] = "interface": "action" } ], "outputs": [ { - "address": 10980, + "address": 11026, "address_mask_identifier": "F_4E_PLT_O2_MIXTURE_AM", "address_mask_shift_identifier": "F_4E_PLT_O2_MIXTURE", "description": "selector position", - "mask": 4096, + "mask": 4, "max_value": 1, - "shift_by": 12, + "shift_by": 2, "suffix": "", "type": "integer" } ] @@ -3969,12 +4004,12 @@ docdata["F-4E"] = "max_value": 2 } ], "outputs": [ { - "address": 10980, + "address": 11026, "address_mask_shift_identifier": "F_4E_PLT_O2_MODE", "description": "switch position -- 0 = Down, 1 = Mid, 2 = Up", - "mask": 3072, + "mask": 3, "max_value": 2, - "shift_by": 10, + "shift_by": 0, "suffix": "", "type": "integer" } ] @@ -3986,7 +4021,7 @@ docdata["F-4E"] = "identifier": "PLT_O2_PRESSURE", "inputs": [ ], "outputs": [ { - "address": 11028, + "address": 11030, "address_identifier": "F_4E_PLT_O2_PRESSURE_A", "address_mask_shift_identifier": "F_4E_PLT_O2_PRESSURE", "description": "gauge position", @@ -4015,13 +4050,13 @@ docdata["F-4E"] = "interface": "action" } ], "outputs": [ { - "address": 10980, + "address": 11026, "address_mask_identifier": "F_4E_PLT_O2_SUPPLY_AM", "address_mask_shift_identifier": "F_4E_PLT_O2_SUPPLY", "description": "selector position", - "mask": 8192, + "mask": 8, "max_value": 1, - "shift_by": 13, + "shift_by": 3, "suffix": "", "type": "integer" } ] @@ -4049,9 +4084,9 @@ docdata["F-4E"] = "address_mask_identifier": "F_4E_PLT_O2_TEST_AM", "address_mask_shift_identifier": "F_4E_PLT_O2_TEST", "description": "selector position", - "mask": 512, + "mask": 32768, "max_value": 1, - "shift_by": 9, + "shift_by": 15, "suffix": "", "type": "integer" } ] @@ -4232,9 +4267,9 @@ docdata["F-4E"] = "address_mask_identifier": "F_4E_PLT_COCKPIT_PRESSURE_EMERGENCY_RELEASE_AM", "address_mask_shift_identifier": "F_4E_PLT_COCKPIT_PRESSURE_EMERGENCY_RELEASE", "description": "selector position", - "mask": 8192, + "mask": 32768, "max_value": 1, - "shift_by": 13, + "shift_by": 15, "suffix": "", "type": "integer" } ] @@ -4257,7 +4292,7 @@ docdata["F-4E"] = "suggested_step": 3200 } ], "outputs": [ { - "address": 11128, + "address": 11130, "address_identifier": "F_4E_PLT_EXT_LIGHT_FORMATION_BRIGHTNESS_A", "address_mask_shift_identifier": "F_4E_PLT_EXT_LIGHT_FORMATION_BRIGHTNESS", "description": "position of the potentiometer", @@ -4279,12 +4314,12 @@ docdata["F-4E"] = "max_value": 2 } ], "outputs": [ { - "address": 11126, + "address": 11128, "address_mask_shift_identifier": "F_4E_PLT_EXT_LIGHT_FORMATION_MODE", "description": "switch position -- 0 = Down, 1 = Mid, 2 = Up", - "mask": 49152, + "mask": 48, "max_value": 2, - "shift_by": 14, + "shift_by": 4, "suffix": "", "type": "integer" } ] @@ -4310,13 +4345,13 @@ docdata["F-4E"] = "interface": "action" } ], "outputs": [ { - "address": 11102, + "address": 11126, "address_mask_identifier": "F_4E_PLT_AFCS_EMERGENCY_RELEASE_AM", "address_mask_shift_identifier": "F_4E_PLT_AFCS_EMERGENCY_RELEASE", "description": "selector position", - "mask": 2048, + "mask": 2, "max_value": 1, - "shift_by": 11, + "shift_by": 1, "suffix": "", "type": "integer" } ] @@ -4340,13 +4375,13 @@ docdata["F-4E"] = "interface": "action" } ], "outputs": [ { - "address": 11102, + "address": 11126, "address_mask_identifier": "F_4E_PLT_GEAR_NWS_AM", "address_mask_shift_identifier": "F_4E_PLT_GEAR_NWS", "description": "selector position", - "mask": 1024, + "mask": 1, "max_value": 1, - "shift_by": 10, + "shift_by": 0, "suffix": "", "type": "integer" } ] @@ -4376,9 +4411,9 @@ docdata["F-4E"] = "address_mask_identifier": "F_4E_PLT_THROTTLE_CM_DISPENSE_AM", "address_mask_shift_identifier": "F_4E_PLT_THROTTLE_CM_DISPENSE", "description": "selector position", - "mask": 16, + "mask": 1024, "max_value": 1, - "shift_by": 4, + "shift_by": 10, "suffix": "", "type": "integer" } ] @@ -4406,9 +4441,9 @@ docdata["F-4E"] = "address_mask_identifier": "F_4E_PLT_THROTTLE_DETENT_L_AM", "address_mask_shift_identifier": "F_4E_PLT_THROTTLE_DETENT_L", "description": "selector position", - "mask": 32, + "mask": 2048, "max_value": 1, - "shift_by": 5, + "shift_by": 11, "suffix": "", "type": "integer" } ] @@ -4436,9 +4471,9 @@ docdata["F-4E"] = "address_mask_identifier": "F_4E_PLT_THROTTLE_DETENT_R_AM", "address_mask_shift_identifier": "F_4E_PLT_THROTTLE_DETENT_R", "description": "selector position", - "mask": 64, + "mask": 4096, "max_value": 1, - "shift_by": 6, + "shift_by": 12, "suffix": "", "type": "integer" } ] @@ -4462,13 +4497,13 @@ docdata["F-4E"] = "interface": "action" } ], "outputs": [ { - "address": 11102, + "address": 11126, "address_mask_identifier": "F_4E_PLT_THROTTLE_IGNITION_L_AM", "address_mask_shift_identifier": "F_4E_PLT_THROTTLE_IGNITION_L", "description": "selector position", - "mask": 16384, + "mask": 16, "max_value": 1, - "shift_by": 14, + "shift_by": 4, "suffix": "", "type": "integer" } ] @@ -4492,13 +4527,13 @@ docdata["F-4E"] = "interface": "action" } ], "outputs": [ { - "address": 11102, + "address": 11126, "address_mask_identifier": "F_4E_PLT_THROTTLE_IGNITION_R_AM", "address_mask_shift_identifier": "F_4E_PLT_THROTTLE_IGNITION_R", "description": "selector position", - "mask": 32768, + "mask": 32, "max_value": 1, - "shift_by": 15, + "shift_by": 5, "suffix": "", "type": "integer" } ] @@ -4517,9 +4552,9 @@ docdata["F-4E"] = "address": 11126, "address_mask_shift_identifier": "F_4E_PLT_THROTTLE_MIC", "description": "switch position -- 0 = Down, 1 = Mid, 2 = Up", - "mask": 12, + "mask": 768, "max_value": 2, - "shift_by": 2, + "shift_by": 8, "suffix": "", "type": "integer" } ] @@ -4538,9 +4573,9 @@ docdata["F-4E"] = "address": 11126, "address_mask_shift_identifier": "F_4E_PLT_THROTTLE_SPEED_BRAKE", "description": "switch position -- 0 = Down, 1 = Mid, 2 = Up", - "mask": 3, + "mask": 192, "max_value": 2, - "shift_by": 0, + "shift_by": 6, "suffix": "", "type": "integer" } ] @@ -5302,13 +5337,13 @@ docdata["F-4E"] = "interface": "action" } ], "outputs": [ { - "address": 11034, + "address": 11026, "address_mask_identifier": "F_4E_PLT_MASTER_ARM_SW_AM", "address_mask_shift_identifier": "F_4E_PLT_MASTER_ARM_SW", "description": "selector position", - "mask": 128, + "mask": 8192, "max_value": 1, - "shift_by": 7, + "shift_by": 13, "suffix": "", "type": "integer" } ] @@ -6307,6 +6342,24 @@ docdata["F-4E"] = } }, "WSO Control Surfaces": { + "WSO_CONTROLS_FLAPS_INDICATOR": { + "category": "WSO Control Surfaces", + "control_type": "metadata", + "description": "Flaps Indicator", + "identifier": "WSO_CONTROLS_FLAPS_INDICATOR", + "inputs": [ ], + "outputs": [ { + "address": 10980, + "address_mask_identifier": "F_4E_WSO_CONTROLS_FLAPS_INDICATOR_AM", + "address_mask_shift_identifier": "F_4E_WSO_CONTROLS_FLAPS_INDICATOR", + "description": "Flaps Indicator", + "mask": 4096, + "max_value": 1, + "shift_by": 12, + "suffix": "", + "type": "integer" + } ] + }, "WSO_CONTROLS_FLAPS_SLATS_EMERGENCY": { "category": "WSO Control Surfaces", "control_type": "limited_dial", @@ -6357,6 +6410,23 @@ docdata["F-4E"] = "suffix": "_KNOB_POS", "type": "integer" } ] + }, + "WSO_CONTROLS_SLATS_INDICATOR": { + "category": "WSO Control Surfaces", + "control_type": "metadata", + "description": "Slats Indicator", + "identifier": "WSO_CONTROLS_SLATS_INDICATOR", + "inputs": [ ], + "outputs": [ { + "address": 10980, + "address_mask_shift_identifier": "F_4E_WSO_CONTROLS_SLATS_INDICATOR", + "description": "Slats Indicator", + "mask": 24576, + "max_value": 2, + "shift_by": 13, + "suffix": "", + "type": "integer" + } ] } }, "WSO Countermeasures Panel": { @@ -6962,13 +7032,13 @@ docdata["F-4E"] = "identifier": "WSO_IFF_CHALLENGE_LIGHT", "inputs": [ ], "outputs": [ { - "address": 11074, + "address": 11096, "address_mask_identifier": "F_4E_WSO_IFF_CHALLENGE_LIGHT_AM", "address_mask_shift_identifier": "F_4E_WSO_IFF_CHALLENGE_LIGHT", "description": "0 if light is off, 1 if light is on", - "mask": 8192, + "mask": 2048, "max_value": 1, - "shift_by": 13, + "shift_by": 11, "suffix": "", "type": "integer" } ] @@ -6992,13 +7062,13 @@ docdata["F-4E"] = "interface": "action" } ], "outputs": [ { - "address": 11074, + "address": 11096, "address_mask_identifier": "F_4E_WSO_IFF_CHALLENGE_TEST_BUTTON_AM", "address_mask_shift_identifier": "F_4E_WSO_IFF_CHALLENGE_TEST_BUTTON", "description": "selector position", - "mask": 4096, + "mask": 1024, "max_value": 1, - "shift_by": 12, + "shift_by": 10, "suffix": "", "type": "integer" } ] @@ -7025,12 +7095,12 @@ docdata["F-4E"] = "identifier": "WSO_IFF_CODE_HUNDREDS", "inputs": [ ], "outputs": [ { - "address": 11066, + "address": 11070, "address_mask_shift_identifier": "F_4E_WSO_IFF_CODE_HUNDREDS", "description": "IFF Code (hundreds)", - "mask": 61440, + "mask": 3840, "max_value": 8, - "shift_by": 12, + "shift_by": 8, "suffix": "", "type": "integer" } ] @@ -7054,13 +7124,13 @@ docdata["F-4E"] = "interface": "action" } ], "outputs": [ { - "address": 11070, + "address": 11074, "address_mask_identifier": "F_4E_WSO_IFF_CODE_INC_HUNDREDS_AM", "address_mask_shift_identifier": "F_4E_WSO_IFF_CODE_INC_HUNDREDS", "description": "selector position", - "mask": 4096, + "mask": 1024, "max_value": 1, - "shift_by": 12, + "shift_by": 10, "suffix": "", "type": "integer" } ] @@ -7084,13 +7154,13 @@ docdata["F-4E"] = "interface": "action" } ], "outputs": [ { - "address": 11070, + "address": 11074, "address_mask_identifier": "F_4E_WSO_IFF_CODE_INC_ONES_AM", "address_mask_shift_identifier": "F_4E_WSO_IFF_CODE_INC_ONES", "description": "selector position", - "mask": 16384, + "mask": 4096, "max_value": 1, - "shift_by": 14, + "shift_by": 12, "suffix": "", "type": "integer" } ] @@ -7114,13 +7184,13 @@ docdata["F-4E"] = "interface": "action" } ], "outputs": [ { - "address": 11070, + "address": 11074, "address_mask_identifier": "F_4E_WSO_IFF_CODE_INC_TENS_AM", "address_mask_shift_identifier": "F_4E_WSO_IFF_CODE_INC_TENS", "description": "selector position", - "mask": 8192, + "mask": 2048, "max_value": 1, - "shift_by": 13, + "shift_by": 11, "suffix": "", "type": "integer" } ] @@ -7144,13 +7214,13 @@ docdata["F-4E"] = "interface": "action" } ], "outputs": [ { - "address": 11062, + "address": 11074, "address_mask_identifier": "F_4E_WSO_IFF_CODE_INC_THOUSANDS_AM", "address_mask_shift_identifier": "F_4E_WSO_IFF_CODE_INC_THOUSANDS", "description": "selector position", - "mask": 32768, + "mask": 512, "max_value": 1, - "shift_by": 15, + "shift_by": 9, "suffix": "", "type": "integer" } ] @@ -7162,12 +7232,12 @@ docdata["F-4E"] = "identifier": "WSO_IFF_CODE_ONES", "inputs": [ ], "outputs": [ { - "address": 11062, + "address": 11066, "address_mask_shift_identifier": "F_4E_WSO_IFF_CODE_ONES", "description": "IFF Code (ones)", - "mask": 15360, + "mask": 3840, "max_value": 8, - "shift_by": 10, + "shift_by": 8, "suffix": "", "type": "integer" } ] @@ -7182,9 +7252,9 @@ docdata["F-4E"] = "address": 11066, "address_mask_shift_identifier": "F_4E_WSO_IFF_CODE_TENS", "description": "IFF Code (tens)", - "mask": 3840, + "mask": 61440, "max_value": 8, - "shift_by": 8, + "shift_by": 12, "suffix": "", "type": "integer" } ] @@ -7199,9 +7269,9 @@ docdata["F-4E"] = "address": 11070, "address_mask_shift_identifier": "F_4E_WSO_IFF_CODE_THOUSANDS", "description": "IFF Code (thousands)", - "mask": 3840, + "mask": 61440, "max_value": 8, - "shift_by": 8, + "shift_by": 12, "suffix": "", "type": "integer" } ] @@ -7256,9 +7326,9 @@ docdata["F-4E"] = "address_mask_identifier": "F_4E_WSO_IFF_COMBAT_TREE_CHALLENGE_TEST_BUTTON_AM", "address_mask_shift_identifier": "F_4E_WSO_IFF_COMBAT_TREE_CHALLENGE_TEST_BUTTON", "description": "selector position", - "mask": 512, + "mask": 32768, "max_value": 1, - "shift_by": 9, + "shift_by": 15, "suffix": "", "type": "integer" } ] @@ -7270,13 +7340,13 @@ docdata["F-4E"] = "identifier": "WSO_IFF_COMBAT_TREE_CHALLENGE_TEST_LIGHT", "inputs": [ ], "outputs": [ { - "address": 11096, + "address": 11102, "address_mask_identifier": "F_4E_WSO_IFF_COMBAT_TREE_CHALLENGE_TEST_LIGHT_AM", "address_mask_shift_identifier": "F_4E_WSO_IFF_COMBAT_TREE_CHALLENGE_TEST_LIGHT", "description": "0 if light is off, 1 if light is on", - "mask": 1024, + "mask": 1, "max_value": 1, - "shift_by": 10, + "shift_by": 0, "suffix": "", "type": "integer" } ] @@ -7295,12 +7365,12 @@ docdata["F-4E"] = "max_value": 2 } ], "outputs": [ { - "address": 11096, + "address": 11102, "address_mask_shift_identifier": "F_4E_WSO_IFF_COMBAT_TREE_MODE_2", "description": "selector position", - "mask": 12288, + "mask": 12, "max_value": 2, - "shift_by": 12, + "shift_by": 2, "suffix": "", "type": "integer" } ] @@ -7319,12 +7389,12 @@ docdata["F-4E"] = "max_value": 2 } ], "outputs": [ { - "address": 11096, + "address": 11102, "address_mask_shift_identifier": "F_4E_WSO_IFF_COMBAT_TREE_MODE_3", "description": "selector position", - "mask": 49152, + "mask": 48, "max_value": 2, - "shift_by": 14, + "shift_by": 4, "suffix": "", "type": "integer" } ] @@ -7348,13 +7418,13 @@ docdata["F-4E"] = "interface": "action" } ], "outputs": [ { - "address": 11096, + "address": 11102, "address_mask_identifier": "F_4E_WSO_IFF_COMBAT_TREE_TEST_AM", "address_mask_shift_identifier": "F_4E_WSO_IFF_COMBAT_TREE_TEST", "description": "selector position", - "mask": 2048, + "mask": 2, "max_value": 1, - "shift_by": 11, + "shift_by": 1, "suffix": "", "type": "integer" } ] @@ -7393,13 +7463,13 @@ docdata["F-4E"] = "interface": "action" } ], "outputs": [ { - "address": 11070, + "address": 11074, "address_mask_identifier": "F_4E_WSO_IFF_MODE_DEC_AM", "address_mask_shift_identifier": "F_4E_WSO_IFF_MODE_DEC", "description": "selector position", - "mask": 32768, + "mask": 8192, "max_value": 1, - "shift_by": 15, + "shift_by": 13, "suffix": "", "type": "integer" } ] @@ -7427,9 +7497,9 @@ docdata["F-4E"] = "address_mask_identifier": "F_4E_WSO_IFF_MODE_DEC_HUNDREDS_AM", "address_mask_shift_identifier": "F_4E_WSO_IFF_MODE_DEC_HUNDREDS", "description": "selector position", - "mask": 512, + "mask": 32768, "max_value": 1, - "shift_by": 9, + "shift_by": 15, "suffix": "", "type": "integer" } ] @@ -7453,13 +7523,13 @@ docdata["F-4E"] = "interface": "action" } ], "outputs": [ { - "address": 11074, + "address": 11096, "address_mask_identifier": "F_4E_WSO_IFF_MODE_DEC_ONES_AM", "address_mask_shift_identifier": "F_4E_WSO_IFF_MODE_DEC_ONES", "description": "selector position", - "mask": 2048, + "mask": 512, "max_value": 1, - "shift_by": 11, + "shift_by": 9, "suffix": "", "type": "integer" } ] @@ -7483,13 +7553,13 @@ docdata["F-4E"] = "interface": "action" } ], "outputs": [ { - "address": 11074, + "address": 11096, "address_mask_identifier": "F_4E_WSO_IFF_MODE_DEC_TENS_AM", "address_mask_shift_identifier": "F_4E_WSO_IFF_MODE_DEC_TENS", "description": "selector position", - "mask": 1024, + "mask": 256, "max_value": 1, - "shift_by": 10, + "shift_by": 8, "suffix": "", "type": "integer" } ] @@ -7517,9 +7587,9 @@ docdata["F-4E"] = "address_mask_identifier": "F_4E_WSO_IFF_MODE_DEC_THOUSANDS_AM", "address_mask_shift_identifier": "F_4E_WSO_IFF_MODE_DEC_THOUSANDS", "description": "selector position", - "mask": 256, + "mask": 16384, "max_value": 1, - "shift_by": 8, + "shift_by": 14, "suffix": "", "type": "integer" } ] @@ -7543,13 +7613,13 @@ docdata["F-4E"] = "interface": "action" } ], "outputs": [ { - "address": 11062, + "address": 11074, "address_mask_identifier": "F_4E_WSO_IFF_MODE_INC_AM", "address_mask_shift_identifier": "F_4E_WSO_IFF_MODE_INC", "description": "selector position", - "mask": 16384, + "mask": 256, "max_value": 1, - "shift_by": 14, + "shift_by": 8, "suffix": "", "type": "integer" } ] @@ -7565,12 +7635,12 @@ docdata["F-4E"] = "max_value": 2 } ], "outputs": [ { - "address": 11074, + "address": 11096, "address_mask_shift_identifier": "F_4E_WSO_IFF_TEST_CHALLENGE", "description": "switch position -- 0 = Down, 1 = Mid, 2 = Up", - "mask": 49152, + "mask": 12288, "max_value": 2, - "shift_by": 14, + "shift_by": 12, "suffix": "", "type": "integer" } ] @@ -8635,13 +8705,13 @@ docdata["F-4E"] = "interface": "action" } ], "outputs": [ { - "address": 11034, + "address": 11026, "address_mask_identifier": "F_4E_WSO_O2_MIXTURE_AM", "address_mask_shift_identifier": "F_4E_WSO_O2_MIXTURE", "description": "selector position", - "mask": 1, + "mask": 64, "max_value": 1, - "shift_by": 0, + "shift_by": 6, "suffix": "", "type": "integer" } ] @@ -8657,12 +8727,12 @@ docdata["F-4E"] = "max_value": 2 } ], "outputs": [ { - "address": 10980, + "address": 11026, "address_mask_shift_identifier": "F_4E_WSO_O2_MODE", "description": "switch position -- 0 = Down, 1 = Mid, 2 = Up", - "mask": 49152, + "mask": 48, "max_value": 2, - "shift_by": 14, + "shift_by": 4, "suffix": "", "type": "integer" } ] @@ -8703,13 +8773,13 @@ docdata["F-4E"] = "interface": "action" } ], "outputs": [ { - "address": 11034, + "address": 11026, "address_mask_identifier": "F_4E_WSO_O2_SUPPLY_AM", "address_mask_shift_identifier": "F_4E_WSO_O2_SUPPLY", "description": "selector position", - "mask": 2, + "mask": 128, "max_value": 1, - "shift_by": 1, + "shift_by": 7, "suffix": "", "type": "integer" } ] @@ -8735,13 +8805,13 @@ docdata["F-4E"] = "interface": "action" } ], "outputs": [ { - "address": 11102, + "address": 11126, "address_mask_identifier": "F_4E_WSO_AFCS_EMERGENCY_RELEASE_AM", "address_mask_shift_identifier": "F_4E_WSO_AFCS_EMERGENCY_RELEASE", "description": "selector position", - "mask": 8192, + "mask": 8, "max_value": 1, - "shift_by": 13, + "shift_by": 3, "suffix": "", "type": "integer" } ] @@ -8765,13 +8835,13 @@ docdata["F-4E"] = "interface": "action" } ], "outputs": [ { - "address": 11102, + "address": 11126, "address_mask_identifier": "F_4E_WSO_GEAR_NWS_AM", "address_mask_shift_identifier": "F_4E_WSO_GEAR_NWS", "description": "selector position", - "mask": 4096, + "mask": 4, "max_value": 1, - "shift_by": 12, + "shift_by": 2, "suffix": "", "type": "integer" } ] @@ -8789,12 +8859,12 @@ docdata["F-4E"] = "max_value": 2 } ], "outputs": [ { - "address": 11126, + "address": 11128, "address_mask_shift_identifier": "F_4E_WSO_THROTTLE_MIC", "description": "switch position -- 0 = Down, 1 = Mid, 2 = Up", - "mask": 1536, + "mask": 3, "max_value": 2, - "shift_by": 9, + "shift_by": 0, "suffix": "", "type": "integer" } ] @@ -8813,9 +8883,9 @@ docdata["F-4E"] = "address": 11126, "address_mask_shift_identifier": "F_4E_WSO_THROTTLE_SPEED_BRAKE", "description": "switch position -- 0 = Down, 1 = Mid, 2 = Up", - "mask": 384, + "mask": 24576, "max_value": 2, - "shift_by": 7, + "shift_by": 13, "suffix": "", "type": "integer" } ] @@ -8878,12 +8948,12 @@ docdata["F-4E"] = "max_value": 5 } ], "outputs": [ { - "address": 11034, + "address": 11026, "address_mask_shift_identifier": "F_4E_WSO_WRCS_BIT_MODE", "description": "selector position", - "mask": 28, + "mask": 1792, "max_value": 5, - "shift_by": 2, + "shift_by": 8, "suffix": "", "type": "integer" } ] @@ -9032,13 +9102,13 @@ docdata["F-4E"] = "interface": "action" } ], "outputs": [ { - "address": 11034, + "address": 11026, "address_mask_identifier": "F_4E_WSO_WRCS_RANGE_MULTIPLIER_AM", "address_mask_shift_identifier": "F_4E_WSO_WRCS_RANGE_MULTIPLIER", "description": "selector position", - "mask": 64, + "mask": 4096, "max_value": 1, - "shift_by": 6, + "shift_by": 12, "suffix": "", "type": "integer" } ] @@ -9145,13 +9215,13 @@ docdata["F-4E"] = "interface": "action" } ], "outputs": [ { - "address": 11034, + "address": 11026, "address_mask_identifier": "F_4E_WSO_WRCS_TARGET_FIND_MODE_AM", "address_mask_shift_identifier": "F_4E_WSO_WRCS_TARGET_FIND_MODE", "description": "selector position", - "mask": 32, + "mask": 2048, "max_value": 1, - "shift_by": 5, + "shift_by": 11, "suffix": "", "type": "integer" } ] diff --git a/Scripts/DCS-BIOS/doc/json/F-4E.json b/Scripts/DCS-BIOS/doc/json/F-4E.json index e9ebb98c2..8ecb050ba 100644 --- a/Scripts/DCS-BIOS/doc/json/F-4E.json +++ b/Scripts/DCS-BIOS/doc/json/F-4E.json @@ -1433,6 +1433,24 @@ } }, "PLT Control Surfaces": { + "PLT_CONTROLS_FLAPS_INDICATOR": { + "category": "PLT Control Surfaces", + "control_type": "metadata", + "description": "Flaps Indicator", + "identifier": "PLT_CONTROLS_FLAPS_INDICATOR", + "inputs": [ ], + "outputs": [ { + "address": 10980, + "address_mask_identifier": "F_4E_PLT_CONTROLS_FLAPS_INDICATOR_AM", + "address_mask_shift_identifier": "F_4E_PLT_CONTROLS_FLAPS_INDICATOR", + "description": "Flaps Indicator", + "mask": 512, + "max_value": 1, + "shift_by": 9, + "suffix": "", + "type": "integer" + } ] + }, "PLT_CONTROLS_FLAPS_SLATS": { "category": "PLT Control Surfaces", "control_type": "selector", @@ -1529,6 +1547,23 @@ "type": "integer" } ] }, + "PLT_CONTROLS_SLATS_INDICATOR": { + "category": "PLT Control Surfaces", + "control_type": "metadata", + "description": "Slats Indicator", + "identifier": "PLT_CONTROLS_SLATS_INDICATOR", + "inputs": [ ], + "outputs": [ { + "address": 10980, + "address_mask_shift_identifier": "F_4E_PLT_CONTROLS_SLATS_INDICATOR", + "description": "Slats Indicator", + "mask": 3072, + "max_value": 2, + "shift_by": 10, + "suffix": "", + "type": "integer" + } ] + }, "PLT_CONTROLS_SLATS_OVERRIDE": { "category": "PLT Control Surfaces", "control_type": "selector", @@ -2258,9 +2293,9 @@ "address": 11102, "address_mask_shift_identifier": "F_4E_PLT_EXT_LIGHT_ANTI_COLL", "description": "selector position", - "mask": 12, + "mask": 768, "max_value": 2, - "shift_by": 2, + "shift_by": 8, "suffix": "", "type": "integer" } ] @@ -2282,9 +2317,9 @@ "address": 11102, "address_mask_shift_identifier": "F_4E_PLT_EXT_LIGHT_FLASH_MODE", "description": "selector position", - "mask": 48, + "mask": 3072, "max_value": 2, - "shift_by": 4, + "shift_by": 10, "suffix": "", "type": "integer" } ] @@ -2306,9 +2341,9 @@ "address": 11102, "address_mask_shift_identifier": "F_4E_PLT_EXT_LIGHT_TAIL_BRIGHTNESS", "description": "selector position", - "mask": 192, + "mask": 12288, "max_value": 2, - "shift_by": 6, + "shift_by": 12, "suffix": "", "type": "integer" } ] @@ -2330,9 +2365,9 @@ "address": 11102, "address_mask_shift_identifier": "F_4E_PLT_EXT_LIGHT_WING_BRIGHTNESS", "description": "selector position", - "mask": 768, + "mask": 49152, "max_value": 2, - "shift_by": 8, + "shift_by": 14, "suffix": "", "type": "integer" } ] @@ -2357,13 +2392,13 @@ "interface": "action" } ], "outputs": [ { - "address": 11034, + "address": 11062, "address_mask_identifier": "F_4E_PLT_FUEL_AIR_REFUEL_AM", "address_mask_shift_identifier": "F_4E_PLT_FUEL_AIR_REFUEL", "description": "selector position", - "mask": 2048, + "mask": 512, "max_value": 1, - "shift_by": 11, + "shift_by": 9, "suffix": "", "type": "integer" } ] @@ -2405,13 +2440,13 @@ "interface": "action" } ], "outputs": [ { - "address": 11034, + "address": 11062, "address_mask_identifier": "F_4E_PLT_FUEL_BOOST_PUMP_L_CHECK_AM", "address_mask_shift_identifier": "F_4E_PLT_FUEL_BOOST_PUMP_L_CHECK", "description": "selector position", - "mask": 32768, + "mask": 8192, "max_value": 1, - "shift_by": 15, + "shift_by": 13, "suffix": "", "type": "integer" } ] @@ -2457,9 +2492,9 @@ "address_mask_identifier": "F_4E_PLT_FUEL_BOOST_PUMP_R_CHECK_AM", "address_mask_shift_identifier": "F_4E_PLT_FUEL_BOOST_PUMP_R_CHECK", "description": "selector position", - "mask": 256, + "mask": 16384, "max_value": 1, - "shift_by": 8, + "shift_by": 14, "suffix": "", "type": "integer" } ] @@ -2478,12 +2513,12 @@ "max_value": 2 } ], "outputs": [ { - "address": 11034, + "address": 11062, "address_mask_shift_identifier": "F_4E_PLT_FUEL_EXTERNAL_TANKS_FEED", "description": "selector position", - "mask": 24576, + "mask": 6144, "max_value": 2, - "shift_by": 13, + "shift_by": 11, "suffix": "", "type": "integer" } ] @@ -2511,9 +2546,9 @@ "address_mask_identifier": "F_4E_PLT_FUEL_FEED_TANK_CHECK_AM", "address_mask_shift_identifier": "F_4E_PLT_FUEL_FEED_TANK_CHECK", "description": "selector position", - "mask": 512, + "mask": 32768, "max_value": 1, - "shift_by": 9, + "shift_by": 15, "suffix": "", "type": "integer" } ] @@ -2605,13 +2640,13 @@ "interface": "action" } ], "outputs": [ { - "address": 11034, + "address": 11062, "address_mask_identifier": "F_4E_PLT_FUEL_REFUEL_SELECTOR_AM", "address_mask_shift_identifier": "F_4E_PLT_FUEL_REFUEL_SELECTOR", "description": "selector position", - "mask": 1024, + "mask": 256, "max_value": 1, - "shift_by": 10, + "shift_by": 8, "suffix": "", "type": "integer" } ] @@ -2634,13 +2669,13 @@ "interface": "action" } ], "outputs": [ { - "address": 11034, + "address": 11026, "address_mask_identifier": "F_4E_PLT_FUEL_REFUEL_SELECTOR_COVER_AM", "address_mask_shift_identifier": "F_4E_PLT_FUEL_REFUEL_SELECTOR_COVER", "description": "selector position", - "mask": 512, + "mask": 32768, "max_value": 1, - "shift_by": 9, + "shift_by": 15, "suffix": "", "type": "integer" } ] @@ -2663,13 +2698,13 @@ "interface": "action" } ], "outputs": [ { - "address": 11034, + "address": 11062, "address_mask_identifier": "F_4E_PLT_FUEL_WING_FUEL_DUMP_AM", "address_mask_shift_identifier": "F_4E_PLT_FUEL_WING_FUEL_DUMP", "description": "selector position", - "mask": 4096, + "mask": 1024, "max_value": 1, - "shift_by": 12, + "shift_by": 10, "suffix": "", "type": "integer" } ] @@ -2692,13 +2727,13 @@ "interface": "action" } ], "outputs": [ { - "address": 11034, + "address": 11026, "address_mask_identifier": "F_4E_PLT_FUEL_WING_INTERNAL_FEED_AM", "address_mask_shift_identifier": "F_4E_PLT_FUEL_WING_INTERNAL_FEED", "description": "selector position", - "mask": 256, + "mask": 16384, "max_value": 1, - "shift_by": 8, + "shift_by": 14, "suffix": "", "type": "integer" } ] @@ -3880,12 +3915,12 @@ "max_value": 2 } ], "outputs": [ { - "address": 11126, + "address": 11128, "address_mask_shift_identifier": "F_4E_PLT_EXT_LIGHT_TAXI_LAND", "description": "selector position", - "mask": 6144, + "mask": 12, "max_value": 2, - "shift_by": 11, + "shift_by": 2, "suffix": "", "type": "integer" } ] @@ -3899,7 +3934,7 @@ "identifier": "PLT_O2_FLOW", "inputs": [ ], "outputs": [ { - "address": 11026, + "address": 11028, "address_identifier": "F_4E_PLT_O2_FLOW_A", "address_mask_shift_identifier": "F_4E_PLT_O2_FLOW", "description": "gauge position", @@ -3917,7 +3952,7 @@ "identifier": "PLT_O2_LITERS", "inputs": [ ], "outputs": [ { - "address": 11030, + "address": 11032, "address_identifier": "F_4E_PLT_O2_LITERS_A", "address_mask_shift_identifier": "F_4E_PLT_O2_LITERS", "description": "gauge position", @@ -3946,13 +3981,13 @@ "interface": "action" } ], "outputs": [ { - "address": 10980, + "address": 11026, "address_mask_identifier": "F_4E_PLT_O2_MIXTURE_AM", "address_mask_shift_identifier": "F_4E_PLT_O2_MIXTURE", "description": "selector position", - "mask": 4096, + "mask": 4, "max_value": 1, - "shift_by": 12, + "shift_by": 2, "suffix": "", "type": "integer" } ] @@ -3968,12 +4003,12 @@ "max_value": 2 } ], "outputs": [ { - "address": 10980, + "address": 11026, "address_mask_shift_identifier": "F_4E_PLT_O2_MODE", "description": "switch position -- 0 = Down, 1 = Mid, 2 = Up", - "mask": 3072, + "mask": 3, "max_value": 2, - "shift_by": 10, + "shift_by": 0, "suffix": "", "type": "integer" } ] @@ -3985,7 +4020,7 @@ "identifier": "PLT_O2_PRESSURE", "inputs": [ ], "outputs": [ { - "address": 11028, + "address": 11030, "address_identifier": "F_4E_PLT_O2_PRESSURE_A", "address_mask_shift_identifier": "F_4E_PLT_O2_PRESSURE", "description": "gauge position", @@ -4014,13 +4049,13 @@ "interface": "action" } ], "outputs": [ { - "address": 10980, + "address": 11026, "address_mask_identifier": "F_4E_PLT_O2_SUPPLY_AM", "address_mask_shift_identifier": "F_4E_PLT_O2_SUPPLY", "description": "selector position", - "mask": 8192, + "mask": 8, "max_value": 1, - "shift_by": 13, + "shift_by": 3, "suffix": "", "type": "integer" } ] @@ -4048,9 +4083,9 @@ "address_mask_identifier": "F_4E_PLT_O2_TEST_AM", "address_mask_shift_identifier": "F_4E_PLT_O2_TEST", "description": "selector position", - "mask": 512, + "mask": 32768, "max_value": 1, - "shift_by": 9, + "shift_by": 15, "suffix": "", "type": "integer" } ] @@ -4231,9 +4266,9 @@ "address_mask_identifier": "F_4E_PLT_COCKPIT_PRESSURE_EMERGENCY_RELEASE_AM", "address_mask_shift_identifier": "F_4E_PLT_COCKPIT_PRESSURE_EMERGENCY_RELEASE", "description": "selector position", - "mask": 8192, + "mask": 32768, "max_value": 1, - "shift_by": 13, + "shift_by": 15, "suffix": "", "type": "integer" } ] @@ -4256,7 +4291,7 @@ "suggested_step": 3200 } ], "outputs": [ { - "address": 11128, + "address": 11130, "address_identifier": "F_4E_PLT_EXT_LIGHT_FORMATION_BRIGHTNESS_A", "address_mask_shift_identifier": "F_4E_PLT_EXT_LIGHT_FORMATION_BRIGHTNESS", "description": "position of the potentiometer", @@ -4278,12 +4313,12 @@ "max_value": 2 } ], "outputs": [ { - "address": 11126, + "address": 11128, "address_mask_shift_identifier": "F_4E_PLT_EXT_LIGHT_FORMATION_MODE", "description": "switch position -- 0 = Down, 1 = Mid, 2 = Up", - "mask": 49152, + "mask": 48, "max_value": 2, - "shift_by": 14, + "shift_by": 4, "suffix": "", "type": "integer" } ] @@ -4309,13 +4344,13 @@ "interface": "action" } ], "outputs": [ { - "address": 11102, + "address": 11126, "address_mask_identifier": "F_4E_PLT_AFCS_EMERGENCY_RELEASE_AM", "address_mask_shift_identifier": "F_4E_PLT_AFCS_EMERGENCY_RELEASE", "description": "selector position", - "mask": 2048, + "mask": 2, "max_value": 1, - "shift_by": 11, + "shift_by": 1, "suffix": "", "type": "integer" } ] @@ -4339,13 +4374,13 @@ "interface": "action" } ], "outputs": [ { - "address": 11102, + "address": 11126, "address_mask_identifier": "F_4E_PLT_GEAR_NWS_AM", "address_mask_shift_identifier": "F_4E_PLT_GEAR_NWS", "description": "selector position", - "mask": 1024, + "mask": 1, "max_value": 1, - "shift_by": 10, + "shift_by": 0, "suffix": "", "type": "integer" } ] @@ -4375,9 +4410,9 @@ "address_mask_identifier": "F_4E_PLT_THROTTLE_CM_DISPENSE_AM", "address_mask_shift_identifier": "F_4E_PLT_THROTTLE_CM_DISPENSE", "description": "selector position", - "mask": 16, + "mask": 1024, "max_value": 1, - "shift_by": 4, + "shift_by": 10, "suffix": "", "type": "integer" } ] @@ -4405,9 +4440,9 @@ "address_mask_identifier": "F_4E_PLT_THROTTLE_DETENT_L_AM", "address_mask_shift_identifier": "F_4E_PLT_THROTTLE_DETENT_L", "description": "selector position", - "mask": 32, + "mask": 2048, "max_value": 1, - "shift_by": 5, + "shift_by": 11, "suffix": "", "type": "integer" } ] @@ -4435,9 +4470,9 @@ "address_mask_identifier": "F_4E_PLT_THROTTLE_DETENT_R_AM", "address_mask_shift_identifier": "F_4E_PLT_THROTTLE_DETENT_R", "description": "selector position", - "mask": 64, + "mask": 4096, "max_value": 1, - "shift_by": 6, + "shift_by": 12, "suffix": "", "type": "integer" } ] @@ -4461,13 +4496,13 @@ "interface": "action" } ], "outputs": [ { - "address": 11102, + "address": 11126, "address_mask_identifier": "F_4E_PLT_THROTTLE_IGNITION_L_AM", "address_mask_shift_identifier": "F_4E_PLT_THROTTLE_IGNITION_L", "description": "selector position", - "mask": 16384, + "mask": 16, "max_value": 1, - "shift_by": 14, + "shift_by": 4, "suffix": "", "type": "integer" } ] @@ -4491,13 +4526,13 @@ "interface": "action" } ], "outputs": [ { - "address": 11102, + "address": 11126, "address_mask_identifier": "F_4E_PLT_THROTTLE_IGNITION_R_AM", "address_mask_shift_identifier": "F_4E_PLT_THROTTLE_IGNITION_R", "description": "selector position", - "mask": 32768, + "mask": 32, "max_value": 1, - "shift_by": 15, + "shift_by": 5, "suffix": "", "type": "integer" } ] @@ -4516,9 +4551,9 @@ "address": 11126, "address_mask_shift_identifier": "F_4E_PLT_THROTTLE_MIC", "description": "switch position -- 0 = Down, 1 = Mid, 2 = Up", - "mask": 12, + "mask": 768, "max_value": 2, - "shift_by": 2, + "shift_by": 8, "suffix": "", "type": "integer" } ] @@ -4537,9 +4572,9 @@ "address": 11126, "address_mask_shift_identifier": "F_4E_PLT_THROTTLE_SPEED_BRAKE", "description": "switch position -- 0 = Down, 1 = Mid, 2 = Up", - "mask": 3, + "mask": 192, "max_value": 2, - "shift_by": 0, + "shift_by": 6, "suffix": "", "type": "integer" } ] @@ -5301,13 +5336,13 @@ "interface": "action" } ], "outputs": [ { - "address": 11034, + "address": 11026, "address_mask_identifier": "F_4E_PLT_MASTER_ARM_SW_AM", "address_mask_shift_identifier": "F_4E_PLT_MASTER_ARM_SW", "description": "selector position", - "mask": 128, + "mask": 8192, "max_value": 1, - "shift_by": 7, + "shift_by": 13, "suffix": "", "type": "integer" } ] @@ -6306,6 +6341,24 @@ } }, "WSO Control Surfaces": { + "WSO_CONTROLS_FLAPS_INDICATOR": { + "category": "WSO Control Surfaces", + "control_type": "metadata", + "description": "Flaps Indicator", + "identifier": "WSO_CONTROLS_FLAPS_INDICATOR", + "inputs": [ ], + "outputs": [ { + "address": 10980, + "address_mask_identifier": "F_4E_WSO_CONTROLS_FLAPS_INDICATOR_AM", + "address_mask_shift_identifier": "F_4E_WSO_CONTROLS_FLAPS_INDICATOR", + "description": "Flaps Indicator", + "mask": 4096, + "max_value": 1, + "shift_by": 12, + "suffix": "", + "type": "integer" + } ] + }, "WSO_CONTROLS_FLAPS_SLATS_EMERGENCY": { "category": "WSO Control Surfaces", "control_type": "limited_dial", @@ -6356,6 +6409,23 @@ "suffix": "_KNOB_POS", "type": "integer" } ] + }, + "WSO_CONTROLS_SLATS_INDICATOR": { + "category": "WSO Control Surfaces", + "control_type": "metadata", + "description": "Slats Indicator", + "identifier": "WSO_CONTROLS_SLATS_INDICATOR", + "inputs": [ ], + "outputs": [ { + "address": 10980, + "address_mask_shift_identifier": "F_4E_WSO_CONTROLS_SLATS_INDICATOR", + "description": "Slats Indicator", + "mask": 24576, + "max_value": 2, + "shift_by": 13, + "suffix": "", + "type": "integer" + } ] } }, "WSO Countermeasures Panel": { @@ -6961,13 +7031,13 @@ "identifier": "WSO_IFF_CHALLENGE_LIGHT", "inputs": [ ], "outputs": [ { - "address": 11074, + "address": 11096, "address_mask_identifier": "F_4E_WSO_IFF_CHALLENGE_LIGHT_AM", "address_mask_shift_identifier": "F_4E_WSO_IFF_CHALLENGE_LIGHT", "description": "0 if light is off, 1 if light is on", - "mask": 8192, + "mask": 2048, "max_value": 1, - "shift_by": 13, + "shift_by": 11, "suffix": "", "type": "integer" } ] @@ -6991,13 +7061,13 @@ "interface": "action" } ], "outputs": [ { - "address": 11074, + "address": 11096, "address_mask_identifier": "F_4E_WSO_IFF_CHALLENGE_TEST_BUTTON_AM", "address_mask_shift_identifier": "F_4E_WSO_IFF_CHALLENGE_TEST_BUTTON", "description": "selector position", - "mask": 4096, + "mask": 1024, "max_value": 1, - "shift_by": 12, + "shift_by": 10, "suffix": "", "type": "integer" } ] @@ -7024,12 +7094,12 @@ "identifier": "WSO_IFF_CODE_HUNDREDS", "inputs": [ ], "outputs": [ { - "address": 11066, + "address": 11070, "address_mask_shift_identifier": "F_4E_WSO_IFF_CODE_HUNDREDS", "description": "IFF Code (hundreds)", - "mask": 61440, + "mask": 3840, "max_value": 8, - "shift_by": 12, + "shift_by": 8, "suffix": "", "type": "integer" } ] @@ -7053,13 +7123,13 @@ "interface": "action" } ], "outputs": [ { - "address": 11070, + "address": 11074, "address_mask_identifier": "F_4E_WSO_IFF_CODE_INC_HUNDREDS_AM", "address_mask_shift_identifier": "F_4E_WSO_IFF_CODE_INC_HUNDREDS", "description": "selector position", - "mask": 4096, + "mask": 1024, "max_value": 1, - "shift_by": 12, + "shift_by": 10, "suffix": "", "type": "integer" } ] @@ -7083,13 +7153,13 @@ "interface": "action" } ], "outputs": [ { - "address": 11070, + "address": 11074, "address_mask_identifier": "F_4E_WSO_IFF_CODE_INC_ONES_AM", "address_mask_shift_identifier": "F_4E_WSO_IFF_CODE_INC_ONES", "description": "selector position", - "mask": 16384, + "mask": 4096, "max_value": 1, - "shift_by": 14, + "shift_by": 12, "suffix": "", "type": "integer" } ] @@ -7113,13 +7183,13 @@ "interface": "action" } ], "outputs": [ { - "address": 11070, + "address": 11074, "address_mask_identifier": "F_4E_WSO_IFF_CODE_INC_TENS_AM", "address_mask_shift_identifier": "F_4E_WSO_IFF_CODE_INC_TENS", "description": "selector position", - "mask": 8192, + "mask": 2048, "max_value": 1, - "shift_by": 13, + "shift_by": 11, "suffix": "", "type": "integer" } ] @@ -7143,13 +7213,13 @@ "interface": "action" } ], "outputs": [ { - "address": 11062, + "address": 11074, "address_mask_identifier": "F_4E_WSO_IFF_CODE_INC_THOUSANDS_AM", "address_mask_shift_identifier": "F_4E_WSO_IFF_CODE_INC_THOUSANDS", "description": "selector position", - "mask": 32768, + "mask": 512, "max_value": 1, - "shift_by": 15, + "shift_by": 9, "suffix": "", "type": "integer" } ] @@ -7161,12 +7231,12 @@ "identifier": "WSO_IFF_CODE_ONES", "inputs": [ ], "outputs": [ { - "address": 11062, + "address": 11066, "address_mask_shift_identifier": "F_4E_WSO_IFF_CODE_ONES", "description": "IFF Code (ones)", - "mask": 15360, + "mask": 3840, "max_value": 8, - "shift_by": 10, + "shift_by": 8, "suffix": "", "type": "integer" } ] @@ -7181,9 +7251,9 @@ "address": 11066, "address_mask_shift_identifier": "F_4E_WSO_IFF_CODE_TENS", "description": "IFF Code (tens)", - "mask": 3840, + "mask": 61440, "max_value": 8, - "shift_by": 8, + "shift_by": 12, "suffix": "", "type": "integer" } ] @@ -7198,9 +7268,9 @@ "address": 11070, "address_mask_shift_identifier": "F_4E_WSO_IFF_CODE_THOUSANDS", "description": "IFF Code (thousands)", - "mask": 3840, + "mask": 61440, "max_value": 8, - "shift_by": 8, + "shift_by": 12, "suffix": "", "type": "integer" } ] @@ -7255,9 +7325,9 @@ "address_mask_identifier": "F_4E_WSO_IFF_COMBAT_TREE_CHALLENGE_TEST_BUTTON_AM", "address_mask_shift_identifier": "F_4E_WSO_IFF_COMBAT_TREE_CHALLENGE_TEST_BUTTON", "description": "selector position", - "mask": 512, + "mask": 32768, "max_value": 1, - "shift_by": 9, + "shift_by": 15, "suffix": "", "type": "integer" } ] @@ -7269,13 +7339,13 @@ "identifier": "WSO_IFF_COMBAT_TREE_CHALLENGE_TEST_LIGHT", "inputs": [ ], "outputs": [ { - "address": 11096, + "address": 11102, "address_mask_identifier": "F_4E_WSO_IFF_COMBAT_TREE_CHALLENGE_TEST_LIGHT_AM", "address_mask_shift_identifier": "F_4E_WSO_IFF_COMBAT_TREE_CHALLENGE_TEST_LIGHT", "description": "0 if light is off, 1 if light is on", - "mask": 1024, + "mask": 1, "max_value": 1, - "shift_by": 10, + "shift_by": 0, "suffix": "", "type": "integer" } ] @@ -7294,12 +7364,12 @@ "max_value": 2 } ], "outputs": [ { - "address": 11096, + "address": 11102, "address_mask_shift_identifier": "F_4E_WSO_IFF_COMBAT_TREE_MODE_2", "description": "selector position", - "mask": 12288, + "mask": 12, "max_value": 2, - "shift_by": 12, + "shift_by": 2, "suffix": "", "type": "integer" } ] @@ -7318,12 +7388,12 @@ "max_value": 2 } ], "outputs": [ { - "address": 11096, + "address": 11102, "address_mask_shift_identifier": "F_4E_WSO_IFF_COMBAT_TREE_MODE_3", "description": "selector position", - "mask": 49152, + "mask": 48, "max_value": 2, - "shift_by": 14, + "shift_by": 4, "suffix": "", "type": "integer" } ] @@ -7347,13 +7417,13 @@ "interface": "action" } ], "outputs": [ { - "address": 11096, + "address": 11102, "address_mask_identifier": "F_4E_WSO_IFF_COMBAT_TREE_TEST_AM", "address_mask_shift_identifier": "F_4E_WSO_IFF_COMBAT_TREE_TEST", "description": "selector position", - "mask": 2048, + "mask": 2, "max_value": 1, - "shift_by": 11, + "shift_by": 1, "suffix": "", "type": "integer" } ] @@ -7392,13 +7462,13 @@ "interface": "action" } ], "outputs": [ { - "address": 11070, + "address": 11074, "address_mask_identifier": "F_4E_WSO_IFF_MODE_DEC_AM", "address_mask_shift_identifier": "F_4E_WSO_IFF_MODE_DEC", "description": "selector position", - "mask": 32768, + "mask": 8192, "max_value": 1, - "shift_by": 15, + "shift_by": 13, "suffix": "", "type": "integer" } ] @@ -7426,9 +7496,9 @@ "address_mask_identifier": "F_4E_WSO_IFF_MODE_DEC_HUNDREDS_AM", "address_mask_shift_identifier": "F_4E_WSO_IFF_MODE_DEC_HUNDREDS", "description": "selector position", - "mask": 512, + "mask": 32768, "max_value": 1, - "shift_by": 9, + "shift_by": 15, "suffix": "", "type": "integer" } ] @@ -7452,13 +7522,13 @@ "interface": "action" } ], "outputs": [ { - "address": 11074, + "address": 11096, "address_mask_identifier": "F_4E_WSO_IFF_MODE_DEC_ONES_AM", "address_mask_shift_identifier": "F_4E_WSO_IFF_MODE_DEC_ONES", "description": "selector position", - "mask": 2048, + "mask": 512, "max_value": 1, - "shift_by": 11, + "shift_by": 9, "suffix": "", "type": "integer" } ] @@ -7482,13 +7552,13 @@ "interface": "action" } ], "outputs": [ { - "address": 11074, + "address": 11096, "address_mask_identifier": "F_4E_WSO_IFF_MODE_DEC_TENS_AM", "address_mask_shift_identifier": "F_4E_WSO_IFF_MODE_DEC_TENS", "description": "selector position", - "mask": 1024, + "mask": 256, "max_value": 1, - "shift_by": 10, + "shift_by": 8, "suffix": "", "type": "integer" } ] @@ -7516,9 +7586,9 @@ "address_mask_identifier": "F_4E_WSO_IFF_MODE_DEC_THOUSANDS_AM", "address_mask_shift_identifier": "F_4E_WSO_IFF_MODE_DEC_THOUSANDS", "description": "selector position", - "mask": 256, + "mask": 16384, "max_value": 1, - "shift_by": 8, + "shift_by": 14, "suffix": "", "type": "integer" } ] @@ -7542,13 +7612,13 @@ "interface": "action" } ], "outputs": [ { - "address": 11062, + "address": 11074, "address_mask_identifier": "F_4E_WSO_IFF_MODE_INC_AM", "address_mask_shift_identifier": "F_4E_WSO_IFF_MODE_INC", "description": "selector position", - "mask": 16384, + "mask": 256, "max_value": 1, - "shift_by": 14, + "shift_by": 8, "suffix": "", "type": "integer" } ] @@ -7564,12 +7634,12 @@ "max_value": 2 } ], "outputs": [ { - "address": 11074, + "address": 11096, "address_mask_shift_identifier": "F_4E_WSO_IFF_TEST_CHALLENGE", "description": "switch position -- 0 = Down, 1 = Mid, 2 = Up", - "mask": 49152, + "mask": 12288, "max_value": 2, - "shift_by": 14, + "shift_by": 12, "suffix": "", "type": "integer" } ] @@ -8634,13 +8704,13 @@ "interface": "action" } ], "outputs": [ { - "address": 11034, + "address": 11026, "address_mask_identifier": "F_4E_WSO_O2_MIXTURE_AM", "address_mask_shift_identifier": "F_4E_WSO_O2_MIXTURE", "description": "selector position", - "mask": 1, + "mask": 64, "max_value": 1, - "shift_by": 0, + "shift_by": 6, "suffix": "", "type": "integer" } ] @@ -8656,12 +8726,12 @@ "max_value": 2 } ], "outputs": [ { - "address": 10980, + "address": 11026, "address_mask_shift_identifier": "F_4E_WSO_O2_MODE", "description": "switch position -- 0 = Down, 1 = Mid, 2 = Up", - "mask": 49152, + "mask": 48, "max_value": 2, - "shift_by": 14, + "shift_by": 4, "suffix": "", "type": "integer" } ] @@ -8702,13 +8772,13 @@ "interface": "action" } ], "outputs": [ { - "address": 11034, + "address": 11026, "address_mask_identifier": "F_4E_WSO_O2_SUPPLY_AM", "address_mask_shift_identifier": "F_4E_WSO_O2_SUPPLY", "description": "selector position", - "mask": 2, + "mask": 128, "max_value": 1, - "shift_by": 1, + "shift_by": 7, "suffix": "", "type": "integer" } ] @@ -8734,13 +8804,13 @@ "interface": "action" } ], "outputs": [ { - "address": 11102, + "address": 11126, "address_mask_identifier": "F_4E_WSO_AFCS_EMERGENCY_RELEASE_AM", "address_mask_shift_identifier": "F_4E_WSO_AFCS_EMERGENCY_RELEASE", "description": "selector position", - "mask": 8192, + "mask": 8, "max_value": 1, - "shift_by": 13, + "shift_by": 3, "suffix": "", "type": "integer" } ] @@ -8764,13 +8834,13 @@ "interface": "action" } ], "outputs": [ { - "address": 11102, + "address": 11126, "address_mask_identifier": "F_4E_WSO_GEAR_NWS_AM", "address_mask_shift_identifier": "F_4E_WSO_GEAR_NWS", "description": "selector position", - "mask": 4096, + "mask": 4, "max_value": 1, - "shift_by": 12, + "shift_by": 2, "suffix": "", "type": "integer" } ] @@ -8788,12 +8858,12 @@ "max_value": 2 } ], "outputs": [ { - "address": 11126, + "address": 11128, "address_mask_shift_identifier": "F_4E_WSO_THROTTLE_MIC", "description": "switch position -- 0 = Down, 1 = Mid, 2 = Up", - "mask": 1536, + "mask": 3, "max_value": 2, - "shift_by": 9, + "shift_by": 0, "suffix": "", "type": "integer" } ] @@ -8812,9 +8882,9 @@ "address": 11126, "address_mask_shift_identifier": "F_4E_WSO_THROTTLE_SPEED_BRAKE", "description": "switch position -- 0 = Down, 1 = Mid, 2 = Up", - "mask": 384, + "mask": 24576, "max_value": 2, - "shift_by": 7, + "shift_by": 13, "suffix": "", "type": "integer" } ] @@ -8877,12 +8947,12 @@ "max_value": 5 } ], "outputs": [ { - "address": 11034, + "address": 11026, "address_mask_shift_identifier": "F_4E_WSO_WRCS_BIT_MODE", "description": "selector position", - "mask": 28, + "mask": 1792, "max_value": 5, - "shift_by": 2, + "shift_by": 8, "suffix": "", "type": "integer" } ] @@ -9031,13 +9101,13 @@ "interface": "action" } ], "outputs": [ { - "address": 11034, + "address": 11026, "address_mask_identifier": "F_4E_WSO_WRCS_RANGE_MULTIPLIER_AM", "address_mask_shift_identifier": "F_4E_WSO_WRCS_RANGE_MULTIPLIER", "description": "selector position", - "mask": 64, + "mask": 4096, "max_value": 1, - "shift_by": 6, + "shift_by": 12, "suffix": "", "type": "integer" } ] @@ -9144,13 +9214,13 @@ "interface": "action" } ], "outputs": [ { - "address": 11034, + "address": 11026, "address_mask_identifier": "F_4E_WSO_WRCS_TARGET_FIND_MODE_AM", "address_mask_shift_identifier": "F_4E_WSO_WRCS_TARGET_FIND_MODE", "description": "selector position", - "mask": 32, + "mask": 2048, "max_value": 1, - "shift_by": 5, + "shift_by": 11, "suffix": "", "type": "integer" } ] diff --git a/Scripts/DCS-BIOS/lib/modules/aircraft_modules/F-4E.lua b/Scripts/DCS-BIOS/lib/modules/aircraft_modules/F-4E.lua index 61a2f30a9..f8299c09b 100644 --- a/Scripts/DCS-BIOS/lib/modules/aircraft_modules/F-4E.lua +++ b/Scripts/DCS-BIOS/lib/modules/aircraft_modules/F-4E.lua @@ -52,6 +52,17 @@ function F_4E:defineFloatFromArg(identifier, arg_number, category, description) self:defineFloat(identifier, arg_number, { 0, 1 }, category, description) end +--- Defines a 0-max_value output from a 0-1 input +--- @param identifier string the unique identifier for the control +--- @param arg_number integer the dcs argument number +--- @param category string the category in which the control should appear +--- @param description string additional information about the control +function F_4E:defineIntegerFromArg(identifier, arg_number, max_value, category, description) + self:defineIntegerFromGetter(identifier, function(dev0) + return Module.round(dev0:get_argument_value(arg_number) * max_value) + end, max_value, category, description) +end + -- helper functions --- Returns an integer value for a drum-based numeric indicator @@ -588,21 +599,9 @@ F_4E:defineToggleSwitch("PLT_GEAR_DRAG_CHUTE", LANDING_GEAR_DEVICE_ID, 3009, 276 F_4E:defineToggleSwitch("PLT_GEAR_DRAG_CHUTE_RELEASE", LANDING_GEAR_DEVICE_ID, 3010, 1516, PILOT_LANDING_GEAR, "Release Drag-Parachute (only while deployed)") F_4E:defineToggleSwitch("PLT_GEAR_ARRESTING_HOOK", LANDING_GEAR_DEVICE_ID, 3021, 974, PILOT_LANDING_GEAR, "Arresting Hook Handle") -local function gear_indicator_value(dev0, arg_number) - return Module.round(dev0:get_argument_value(arg_number) / 0.5) -end - -F_4E:defineIntegerFromGetter("PLT_GEAR_INDICATOR_LEFT", function(dev0) - return gear_indicator_value(dev0, 52) -end, 2, PILOT_LANDING_GEAR, "Landing Gear Up/Down Indicator (Left)") - -F_4E:defineIntegerFromGetter("PLT_GEAR_INDICATOR_NOSE", function(dev0) - return gear_indicator_value(dev0, 51) -end, 2, PILOT_LANDING_GEAR, "Landing Gear Up/Down Indicator (Nose)") - -F_4E:defineIntegerFromGetter("PLT_GEAR_INDICATOR_RIGHT", function(dev0) - return gear_indicator_value(dev0, 50) -end, 2, PILOT_LANDING_GEAR, "Landing Gear Up/Down Indicator (Right)") +F_4E:defineIntegerFromArg("PLT_GEAR_INDICATOR_LEFT", 52, 2, PILOT_LANDING_GEAR, "Landing Gear Up/Down Indicator (Left)") +F_4E:defineIntegerFromArg("PLT_GEAR_INDICATOR_NOSE", 51, 2, PILOT_LANDING_GEAR, "Landing Gear Up/Down Indicator (Nose)") +F_4E:defineIntegerFromArg("PLT_GEAR_INDICATOR_RIGHT", 50, 2, PILOT_LANDING_GEAR, "Landing Gear Up/Down Indicator (Right)") -- WSO Landing Gear Controls local WSO_LANDING_GEAR = "WSO Landing Gear Controls" @@ -610,17 +609,9 @@ local WSO_LANDING_GEAR = "WSO Landing Gear Controls" F_4E:definePotentiometer("WSO_GEAR_HANDLE_EMERGENCY", LANDING_GEAR_DEVICE_ID, 3008, 983, { 0, 1 }, WSO_LANDING_GEAR, "Emergency Gear Handle (Pull to Release)") F_4E:definePotentiometer("WSO_GEAR_BRAKES_EMERGENCY", LANDING_GEAR_DEVICE_ID, 3005, 344, { 0, 1 }, WSO_LANDING_GEAR, "Emergency Wheel Brake (Pull)") -F_4E:defineIntegerFromGetter("WSO_GEAR_INDICATOR_LEFT", function(dev0) - return gear_indicator_value(dev0, 984) -end, 2, WSO_LANDING_GEAR, "Landing Gear Up/Down Indicator (Left)") - -F_4E:defineIntegerFromGetter("WSO_GEAR_INDICATOR_NOSE", function(dev0) - return gear_indicator_value(dev0, 986) -end, 2, WSO_LANDING_GEAR, "Landing Gear Up/Down Indicator (Nose)") - -F_4E:defineIntegerFromGetter("WSO_GEAR_INDICATOR_RIGHT", function(dev0) - return gear_indicator_value(dev0, 988) -end, 2, WSO_LANDING_GEAR, "Landing Gear Up/Down Indicator (Right)") +F_4E:defineIntegerFromArg("WSO_GEAR_INDICATOR_LEFT", 984, 2, WSO_LANDING_GEAR, "Landing Gear Up/Down Indicator (Left)") +F_4E:defineIntegerFromArg("WSO_GEAR_INDICATOR_NOSE", 986, 2, WSO_LANDING_GEAR, "Landing Gear Up/Down Indicator (Nose)") +F_4E:defineIntegerFromArg("WSO_GEAR_INDICATOR_RIGHT", 988, 2, WSO_LANDING_GEAR, "Landing Gear Up/Down Indicator (Right)") -- Indicators local INDICATORS_DEVICE_ID = 22 @@ -761,12 +752,18 @@ F_4E:defineToggleSwitch("PLT_CONTROLS_SLATS_OVERRIDE_COVER", CONTROL_SURFACES_DE F_4E:defineToggleSwitch("PLT_CONTROLS_SLATS_OVERRIDE", CONTROL_SURFACES_DEVICE_ID, 3010, 2519, PILOT_CONTROL_SURFACES, "Slats Override Switch") F_4E:defineRotary("PLT_CONTROLS_PEDAL_ADJUST", CONTROL_SURFACES_DEVICE_ID, 3017, 2595, PILOT_CONTROL_SURFACES, "Adjust Pedal Position") +F_4E:defineIntegerFromArg("PLT_CONTROLS_FLAPS_INDICATOR", 226, 1, PILOT_CONTROL_SURFACES, "Flaps Indicator") +F_4E:defineIntegerFromArg("PLT_CONTROLS_SLATS_INDICATOR", 225, 2, PILOT_CONTROL_SURFACES, "Slats Indicator") + -- WSO Control Surfaces local WSO_CONTROL_SURFACES = "WSO Control Surfaces" F_4E:definePotentiometer("WSO_CONTROLS_FLAPS_SLATS_EMERGENCY", CONTROL_SURFACES_DEVICE_ID, 3004, 224, { 0, 1 }, WSO_CONTROL_SURFACES, "Flaps/Slats Emergency") F_4E:defineRotary("WSO_CONTROLS_PEDAL_ADJUST", CONTROL_SURFACES_DEVICE_ID, 3018, 2813, WSO_CONTROL_SURFACES, "Adjust Pedal Position") +F_4E:defineIntegerFromArg("WSO_CONTROLS_FLAPS_INDICATOR", 228, 1, WSO_CONTROL_SURFACES, "Flaps Indicator") +F_4E:defineIntegerFromArg("WSO_CONTROLS_SLATS_INDICATOR", 227, 2, WSO_CONTROL_SURFACES, "Slats Indicator") + -- Oxygen System local OXYGEN_SYSTEM_DEVICE_ID = 26