Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(a380x): Various fixes pt.2: MFD, pitch trim switch, EFIS sync for LS button #8926

Merged
merged 15 commits into from
Sep 18, 2024
Merged

fix(a380x): Various fixes pt.2: MFD, pitch trim switch, EFIS sync for LS button #8926

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e5cb22b
check for valid xpdr code in MFD SURV
flogross89 Sep 15, 2024
1e87657
fix ILS back course on POSITION/NAVAID
flogross89 Sep 15, 2024
bc1258d
systems-host: enable lint (no functional changes)
flogross89 Sep 15, 2024
1016e5b
disable back course
flogross89 Sep 15, 2024
8b2b127
fix deselect navaid
flogross89 Sep 15, 2024
39fb568
add PITCH TRIM switch
flogross89 Sep 15, 2024
1ef1218
fix LS EFIS sync
flogross89 Sep 15, 2024
61bdd1d
remove debug messages
flogross89 Sep 16, 2024
3532c02
Revert "systems-host: enable lint (no functional changes)"
flogross89 Sep 16, 2024
b765815
Merge branch 'master' into fix-a380x-various2
flogross89 Sep 16, 2024
089171e
Update fbw-a380x/src/systems/instruments/src/MFD/pages/FMS/POSITION/M…
flogross89 Sep 17, 2024
b973f88
don't use min/max for squawk code
flogross89 Sep 17, 2024
837179a
pass only positive courses to MMR
flogross89 Sep 17, 2024
59ea77f
Merge branch 'master' into fix-a380x-various2
flogross89 Sep 17, 2024
5d4876e
Merge branch 'master' into fix-a380x-various2
flogross89 Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add PITCH TRIM switch
  • Loading branch information
@flogross89
flogross89 committed Sep 15, 2024
commit 39fb568ff9ace1ef05374f9c2674c54823da920a
62 changes: 20 additions & 42 deletions ...lybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/A380_COCKPIT.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,12 +516,6 @@
<EMISSIVE_CODE>(L:A32NX_ELEC_AC_1_BUS_IS_POWERED, Bool)</EMISSIVE_CODE>
</UseTemplate>

<UseTemplate Name="ASOBO_LIGHTING_Panel_Emissive_Template">
<NODE_ID>LEVER_ELEVATORTRIM_DECAL</NODE_ID>
<POTENTIOMETER>85</POTENTIOMETER>
<EMISSIVE_CODE>(L:A32NX_ELEC_AC_1_BUS_IS_POWERED, Bool)</EMISSIVE_CODE>
</UseTemplate>

<UseTemplate Name="ASOBO_LIGHTING_Panel_Emissive_Template">
<NODE_ID>pedestal_cables</NODE_ID>
<POTENTIOMETER>85</POTENTIOMETER>
Expand Down Expand Up @@ -901,38 +895,16 @@
<NODE_ID>PUSH_THROTTLE_2</NODE_ID>
</UseTemplate>

<UseTemplate Name="FBW_HANDLING_Wheel_ElevatorTrim_Template">
<ANIM_NAME>lever_trimtab_elevator_key_pct</ANIM_NAME>
<NODE_ID>LEVER_ELEVATORTRIM_1</NODE_ID>
<NODE_ID2>LEVER_ELEVATORTRIM_2</NODE_ID2>
<REPEAT_ANIM>5</REPEAT_ANIM>
<DRAG_AXIS_SCALE>20</DRAG_AXIS_SCALE>
<DRAG_MIN_VALUE>-4854</DRAG_MIN_VALUE> <!-- Limit to -4.5 deg -->
</UseTemplate>

<UseTemplate Name="ASOBO_HANDLING_Indicator_ElevatorTrim_Template">
<ANIM_NAME>LEVER_ELEVATORTRIM_DECAL</ANIM_NAME>
<MIN_DISPLAYABLE>-4</MIN_DISPLAYABLE>
<MAX_DISPLAYABLE>13.5</MAX_DISPLAYABLE>
<REF_VALUE_0>-4</REF_VALUE_0>
<ANIM_VALUE_0>0</ANIM_VALUE_0>
<REF_VALUE_1>13</REF_VALUE_1>
<ANIM_VALUE_1>94</ANIM_VALUE_1>
<REF_VALUE_2>13.5</REF_VALUE_2>
<ANIM_VALUE_2>100</ANIM_VALUE_2>
<MAX_POINT_INDEX>2</MAX_POINT_INDEX>
</UseTemplate>

<UseTemplate Name="ASOBO_GT_Component_Emissive_Gauge">
<NODE_ID>DECAL_THROTTLE_01</NODE_ID>
<POTENTIOMETER>85</POTENTIOMETER>
<EMISSIVE_CODE>(L:A32NX_ELEC_AC_1_BUS_IS_POWERED, Bool)</EMISSIVE_CODE>
<EMISSIVE_CODE>(L:A32NX_ELEC_DC_1_BUS_IS_POWERED, Bool)</EMISSIVE_CODE>
</UseTemplate>

<UseTemplate Name="ASOBO_GT_Component_Emissive_Gauge">
<NODE_ID>DECAL_THROTTLE_02</NODE_ID>
<POTENTIOMETER>85</POTENTIOMETER>
<EMISSIVE_CODE>(L:A32NX_ELEC_AC_1_BUS_IS_POWERED, Bool)</EMISSIVE_CODE>
<EMISSIVE_CODE>(L:A32NX_ELEC_DC_1_BUS_IS_POWERED, Bool)</EMISSIVE_CODE>
</UseTemplate>

