fly/IDG-A32X
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

bugfix, itaf 127

Browse source
This commit is contained in:
Joshua Davidson 2017-01-30 18:12:19 -05:00
parent b6652bd423
commit 5d4a3a7636
8 changed files with 784 additions and 509 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
A320-main.xml
View file

@ -249,6 +249,7 @@
<vorloc>-4.0</vorloc>
<alt>0.025</alt>
<vs>0.07</vs>
<fpa>0.30</fpa>
<flch>-0.35</flch>
<gs>0.10</gs>
</cmd>
@ -259,16 +260,20 @@
</autoland>
</config>
<settings>
<enable-cws>0</enable-cws>
<flare-altitude>40</flare-altitude>
<land-enable>1</land-enable>
<land-flap>0.645</land-flap>
<retard-ft>40</retard-ft>
<retard-enable>0</retard-enable>
<toga-pitch>15</toga-pitch>
<enable-cws>0</enable-cws> <!-- Enable/Disable CWS -->
<flare-altitude>40</flare-altitude> <!-- Autoland Flare AGL -->
<land-enable>1</land-enable> <!-- Enable/Disable Autoland -->
<land-flap>0.645</land-flap> <!-- Minimum Flap used for Landing -->
<retard-ft>40</retard-ft> <!-- Enable Thrust Retard -->
<retard-enable>0</retard-enable> <!-- AGL to Thrust Retard -->
<togaspd>157</togaspd> <!-- V2 + 10kts -->
<lat-agl-ft>100</lat-agl-ft> <!-- Set to 999999 if you do not want T/O to change automatically to HDG, or LNAV -->
<reduc-agl-ft>1500</reduc-agl-ft> <!-- Set to 999999 if you do not want TOGA to change automatically to FLCH -->
</settings>
</it-autoflight>
<autopilot>
<autobrake>
<config>

29
Models/FlightDeck/a320.flightdeck.xml
View file

@ -527,9 +527,14 @@
<button>1</button>
<repeatable>false</repeatable>
<binding>
<command>property-assign</command>
<property>/it-autoflight/input/vert</property>
<value>1</value>
<command>nasal</command>
<script>
if (getprop("/it-autoflight/settings/use-true-hdg-error") == 0) {
setprop("/it-autoflight/input/vert", 1);
} else if (getprop("/it-autoflight/settings/use-true-hdg-error") == 1) {
setprop("/it-autoflight/input/vert", 5);
}
</script>
</binding>
</action>
<action>
@ -644,9 +649,12 @@
<value>1</value>
</binding>
<binding>
<command>property-assign</command>
<property>/it-autoflight/settings/use-fpa</property>
<value>1</value>
<command>nasal</command>
<script>
if (getprop("/it-autoflight/output/vert") == 5) {
setprop("/it-autoflight/input/vert", 1);
}
</script>
</binding>
</action>
</animation>
@ -663,9 +671,12 @@
<value>0</value>
</binding>
<binding>
<command>property-assign</command>
<property>/it-autoflight/settings/use-fpa</property>
<value>0</value>
<command>nasal</command>
<script>
if (getprop("/it-autoflight/output/vert") == 1) {
setprop("/it-autoflight/input/vert", 5);
}
</script>
</binding>
</action>
</animation>

6
Nasal/PFD_FMA.nas
View file

