fly/A320-family
1
0
Fork 0
Code Activity

Control: Fix flybywire law over 33 degrees bank, FMGC: Fix a/thr disengage logic interaction with alpha floor

Browse source
This commit is contained in:
Josh Davidson 2021-10-05 14:46:59 -04:00
parent 410eb597ec
commit 5018465a11
8 changed files with 46 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
A320-200-CFM-set.xml
View file

@ -24,7 +24,7 @@
<path>Aircraft/A320-family/Sounds/cfm56-sound.xml</path>
</sound>
<chase-distance-m type="double" archive="y">-60.0</chase-distance-m>
<chase-distance-m type="double" archive="y">-80</chase-distance-m>
<view n="0">
<name>Captain View</name>
<internal archive="y">true</internal>

2
A320-200-IAE-set.xml
View file

@ -24,7 +24,7 @@
<path>Aircraft/A320-family/Sounds/v2500-sound.xml</path>
</sound>
<chase-distance-m type="double" archive="y">-60.0</chase-distance-m>
<chase-distance-m type="double" archive="y">-80</chase-distance-m>
<view n="0">
<name>Captain View</name>
<internal archive="y">true</internal>

6
A320-main.xml
View file

@ -586,9 +586,9 @@
<gui n="0" include="gui/it-gui.xml"/>
<current-view>
<z-offset-default type="float">60.0</z-offset-default>
<z-offset-min-m type="float">10.0</z-offset-min-m>
<z-offset-max-m type="float">300.0</z-offset-max-m>
<z-offset-default type="float">80</z-offset-default>
<z-offset-min-m type="float">10</z-offset-min-m>
<z-offset-max-m type="float">300</z-offset-max-m>
</current-view>
<minimum-fg-version>2020.3.1</minimum-fg-version>

2
A320neo-CFM-set.xml
View file

@ -24,7 +24,7 @@
<path>Aircraft/A320-family/Sounds/leapx-sound.xml</path>
</sound>
<chase-distance-m type="double" archive="y">-60.0</chase-distance-m>
<chase-distance-m type="double" archive="y">-80</chase-distance-m>
<view n="0">
<name>Captain View</name>
<internal archive="y">true</internal>

2
A320neo-PW-set.xml
View file

@ -24,7 +24,7 @@
<path>Aircraft/A320-family/Sounds/leapx-sound.xml</path>
</sound>
<chase-distance-m type="double" archive="y">-60.0</chase-distance-m>
<chase-distance-m type="double" archive="y">-80</chase-distance-m>
<view n="0">
<name>Captain View</name>
<internal archive="y">true</internal>

2
Nasal/FMGC/FCU.nas
View file

@ -532,7 +532,7 @@ var apOff = func(type, side) {
# Autothrust Disconnection
var athrOff = func(type) {
if (fmgc.Input.athr.getValue() == 1) {
if (fmgc.Input.athr.getValue() == 1 and !systems.FADEC.alphaFloor.getBoolValue()) {
if (type == "hard") {
systems.lockThr();
}

12
Nasal/Libraries/buttons.nas
View file

@ -162,4 +162,14 @@ var toggleSTD = func() {
pts.Instrumentation.Altimeter.settingInhg.setValue(29.92);
pts.Instrumentation.Altimeter.std.setBoolValue(1);
}
}
}
# Commonality
var apPanel = {
apDisc: func() {
fcu.FCUController.APDisc();
},
atDisc: func() {
fcu.FCUController.ATDisc();
},
};

29
Systems/a320-fbw.xml
View file

@ -1073,6 +1073,23 @@
<input>-/FMGC/internal/vmo-mmo</input>
</summer>
<fcs_function name="fbw/pitch/e-i-normal">
<function>
<sum>
<property>fbw/sidestick/pitch-input</property>
<table>
<independentVar lookup="row">attitude/roll-rad</independentVar>
<tableData>
-1.1693700 0.4
-0.5846853 0.0
0.5846853 0.0
1.1693700 0.4
</tableData>
</table>
</sum>
</function>
</fcs_function>
<fcs_function name="fbw/pitch/e-i-overspeed">
<function>
<table>
@ -1180,7 +1197,7 @@
</fcs_function>
<switch name="fbw/pitch/e-i-cmd">
<default value="fbw/sidestick/pitch-input"/>
<default value="fbw/pitch/e-i-normal"/>
<test logic="AND" value="fbw/pitch/e-i-overspeed">
fbw/protections/overspeed eq 1
position/wow eq 0
@ -1262,9 +1279,17 @@
<c1>fbw/rate-c1</c1>
</lag_filter>
<switch name="fbw/pitch/rate-demand-gain">
<default value="-0.087266"/>
<test logic="OR" value="0.087266">
attitude/roll-rad lt -1.5708
attitude/roll-rad gt 1.5708
</test>
</switch>
<pure_gain name="fbw/pitch/rate-demand">
<input>fbw/pitch/e-i</input>
<gain>-0.087266</gain>
<gain>fbw/pitch/rate-demand-gain</gain>
</pure_gain>
<switch name="fbw/pitch/t-r_s-s">