<CameraTitle>PedestalFwd</CameraTitle>
Expand Down Expand Up @@ -1038,8 +1010,8 @@
<AIRBUS_TYPE />
<ANIM_NAME>KNOB_RUDDERTRIM</ANIM_NAME>
<NODE_ID>KNOB_RUDDERTRIM</NODE_ID>
<RESET_PUSH_ANIM_NAME>PUSH_RUDDERTRIM_RESET</RESET_PUSH_ANIM_NAME>
<RESET_PUSH_NODE_ID>PUSH_RUDDERTRIM_RESET</RESET_PUSH_NODE_ID>
<RESET_PUSH_ANIM_NAME>PUSH_TRIM_RESET</RESET_PUSH_ANIM_NAME>
<RESET_PUSH_NODE_ID>PUSH_TRIM_RESET</RESET_PUSH_NODE_ID>
</UseTemplate>

<UseTemplate Name="FBW_HANDLING_Lever_With_Button_Flaps_Template">
Expand Down Expand Up @@ -1084,6 +1056,12 @@
<TYPE>AIRLINER</TYPE>
<TOOLTIPID>TT:COCKPIT.TOOLTIPS.SPEEDBRAKE_LEVER</TOOLTIPID>
</UseTemplate>

<UseTemplate Name="A380X_SWITCH_PITCH_TRIM">
<NODE_ID>SWITCH_TRIM_PITCH</NODE_ID>
<ANIM_NAME>SWITCH_TRIM_PITCH</ANIM_NAME>
<INVERT_ANIM>1</INVERT_ANIM>
</UseTemplate>
</Component>

<Component ID="WeatherRadar">
Expand Down Expand Up @@ -4545,12 +4523,12 @@

<Component ID="Right_Pedestal_Misc">
<UseTemplate Name="FBW_Push_Held">
<NODE_ID>PUSH_PANELCS_AIDS</NODE_ID>
<HOLD_SIMVAR>L:A32NX_AIDS_PRINT_ON</HOLD_SIMVAR>
<TOOLTIP>Print data</TOOLTIP>
<NODE_ID>PUSH_ACMS_TRIGGER</NODE_ID>
<HOLD_SIMVAR>L:A32NX_ACMS_TRIGGER_ON</HOLD_SIMVAR>
<TOOLTIP>ACMS trigger (Inop.)</TOOLTIP>
</UseTemplate>
<UseTemplate Name="FBW_Push_Held">
<NODE_ID>PUSH_PANELCS_DFDR</NODE_ID>
<NODE_ID>PUSH_DFDR_EVENT</NODE_ID>
<HOLD_SIMVAR>L:A32NX_DFDR_EVENT_ON</HOLD_SIMVAR>
<TOOLTIP>Print data (Inop.)</TOOLTIP>
</UseTemplate>
Expand Down Expand Up @@ -5181,15 +5159,15 @@

<Component ID="DOOR_PANEL">
<UseTemplate Name="A32NX_SWITCH_DOORPANEL_LOCK">
<NODE_ID>SWITCH_DOORPANEL_LOCK</NODE_ID>
<ANIM_NAME>SWITCH_DOORPANEL_LOCK</ANIM_NAME>
<NODE_ID>LOCK_DOOR_LCKG_SYS</NODE_ID>
<ANIM_NAME>LOCK_DOOR_LCKG_SYS</ANIM_NAME>
<INVERT_ANIM>1</INVERT_ANIM>
</UseTemplate>
<UseTemplate Name="A32NX_PUSH_DOORPANEL_OPEN">
<NODE_ID>PUSH_DOORPANEL_OPEN</NODE_ID>
<ANIM_NAME>PUSH_DOORPANEL_OPEN</ANIM_NAME>
<SEQ1_POWERED>(L:A32NX_ELEC_AC_2_BUS_IS_POWERED, Bool)</SEQ1_POWERED>
<SEQ2_POWERED>(L:A32NX_ELEC_AC_2_BUS_IS_POWERED, Bool)</SEQ2_POWERED>
<NODE_ID>PUSH_DOOR_LCKG_SYS</NODE_ID>
<ANIM_NAME>PUSH_DOOR_LCKG_SYS</ANIM_NAME>
<SEQ1_POWERED>(L:A32NX_ELEC_DC_1_BUS_IS_POWERED, Bool)</SEQ1_POWERED>
<SEQ2_POWERED>(L:A32NX_ELEC_DC_1_BUS_IS_POWERED, Bool)</SEQ2_POWERED>
</UseTemplate>
</Component>

Expand Down
17 changes: 17 additions & 0 deletions ...-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/behaviour/pedestal/pedestal-inputs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,21 @@
</Extend>
</Presets>
</InputEvent>

<Template Name="A380X_SWITCH_PITCH_TRIM">
<Component ID="#NODE_ID#" Node="#NODE_ID#">
<UseTemplate Name="ASOBO_GT_Switch_3States">
<ANIM_NAME>#NODE_ID#</ANIM_NAME>
<PART_ID>#NODE_ID#</PART_ID>
<SWITCH_DIRECTION>Vertical</SWITCH_DIRECTION>
<WWISE_EVENT>clds</WWISE_EVENT>
<CODE_POS_0>(&gt;K:ELEV_TRIM_DN)</CODE_POS_0>
<CODE_POS_2>(&gt;K:ELEV_TRIM_UP)</CODE_POS_2>
<STATE_MAX_TIMER>0.01</STATE_MAX_TIMER>
<STATE0_TIMER>0.01</STATE0_TIMER>
<MOMENTARY_SWITCH>True</MOMENTARY_SWITCH>
<MOMENTARY_REPEAT_FREQUENCY>75</MOMENTARY_REPEAT_FREQUENCY>
</UseTemplate>
</Component>
</Template>
</ModelBehaviors>