@ -43,7 +43,7 @@ setlistener("/it-autoflight/mode/lat", func {
} else if (lat == "ALGN") {
setprop("/modes/pfd/fma/roll-mode", "ALN");
} else if (lat == "T/O") {
setprop("/modes/pfd/fma/roll-mode", " ");
setprop("/modes/pfd/fma/roll-mode", "RWY");
}
});
@ -117,9 +117,9 @@ var fd = func {
if (fd1 and fd2) {
setprop("/modes/pfd/fma/fd-mode", "1FD2");
} else if (fd1 and !fd2) {
setprop("/modes/pfd/fma/fd-mode", "FD1");
setprop("/modes/pfd/fma/fd-mode", "1FD-");
} else if (fd2 and !fd1) {
setprop("/modes/pfd/fma/fd-mode", "FD2");
setprop("/modes/pfd/fma/fd-mode", "-FD2");
} else {
setprop("/modes/pfd/fma/fd-mode", " ");
}

976
Nasal/it-autoflight.nas
View file

File diff suppressed because it is too large Load diff

8
Nasal/systems.nas
View file

@ -198,14 +198,6 @@ var aglgears = func {
aglgears();
setlistener("/instrumentation/altimeter/indicated-altitude-ft", func {
setprop("/instrumentation/altimeter/indicated-altitude-ft-pfd", getprop("/instrumentation/altimeter/indicated-altitude-ft") / 100);
});
setlistener("/instrumentation/vertical-speed-indicator/indicated-speed-fpm", func {
setprop("/instrumentation/vertical-speed-indicator/indicated-speed-fpm-pfd", getprop("/instrumentation/vertical-speed-indicator/indicated-speed-fpm") / 100);
});
setlistener("/controls/parking-brake", func {
if (getprop("/controls/parking-brake") == 1) {
setprop("/electrical/switches/ext-pwr", 1);

94
Systems/autopilot-dlg.xml
View file

@ -757,12 +757,6 @@
<button>
<pref-width>40</pref-width>
<legend>FPA</legend>
<enable>
<equals>
<property>/it-autoflight/settings/disabled-button</property>
<value>blahblahblahblah</value>
</equals>
</enable>
<binding>
<command>property-assign</command>
<property>/it-autoflight/input/vert</property>
@ -787,7 +781,7 @@
<text>
<row>0</row>
<col>0</col>
<label>ALT:</label>
<label>ALT: </label>
</text>
<button>
@ -871,7 +865,7 @@
<text>
<row>0</row>
<col>0</col>
<label>V/S:</label>
<label>V/S: </label>
</text>
<button>
@ -949,6 +943,90 @@
</button>
</group>
<group>
<layout>table</layout>
<text>
<row>0</row>
<col>0</col>
<label>FPA:</label>
</text>
<button>
<row>0</row>
<col>1</col>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<legend>&lt;&lt;</legend>
<binding>
<command>property-adjust</command>
<property>/it-autoflight/input/fpa</property>
<min>-9.9</min>
<max>9.9</max>
<step>-1</step>
<wrap>false</wrap>
</binding>
</button>
<button>
<row>0</row>
<col>2</col>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<legend>&lt;</legend>
<binding>
<command>property-adjust</command>
<property>/it-autoflight/input/fpa</property>
<min>-9.9</min>
<max>9.9</max>
<step>-0.1</step>
<wrap>false</wrap>
</binding>
</button>
<input>
<row>0</row>
<col>3</col>
<pref-width>55</pref-width>
<property>/it-autoflight/input/fpa</property>
<live type="bool">true</live>
<binding>
<command>dialog-apply</command>
</binding>
</input>
<button>
<row>0</row>
<col>4</col>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<legend>&gt;</legend>
<binding>
<command>property-adjust</command>
<property>/it-autoflight/input/fpa</property>
<min>-9.9</min>
<max>9.9</max>
<step>0.1</step>
<wrap>false</wrap>
</binding>
</button>
<button>
<row>0</row>
<col>5</col>
<halign>left</halign>
<pref-width>25</pref-width>
<pref-height>25</pref-height>
<legend>&gt;&gt;</legend>
<binding>
<command>property-adjust</command>
<property>/it-autoflight/input/fpa</property>
<min>-9.9</min>
<max>9.9</max>
<step>1</step>
<wrap>false</wrap>
</binding>
</button>
</group>
</group>
</PropertyList>

32
Systems/engine-timing.xml
View file

@ -115,5 +115,37 @@
</input>
<output>/engines/engine[1]/fuel-flow_actual</output>
</filter>
<filter>
<name>Altitude PFD</name>
<type>gain</type>
<gain>1</gain>
<update-interval-secs type="double">0.05</update-interval-secs>
<input>
<expression>
<div>
<property>/instrumentation/altimeter/indicated-altitude-ft</property>
<value>100</value>
</div>
</expression>
</input>
<output>/instrumentation/altimeter/indicated-altitude-ft-pfd</output>
</filter>
<filter>
<name>V/S PFD</name>
<type>gain</type>
<gain>1</gain>
<update-interval-secs type="double">0.05</update-interval-secs>
<input>
<expression>
<div>
<property>/instrumentation/vertical-speed-indicator/indicated-speed-fpm</property>
<value>100</value>
</div>
</expression>
</input>
<output>/instrumentation/vertical-speed-indicator/indicated-speed-fpm-pfd</output>
</filter>
</PropertyList>

129
Systems/it-autoflight.xml
View file

@ -77,7 +77,6 @@
</period>
<gain>1.0</gain>
</filter>
<filter>
<name>LNAV HDG ERROR DEG</name>
@ -550,6 +549,44 @@
</config>
</pid-controller>
<pid-controller>
<name>FPA HOLD</name>
<debug>false</debug>
<enable>
<condition>
<equals>
<property>/it-autoflight/output/vert</property>
<value>5</value>
</equals>
</condition>
</enable>
<input>
<property>/it-autoflight/internal/fpa</property>
</input>
<reference>
<property>/it-autoflight/input/fpa</property>
</reference>
<output>
<property>/it-autoflight/internal/target-pitch-deg</property>
</output>
<config>
<Kp>
<property>/it-autoflight/config/cmd/fpa</property>
</Kp>
<beta>1.0</beta>
<alpha>0.1</alpha>
<gamma>0.0</gamma>
<Ti>1.0</Ti>
<Td>0.00001</Td>
<u_min>
<value>-10</value>
</u_min>
<u_max>
<value>30</value>
</u_max>
</config>
</pid-controller>
<pi-simple-controller>
<name>AUTOLAND VS HOLD</name>
<debug>false</debug>
@ -726,6 +763,61 @@
</u_max>
</config>
</pid-controller>
<pid-controller>
<name>TOGA SPEED BY PITCH</name>
<debug>false</debug>
<enable>
<condition>
<or>
<equals>
<property>/it-autoflight/output/vert</property>
<value>7</value>
</equals>
</or>
</condition>
</enable>
<input>
<property>/it-autoflight/internal/lookahead-10-sec-airspeed-kt</property>
</input>
<reference>
<condition>
<equals>
<property>/it-autoflight/mode/vert</property>
<value>T/O CLB</value>
</equals>
</condition>
<property>/it-autoflight/settings/togaspd</property>
</reference>
<reference>
<condition>
<equals>
<property>/it-autoflight/mode/vert</property>
<value>G/A CLB</value>
</equals>
</condition>
<property>/it-autoflight/input/spd-kts</property>
</reference>
<output>
<property>/it-autoflight/internal/target-pitch-deg</property>
</output>
<config>
<Kp>
<property>/it-autoflight/config/cmd/flch</property>
</Kp>
<beta>1.0</beta>
<alpha>0.1</alpha>
<gamma>0.0</gamma>
<Ti>10.0</Ti>
<Td>0.00001</Td>
<u_min>
<value>1.5</value>
</u_min>
<u_max>
<value>25.0</value>
</u_max>
</config>
</pid-controller>
<pid-controller>
<name>IT-CONTROLLER: PITCH</name>
@ -748,23 +840,8 @@
<property>/orientation/pitch-deg</property>
</input>
<reference>
<condition>
<not-equals>
<property>/it-autoflight/output/vert</property>
<value>7</value>
</not-equals>
</condition>
<property>/it-autoflight/internal/target-pitch-deg</property>
</reference>
<reference>
<condition>
<equals>
<property>/it-autoflight/output/vert</property>
<value>7</value>
</equals>
</condition>
<property>/it-autoflight/settings/toga-pitch</property>
</reference>
<output>
<property>/it-autoflight/internal/elevator-cmd</property>
</output>
@ -1198,12 +1275,6 @@
<type>gain</type>
<gain>1.0</gain>
<input>
<condition>
<not-equals>
<property>/it-autoflight/output/vert</property>
<value>7</value>
</not-equals>
</condition>
<expression>
<dif>
<property>/it-autoflight/internal/target-pitch-deg</property>
@ -1211,20 +1282,6 @@
</dif>
</expression>
</input>
<input>
<condition>
<equals>
<property>/it-autoflight/output/vert</property>
<value>7</value>
</equals>
</condition>
<expression>
<dif>
<property>/it-autoflight/settings/toga-pitch</property>
<property>/orientation/pitch-deg</property>
</dif>
</expression>
</input>
<output>/it-autoflight/fd/pitch-bar</output>
</filter>