Merge branch 'master' of https://www.github.com/it0uchpods/A320Family
This commit is contained in:
commit
b7b381c599
18 changed files with 256 additions and 171 deletions
|
@ -315,7 +315,6 @@
|
|||
<fpa>0.30</fpa>
|
||||
</cmd>
|
||||
<autoland>
|
||||
<kp-roll>0.10</kp-roll>
|
||||
<kp-pitch>0.03</kp-pitch>
|
||||
<kp-rudder>-0.25</kp-rudder>
|
||||
</autoland>
|
||||
|
@ -323,7 +322,6 @@
|
|||
<settings>
|
||||
<default-bank-limit>30</default-bank-limit> <!-- Set the Default Bank Limit -->
|
||||
<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 -->
|
||||
|
@ -331,6 +329,7 @@
|
|||
<togaspd>162</togaspd> <!-- V2 + 10kts -->
|
||||
<lat-agl-ft>30</lat-agl-ft> <!-- Set to 999999 if you do not want T/O to change automatically to HDG, or LNAV -->
|
||||
<reduc-agl-ft>3000</reduc-agl-ft> <!-- Set to 999999 if you do not want TOGA to change automatically to FLCH -->
|
||||
<autoland-without-ap>1</autoland-without-ap> <!-- Engage LAND and FLARE Modes even if the AP is off -->
|
||||
</settings>
|
||||
<output>
|
||||
<ap1>0</ap1>
|
||||
|
@ -392,6 +391,7 @@
|
|||
<fault type="bool">false</fault>
|
||||
</ir>
|
||||
<onbat type="bool">false</onbat>
|
||||
<skip userarchive="y" type="bool">0</skip>
|
||||
</adirs>
|
||||
<APU>
|
||||
<fire-switch type="bool">0</fire-switch>
|
||||
|
@ -521,7 +521,7 @@
|
|||
|
||||
<options n="0">
|
||||
<pfd n="0">
|
||||
<sidestick-pos type="bool">0</sidestick-pos>
|
||||
<sidestick-pos userarchive="y" type="bool">0</sidestick-pos>
|
||||
</pfd>
|
||||
</options>
|
||||
|
||||
|
@ -636,11 +636,11 @@
|
|||
<keyboard>
|
||||
<key n="127">
|
||||
<name>DEL</name>
|
||||
<desc>REV MSG</desc>
|
||||
<desc>Simple Engage/Disengage reversers</desc>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>
|
||||
gui.popupTip("Use w to activate reverse thrust, and q to deactivate reverse thrust.");
|
||||
systems.toggleFastRevThrust();
|
||||
</script>
|
||||
</binding>
|
||||
</key>
|
||||
|
@ -650,7 +650,7 @@
|
|||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>
|
||||
systems.un_rev_thrust();
|
||||
systems.unRevThrust();
|
||||
</script>
|
||||
</binding>
|
||||
</key>
|
||||
|
@ -660,7 +660,7 @@
|
|||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>
|
||||
systems.do_rev_thrust();
|
||||
systems.doRevThrust();
|
||||
</script>
|
||||
</binding>
|
||||
</key>
|
||||
|
@ -670,7 +670,7 @@
|
|||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>
|
||||
systems.do_idle_thrust();
|
||||
systems.doIdleThrust();
|
||||
</script>
|
||||
</binding>
|
||||
</key>
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
<text>
|
||||
<halign>center</halign>
|
||||
<label>A3XX Logic is startup up...</label>
|
||||
<label>Initializing...</label>
|
||||
</text>
|
||||
|
||||
</group>
|
||||
|
|
|
@ -12,15 +12,16 @@ var fbw_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/fbw/dialog", "Aircraft/A3
|
|||
init_dlg.open();
|
||||
|
||||
setlistener("/sim/signals/fdm-initialized", func {
|
||||
# loadSettings();
|
||||
init_dlg.close();
|
||||
welcome_dlg.open();
|
||||
});
|
||||
|
||||
#var loadSettings = func {
|
||||
# var file = io.open(getprop("/sim/aircraft-dir")~"/AircraftConfig/settings.conf","r+");
|
||||
# print(file);
|
||||
#}
|
||||
var saveSettings = func {
|
||||
aircraft.data.add("/options/pfd/sidestick-pos", "/controls/adirs/skip");
|
||||
aircraft.data.save();
|
||||
}
|
||||
|
||||
saveSettings();
|
||||
|
||||
var systemsReset = func {
|
||||
systems.elec_init();
|
||||
|
|
|
@ -59,6 +59,10 @@
|
|||
<halign>left</halign>
|
||||
<label>E - Set Idle Thrust</label>
|
||||
</text>
|
||||
<text>
|
||||
<halign>left</halign>
|
||||
<label>DEL - Toggle Reverse Thrust</label>
|
||||
</text>
|
||||
<text>
|
||||
<halign>left</halign>
|
||||
<label>CTRL + B - Cycle Spoilers</label>
|
||||
|
|
|
@ -288,7 +288,7 @@
|
|||
<hrule/>
|
||||
|
||||
<checkbox>
|
||||
<label>Skip IRS Alignment</label>
|
||||
<label>Skip ADIRS Alignment</label>
|
||||
<halign>left</halign>
|
||||
<property>/controls/adirs/skip</property>
|
||||
<binding>
|
||||
|
@ -298,6 +298,12 @@
|
|||
<binding>
|
||||
<command>dialog-apply</command>
|
||||
</binding>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>
|
||||
acconfig.saveSettings();
|
||||
</script>
|
||||
</binding>
|
||||
<live>true</live>
|
||||
</checkbox>
|
||||
|
||||
|
@ -312,6 +318,12 @@
|
|||
<binding>
|
||||
<command>dialog-apply</command>
|
||||
</binding>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>
|
||||
acconfig.saveSettings();
|
||||
</script>
|
||||
</binding>
|
||||
<live>true</live>
|
||||
</checkbox>
|
||||
|
||||
|
|
|
@ -1,2 +0,0 @@
|
|||
skipADIRS=0
|
||||
showPFDSideStick=0
|
|
@ -2132,13 +2132,7 @@
|
|||
<name>Engine 1 throttle lever</name>
|
||||
<type>rotate</type>
|
||||
<object-name>thr_l</object-name>
|
||||
<condition>
|
||||
<not-equals>
|
||||
<property>/controls/engines/engine[0]/reverser</property>
|
||||
<value>1</value>
|
||||
</not-equals>
|
||||
</condition>
|
||||
<property>controls/engines/engine[0]/throttle-pos</property>
|
||||
<property>controls/engines/engine[0]/throttle-lever</property>
|
||||
<interpolation>
|
||||
<entry><ind>0.00000</ind><dep>10</dep></entry>
|
||||
<entry><ind>0.59999</ind><dep>33</dep></entry>
|
||||
|
@ -2168,16 +2162,10 @@
|
|||
<name>Engine 1 throttle lever rev</name>
|
||||
<type>rotate</type>
|
||||
<object-name>thr_l</object-name>
|
||||
<condition>
|
||||
<equals>
|
||||
<property>/controls/engines/engine[0]/reverser</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
</condition>
|
||||
<property>controls/engines/engine[0]/throttle-pos</property>
|
||||
<property>controls/engines/engine[0]/throttle-rev</property>
|
||||
<interpolation>
|
||||
<entry><ind>0.00</ind><dep> 0</dep></entry>
|
||||
<entry><ind>0.25</ind><dep>-10</dep></entry>
|
||||
<entry><ind>0.50</ind><dep>-10</dep></entry>
|
||||
</interpolation>
|
||||
<axis>
|
||||
<x>0</x>
|
||||
|
@ -2221,13 +2209,7 @@
|
|||
<name>Engine 2 throttle lever</name>
|
||||
<type>rotate</type>
|
||||
<object-name>thr_r</object-name>
|
||||
<condition>
|
||||
<not-equals>
|
||||
<property>/controls/engines/engine[0]/reverser</property>
|
||||
<value>1</value>
|
||||
</not-equals>
|
||||
</condition>
|
||||
<property>controls/engines/engine[1]/throttle-pos</property>
|
||||
<property>controls/engines/engine[1]/throttle-lever</property>
|
||||
<interpolation>
|
||||
<entry><ind>0.00000</ind><dep>10</dep></entry>
|
||||
<entry><ind>0.59999</ind><dep>33</dep></entry>
|
||||
|
@ -2257,16 +2239,10 @@
|
|||
<name>Engine 2 throttle lever rev</name>
|
||||
<type>rotate</type>
|
||||
<object-name>thr_r</object-name>
|
||||
<condition>
|
||||
<equals>
|
||||
<property>/controls/engines/engine[0]/reverser</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
</condition>
|
||||
<property>controls/engines/engine[1]/throttle-pos</property>
|
||||
<property>controls/engines/engine[1]/throttle-rev</property>
|
||||
<interpolation>
|
||||
<entry><ind>0.00</ind><dep> 0</dep></entry>
|
||||
<entry><ind>0.25</ind><dep>-10</dep></entry>
|
||||
<entry><ind>0.50</ind><dep>-10</dep></entry>
|
||||
</interpolation>
|
||||
<axis>
|
||||
<x>0</x>
|
||||
|
|
|
@ -931,7 +931,7 @@
|
|||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>thrpos1</object-name>
|
||||
<property>/controls/engines/engine[0]/throttle</property>
|
||||
<property>/controls/engines/engine[0]/throttle-lever</property>
|
||||
<interpolation>
|
||||
<entry><ind>0.00000</ind><dep>-12</dep></entry>
|
||||
<entry><ind>0.23350</ind><dep> 53</dep></entry>
|
||||
|
@ -962,7 +962,7 @@
|
|||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>thrpos2</object-name>
|
||||
<property>/controls/engines/engine[1]/throttle</property>
|
||||
<property>/controls/engines/engine[1]/throttle-lever</property>
|
||||
<interpolation>
|
||||
<entry><ind>0.00000</ind><dep>-12</dep></entry>
|
||||
<entry><ind>0.23350</ind><dep> 53</dep></entry>
|
||||
|
|
|
@ -1137,7 +1137,7 @@
|
|||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>thrpos1</object-name>
|
||||
<property>/controls/engines/engine[0]/throttle</property>
|
||||
<property>/controls/engines/engine[0]/throttle-lever</property>
|
||||
<interpolation>
|
||||
<entry><ind>0.00000</ind><dep>-10</dep></entry>
|
||||
<entry><ind>0.19560</ind><dep> 28</dep></entry>
|
||||
|
@ -1169,7 +1169,7 @@
|
|||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>thrpos2</object-name>
|
||||
<property>/controls/engines/engine[1]/throttle</property>
|
||||
<property>/controls/engines/engine[1]/throttle-lever</property>
|
||||
<interpolation>
|
||||
<entry><ind>0.00000</ind><dep>-10</dep></entry>
|
||||
<entry><ind>0.19560</ind><dep> 28</dep></entry>
|
||||
|
|
|
@ -935,7 +935,7 @@
|
|||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>thrpos1</object-name>
|
||||
<property>/controls/engines/engine[0]/throttle</property>
|
||||
<property>/controls/engines/engine[0]/throttle-lever</property>
|
||||
<interpolation>
|
||||
<entry><ind>0.00000</ind><dep> -2</dep></entry>
|
||||
<entry><ind>0.23350</ind><dep> 72</dep></entry>
|
||||
|
@ -966,7 +966,7 @@
|
|||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>thrpos2</object-name>
|
||||
<property>/controls/engines/engine[1]/throttle</property>
|
||||
<property>/controls/engines/engine[1]/throttle-lever</property>
|
||||
<interpolation>
|
||||
<entry><ind>0.00000</ind><dep> -2</dep></entry>
|
||||
<entry><ind>0.23350</ind><dep> 72</dep></entry>
|
||||
|
|
|
@ -1137,7 +1137,7 @@
|
|||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>thrpos1</object-name>
|
||||
<property>/controls/engines/engine[0]/throttle</property>
|
||||
<property>/controls/engines/engine[0]/throttle-lever</property>
|
||||
<interpolation>
|
||||
<entry><ind>0.00000</ind><dep>05</dep></entry>
|
||||
<entry><ind>0.19560</ind><dep>33</dep></entry>
|
||||
|
@ -1169,7 +1169,7 @@
|
|||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>thrpos2</object-name>
|
||||
<property>/controls/engines/engine[1]/throttle</property>
|
||||
<property>/controls/engines/engine[1]/throttle-lever</property>
|
||||
<interpolation>
|
||||
<entry><ind>0.00000</ind><dep>05</dep></entry>
|
||||
<entry><ind>0.19560</ind><dep>33</dep></entry>
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 487 KiB After Width: | Height: | Size: 454 KiB |
|
@ -15,7 +15,6 @@ setprop("/systems/electrical/bus/ac2", 0);
|
|||
setprop("/systems/electrical/bus/ac-ess", 0);
|
||||
|
||||
var adirs_init = func {
|
||||
setprop("controls/adirs/skip",0); #define this here, as we want this to be off on startup
|
||||
setprop("/controls/adirs/mcducbtn",0);
|
||||
adirs_timer.start();
|
||||
}
|
||||
|
@ -50,7 +49,6 @@ var ADIRSreset = func {
|
|||
setprop("/controls/adirs/ir[1]/fault",0);
|
||||
setprop("/controls/adirs/ir[2]/fault",0);
|
||||
setprop("/controls/adirs/onbat",0);
|
||||
setprop("/controls/adirs/skip",0);
|
||||
setprop("/controls/adirs/mcducbtn",0);
|
||||
adirs_init();
|
||||
}
|
||||
|
|
|
@ -252,7 +252,7 @@ setlistener("/systems/pneumatic/start-psi", func {
|
|||
}
|
||||
});
|
||||
|
||||
var do_idle_thrust = func {
|
||||
var doIdleThrust = func {
|
||||
setprop("/controls/engines/engine[0]/throttle", 0.0);
|
||||
setprop("/controls/engines/engine[1]/throttle", 0.0);
|
||||
}
|
||||
|
@ -260,17 +260,8 @@ var do_idle_thrust = func {
|
|||
#########################
|
||||
# Reverse Thrust System #
|
||||
#########################
|
||||
var do_rev_thrust = func {
|
||||
if ((getprop("/controls/engines/engine[0]/reverser") == "1") and (getprop("/controls/engines/engine[1]/reverser") == "1") and (getprop("/gear/gear[1]/wow") == 1) and (getprop("/gear/gear[2]/wow") == 1)) {
|
||||
var pos1 = getprop("/controls/engines/engine[0]/throttle-pos");
|
||||
var pos2 = getprop("/controls/engines/engine[1]/throttle-pos");
|
||||
if (pos1 < 0.5) {
|
||||
setprop("/controls/engines/engine[0]/throttle-pos", pos1 + 0.167);
|
||||
}
|
||||
if (pos2 < 0.5) {
|
||||
setprop("/controls/engines/engine[1]/throttle-pos", pos2 + 0.167);
|
||||
}
|
||||
}
|
||||
|
||||
var toggleFastRevThrust = func {
|
||||
var state1 = getprop("/systems/thrust/state1");
|
||||
var state2 = getprop("/systems/thrust/state2");
|
||||
if ((state1 == "IDLE") and (state2 == "IDLE") and (getprop("/controls/engines/engine[0]/reverser") == "0") and (getprop("/controls/engines/engine[1]/reverser") == "0") and (getprop("/gear/gear[1]/wow") == 1) and (getprop("/gear/gear[2]/wow") == 1)) {
|
||||
|
@ -278,35 +269,69 @@ var do_rev_thrust = func {
|
|||
interpolate("/engines/engine[1]/reverser-pos-norm", 1, 1.4);
|
||||
setprop("/controls/engines/engine[0]/reverser", 1);
|
||||
setprop("/controls/engines/engine[1]/reverser", 1);
|
||||
setprop("/controls/engines/engine[0]/throttle-pos", 0);
|
||||
setprop("/controls/engines/engine[1]/throttle-pos", 0);
|
||||
setprop("/controls/engines/engine[0]/throttle-rev", 0.5);
|
||||
setprop("/controls/engines/engine[1]/throttle-rev", 0.5);
|
||||
setprop("/fdm/jsbsim/propulsion/engine[0]/reverser-angle-rad", 3.14);
|
||||
setprop("/fdm/jsbsim/propulsion/engine[1]/reverser-angle-rad", 3.14);
|
||||
} else if ((getprop("/controls/engines/engine[0]/reverser") == "1") or (getprop("/controls/engines/engine[1]/reverser") == "1") and (getprop("/gear/gear[1]/wow") == 1) and (getprop("/gear/gear[2]/wow") == 1)) {
|
||||
setprop("/controls/engines/engine[0]/throttle-rev", 0);
|
||||
setprop("/controls/engines/engine[1]/throttle-rev", 0);
|
||||
interpolate("/engines/engine[0]/reverser-pos-norm", 0, 1.0);
|
||||
interpolate("/engines/engine[1]/reverser-pos-norm", 0, 1.0);
|
||||
setprop("/fdm/jsbsim/propulsion/engine[0]/reverser-angle-rad", 0);
|
||||
setprop("/fdm/jsbsim/propulsion/engine[1]/reverser-angle-rad", 0);
|
||||
setprop("/controls/engines/engine[0]/reverser", 0);
|
||||
setprop("/controls/engines/engine[1]/reverser", 0);
|
||||
}
|
||||
}
|
||||
|
||||
var doRevThrust = func {
|
||||
if ((getprop("/controls/engines/engine[0]/reverser") == "1") and (getprop("/controls/engines/engine[1]/reverser") == "1") and (getprop("/gear/gear[1]/wow") == 1) and (getprop("/gear/gear[2]/wow") == 1)) {
|
||||
var pos1 = getprop("/controls/engines/engine[0]/throttle-rev");
|
||||
var pos2 = getprop("/controls/engines/engine[1]/throttle-rev");
|
||||
if (pos1 < 0.5) {
|
||||
setprop("/controls/engines/engine[0]/throttle-rev", pos1 + 0.167);
|
||||
}
|
||||
if (pos2 < 0.5) {
|
||||
setprop("/controls/engines/engine[1]/throttle-rev", pos2 + 0.167);
|
||||
}
|
||||
}
|
||||
var state1 = getprop("/systems/thrust/state1");
|
||||
var state2 = getprop("/systems/thrust/state2");
|
||||
if ((state1 == "IDLE") and (state2 == "IDLE") and (getprop("/controls/engines/engine[0]/reverser") == "0") and (getprop("/controls/engines/engine[1]/reverser") == "0") and (getprop("/gear/gear[1]/wow") == 1) and (getprop("/gear/gear[2]/wow") == 1)) {
|
||||
setprop("/controls/engines/engine[0]/throttle-rev", 0);
|
||||
setprop("/controls/engines/engine[1]/throttle-rev", 0);
|
||||
interpolate("/engines/engine[0]/reverser-pos-norm", 1, 1.4);
|
||||
interpolate("/engines/engine[1]/reverser-pos-norm", 1, 1.4);
|
||||
setprop("/controls/engines/engine[0]/reverser", 1);
|
||||
setprop("/controls/engines/engine[1]/reverser", 1);
|
||||
setprop("/fdm/jsbsim/propulsion/engine[0]/reverser-angle-rad", 3.14);
|
||||
setprop("/fdm/jsbsim/propulsion/engine[1]/reverser-angle-rad", 3.14);
|
||||
}
|
||||
}
|
||||
|
||||
var un_rev_thrust = func {
|
||||
if ((getprop("/controls/engines/engine[0]/reverser") == "1") and (getprop("/controls/engines/engine[1]/reverser") == "1")) {
|
||||
var pos1 = getprop("/controls/engines/engine[0]/throttle-pos");
|
||||
var pos2 = getprop("/controls/engines/engine[1]/throttle-pos");
|
||||
var unRevThrust = func {
|
||||
if ((getprop("/controls/engines/engine[0]/reverser") == "1") or (getprop("/controls/engines/engine[1]/reverser") == "1")) {
|
||||
var pos1 = getprop("/controls/engines/engine[0]/throttle-rev");
|
||||
var pos2 = getprop("/controls/engines/engine[1]/throttle-rev");
|
||||
if (pos1 > 0.0) {
|
||||
setprop("/controls/engines/engine[0]/throttle-pos", pos1 - 0.167);
|
||||
setprop("/controls/engines/engine[0]/throttle-rev", pos1 - 0.167);
|
||||
} else {
|
||||
un_rev_thrust_b();
|
||||
unRevThrust_b();
|
||||
}
|
||||
if (pos2 > 0.0) {
|
||||
setprop("/controls/engines/engine[1]/throttle-pos", pos2 - 0.167);
|
||||
setprop("/controls/engines/engine[1]/throttle-rev", pos2 - 0.167);
|
||||
} else {
|
||||
un_rev_thrust_b();
|
||||
unRevThrust_b();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var un_rev_thrust_b = func {
|
||||
var unRevThrust_b = func {
|
||||
setprop("/controls/engines/engine[0]/throttle-rev", 0);
|
||||
setprop("/controls/engines/engine[1]/throttle-rev", 0);
|
||||
interpolate("/engines/engine[0]/reverser-pos-norm", 0, 1.0);
|
||||
interpolate("/engines/engine[1]/reverser-pos-norm", 0, 1.0);
|
||||
setprop("/controls/engines/engine[0]/throttle-pos", 0);
|
||||
setprop("/controls/engines/engine[1]/throttle-pos", 0);
|
||||
setprop("/fdm/jsbsim/propulsion/engine[0]/reverser-angle-rad", 0);
|
||||
setprop("/fdm/jsbsim/propulsion/engine[1]/reverser-angle-rad", 0);
|
||||
setprop("/controls/engines/engine[0]/reverser", 0);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# IT AUTOFLIGHT System Controller
|
||||
# Joshua Davidson (it0uchpods)
|
||||
# V3.0.0 Build 180
|
||||
# V3.0.0 Build 182
|
||||
# This program is 100% GPL!
|
||||
|
||||
print("IT-AUTOFLIGHT: Please Wait!");
|
||||
|
@ -51,7 +51,6 @@ var ap_init = func {
|
|||
setprop("/it-autoflight/internal/fpa", 0);
|
||||
setprop("/it-autoflight/internal/prof-fpm", 0);
|
||||
setprop("/it-autoflight/internal/top-of-des-nm", 0);
|
||||
setprop("/it-autoflight/autoland/target-vs", "-650");
|
||||
setprop("/it-autoflight/mode/thr", "PITCH");
|
||||
setprop("/it-autoflight/mode/arm", "HDG");
|
||||
setprop("/it-autoflight/mode/lat", "T/O");
|
||||
|
@ -301,7 +300,6 @@ var vertical = func {
|
|||
setprop("/instrumentation/nav[1]/gs-rate-of-climb", 0);
|
||||
setprop("/it-autoflight/output/appr-armed", 1);
|
||||
setprop("/it-autoflight/mode/arm", "ILS");
|
||||
setprop("/it-autoflight/autoland/target-vs", "-650");
|
||||
}
|
||||
} else if (vertset == 3) {
|
||||
alandt.stop();
|
||||
|
@ -366,7 +364,6 @@ var vertical = func {
|
|||
alandt.stop();
|
||||
alandt1.start();
|
||||
prof_sys_stop();
|
||||
setprop("/it-autoflight/autoland/target-vs", "-650");
|
||||
} else if (vertset == 7) {
|
||||
alandt.stop();
|
||||
alandt1.stop();
|
||||
|
@ -770,8 +767,12 @@ var make_appr_active = func {
|
|||
var aland = func {
|
||||
var ap1 = getprop("/it-autoflight/output/ap1");
|
||||
var ap2 = getprop("/it-autoflight/output/ap2");
|
||||
var landoption = getprop("/it-autoflight/settings/autoland-without-ap");
|
||||
if (getprop("/position/gear-agl-ft") <= 100) {
|
||||
if (ap1 or ap2) {
|
||||
if (ap1 == 1 or ap2 == 1) {
|
||||
setprop("/it-autoflight/input/lat", 4);
|
||||
setprop("/it-autoflight/input/vert", 6);
|
||||
} else if (ap1 == 0 and ap2 == 0 and landoption) {
|
||||
setprop("/it-autoflight/input/lat", 4);
|
||||
setprop("/it-autoflight/input/vert", 6);
|
||||
} else {
|
||||
|
@ -783,12 +784,10 @@ var aland = func {
|
|||
|
||||
var aland1 = func {
|
||||
var aglal = getprop("/position/gear-agl-ft");
|
||||
var flarealt = getprop("/it-autoflight/settings/flare-altitude");
|
||||
if (aglal <= flarealt and aglal > 5) {
|
||||
if (aglal <= 50 and aglal > 5) {
|
||||
setprop("/it-autoflight/mode/vert", "FLARE");
|
||||
setprop("/it-autoflight/autoland/target-vs", "-120");
|
||||
}
|
||||
if ((getprop("/it-autoflight/output/ap1") == 0) and (getprop("/it-autoflight/output/ap2") == 0)) {
|
||||
if ((getprop("/it-autoflight/output/ap1") == 0) and (getprop("/it-autoflight/output/ap2") == 0) and (getprop("/it-autoflight/settings/autoland-without-ap") == 0)) {
|
||||
alandt.stop();
|
||||
alandt1.stop();
|
||||
setprop("/it-autoflight/output/loc-armed", 0);
|
||||
|
|
|
@ -244,16 +244,77 @@
|
|||
<name>Throttle L</name>
|
||||
<type>gain</type>
|
||||
<gain>1</gain>
|
||||
<enable>
|
||||
<update-interval-secs type="double">0.05</update-interval-secs>
|
||||
<input>
|
||||
<condition>
|
||||
<equals>
|
||||
<property>/controls/engines/engine[0]/reverser</property>
|
||||
<value>0</value>
|
||||
</equals>
|
||||
</condition>
|
||||
</enable>
|
||||
<property>/controls/engines/engine[0]/throttle</property>
|
||||
</input>
|
||||
<input>
|
||||
<condition>
|
||||
<equals>
|
||||
<property>/controls/engines/engine[0]/reverser</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
</condition>
|
||||
<value>0</value>
|
||||
</input>
|
||||
<output>/controls/engines/engine[0]/throttle-lever</output>
|
||||
</filter>
|
||||
|
||||
<filter>
|
||||
<name>Throttle R</name>
|
||||
<type>gain</type>
|
||||
<gain>1</gain>
|
||||
<update-interval-secs type="double">0.05</update-interval-secs>
|
||||
<input>/controls/engines/engine[0]/throttle</input>
|
||||
<input>
|
||||
<condition>
|
||||
<equals>
|
||||
<property>/controls/engines/engine[1]/reverser</property>
|
||||
<value>0</value>
|
||||
</equals>
|
||||
</condition>
|
||||
<property>/controls/engines/engine[1]/throttle</property>
|
||||
</input>
|
||||
<input>
|
||||
<condition>
|
||||
<equals>
|
||||
<property>/controls/engines/engine[1]/reverser</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
</condition>
|
||||
<value>0</value>
|
||||
</input>
|
||||
<output>/controls/engines/engine[1]/throttle-lever</output>
|
||||
</filter>
|
||||
|
||||
<filter>
|
||||
<name>Throttle L</name>
|
||||
<type>gain</type>
|
||||
<gain>1</gain>
|
||||
<update-interval-secs type="double">0.05</update-interval-secs>
|
||||
<input>
|
||||
<condition>
|
||||
<equals>
|
||||
<property>/controls/engines/engine[0]/reverser</property>
|
||||
<value>0</value>
|
||||
</equals>
|
||||
</condition>
|
||||
<property>/controls/engines/engine[0]/throttle</property>
|
||||
</input>
|
||||
<input>
|
||||
<condition>
|
||||
<equals>
|
||||
<property>/controls/engines/engine[0]/reverser</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
</condition>
|
||||
<property>/controls/engines/engine[0]/throttle-rev</property>
|
||||
</input>
|
||||
<output>/controls/engines/engine[0]/throttle-pos</output>
|
||||
</filter>
|
||||
|
||||
|
@ -261,16 +322,25 @@
|
|||
<name>Throttle R</name>
|
||||
<type>gain</type>
|
||||
<gain>1</gain>
|
||||
<enable>
|
||||
<update-interval-secs type="double">0.05</update-interval-secs>
|
||||
<input>
|
||||
<condition>
|
||||
<equals>
|
||||
<property>/controls/engines/engine[1]/reverser</property>
|
||||
<value>0</value>
|
||||
</equals>
|
||||
</condition>
|
||||
</enable>
|
||||
<update-interval-secs type="double">0.05</update-interval-secs>
|
||||
<input>/controls/engines/engine[1]/throttle</input>
|
||||
<property>/controls/engines/engine[1]/throttle</property>
|
||||
</input>
|
||||
<input>
|
||||
<condition>
|
||||
<equals>
|
||||
<property>/controls/engines/engine[1]/reverser</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
</condition>
|
||||
<property>/controls/engines/engine[1]/throttle-rev</property>
|
||||
</input>
|
||||
<output>/controls/engines/engine[1]/throttle-pos</output>
|
||||
</filter>
|
||||
|
||||
|
|
|
@ -16,14 +16,6 @@
|
|||
<seconds>5.0</seconds>
|
||||
<filter-gain>0.0</filter-gain>
|
||||
</predict-simple>
|
||||
|
||||
<predict-simple>
|
||||
<name>VOR/LOC 5 SECONDS AHEAD</name>
|
||||
<input>/it-autoflight/internal/nav1-track-error-deg</input>
|
||||
<output>/it-autoflight/internal/nav1-error-5-sec-ahead</output>
|
||||
<seconds>12</seconds>
|
||||
<filter-gain>0.1</filter-gain>
|
||||
</predict-simple>
|
||||
|
||||
<predict-simple>
|
||||
<name>IAS 5 SECOND PREDICTOR</name>
|
||||
|
@ -216,15 +208,6 @@
|
|||
</period>
|
||||
<gain>1.0</gain>
|
||||
</filter>
|
||||
|
||||
<filter>
|
||||
<name>VOR/LOC HEADING ERROR FILTER</name>
|
||||
<debug>false</debug>
|
||||
<type>noise-spike</type>
|
||||
<input>/it-autoflight/internal/nav1-error-5-sec-ahead</input>
|
||||
<output>/it-autoflight/internal/nav1-heading-error-deg-filtered</output>
|
||||
<max-rate-of-change>90.0</max-rate-of-change>
|
||||
</filter>
|
||||
|
||||
<filter>
|
||||
<name>INTERNAL VERTICAL SPEED COMPUTER</name>
|
||||
|
@ -550,16 +533,10 @@
|
|||
<config>
|
||||
<Kp>
|
||||
<condition>
|
||||
<and>
|
||||
<not-equals>
|
||||
<property>/it-autoflight/output/lat</property>
|
||||
<value>2</value>
|
||||
</not-equals>
|
||||
<not-equals>
|
||||
<property>/it-autoflight/output/lat</property>
|
||||
<value>4</value>
|
||||
</not-equals>
|
||||
</and>
|
||||
<not-equals>
|
||||
<property>/it-autoflight/output/lat</property>
|
||||
<value>2</value>
|
||||
</not-equals>
|
||||
</condition>
|
||||
<property>/it-autoflight/config/roll/kp</property>
|
||||
</Kp>
|
||||
|
@ -572,15 +549,6 @@
|
|||
</condition>
|
||||
<property>/it-autoflight/config/roll/kp-vloc</property>
|
||||
</Kp>
|
||||
<Kp>
|
||||
<condition>
|
||||
<equals>
|
||||
<property>/it-autoflight/output/lat</property>
|
||||
<value>4</value>
|
||||
</equals>
|
||||
</condition>
|
||||
<property>/it-autoflight/config/autoland/kp-roll</property>
|
||||
</Kp>
|
||||
<beta>1.0</beta>
|
||||
<alpha>0.1</alpha>
|
||||
<gamma>0.0</gamma>
|
||||
|
@ -705,42 +673,6 @@
|
|||
</config>
|
||||
</pid-controller>
|
||||
|
||||
<pi-simple-controller>
|
||||
<name>AUTOLAND VS HOLD</name>
|
||||
<debug>false</debug>
|
||||
<enable>
|
||||
<condition>
|
||||
<equals>
|
||||
<property>/it-autoflight/output/vert</property>
|
||||
<value>6</value>
|
||||
</equals>
|
||||
</condition>
|
||||
</enable>
|
||||
<input>
|
||||
<property>/it-autoflight/internal/vert-speed-fpm</property>
|
||||
<scale>0.2</scale>
|
||||
</input>
|
||||
<reference>
|
||||
<property>/it-autoflight/autoland/target-vs</property>
|
||||
<scale>0.2</scale>
|
||||
</reference>
|
||||
<output>
|
||||
<property>/it-autoflight/internal/target-pitch-deg</property>
|
||||
</output>
|
||||
<config>
|
||||
<Kp>
|
||||
<property>/it-autoflight/config/autoland/kp-pitch</property>
|
||||
</Kp>
|
||||
<Ki>0.010</Ki>
|
||||
<min>
|
||||
<value>0</value>
|
||||
</min>
|
||||
<max>
|
||||
<value>15</value>
|
||||
</max>
|
||||
</config>
|
||||
</pi-simple-controller>
|
||||
|
||||
<pid-controller>
|
||||
<name>FLCH SPEED BY PITCH</name>
|
||||
<debug>false</debug>
|
||||
|
@ -1015,6 +947,28 @@
|
|||
</config>
|
||||
</pid-controller>
|
||||
|
||||
<filter>
|
||||
<name>AUTOLAND FPM</name>
|
||||
<type>gain</type>
|
||||
<gain>1</gain>
|
||||
<update-interval-secs type="double">0.05</update-interval-secs>
|
||||
<input>
|
||||
<expression>
|
||||
<table>
|
||||
<property>/position/gear-agl-ft</property>
|
||||
<entry><ind>100</ind><dep>-600</dep></entry>
|
||||
<entry><ind> 50</ind><dep>-500</dep></entry>
|
||||
<entry><ind> 40</ind><dep>-400</dep></entry>
|
||||
<entry><ind> 30</ind><dep>-300</dep></entry>
|
||||
<entry><ind> 20</ind><dep>-200</dep></entry>
|
||||
<entry><ind> 10</ind><dep>-150</dep></entry>
|
||||
<entry><ind> 5</ind><dep>-100</dep></entry>
|
||||
</table>
|
||||
</expression>
|
||||
</input>
|
||||
<output>/it-autoflight/internal/target-fpm-c</output>
|
||||
</filter>
|
||||
|
||||
<pid-controller>
|
||||
<name>FPM HOLD</name>
|
||||
<debug>false</debug>
|
||||
|
@ -1037,6 +991,10 @@
|
|||
<property>/it-autoflight/output/vert</property>
|
||||
<value>4</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>/it-autoflight/output/vert</property>
|
||||
<value>6</value>
|
||||
</equals>
|
||||
<equals>
|
||||
<property>/it-autoflight/output/vert</property>
|
||||
<value>7</value>
|
||||
|
@ -1114,6 +1072,16 @@
|
|||
<property>/it-autoflight/internal/prof-fpm</property>
|
||||
<scale>0.16667</scale>
|
||||
</reference>
|
||||
<reference>
|
||||
<condition>
|
||||
<equals>
|
||||
<property>/it-autoflight/output/vert</property>
|
||||
<value>6</value>
|
||||
</equals>
|
||||
</condition>
|
||||
<property>/it-autoflight/internal/target-fpm-c</property>
|
||||
<scale>0.16667</scale>
|
||||
</reference>
|
||||
<reference>
|
||||
<condition>
|
||||
<and>
|
||||
|
@ -1151,13 +1119,43 @@
|
|||
</output>
|
||||
<config>
|
||||
<Kp>
|
||||
<condition>
|
||||
<not-equals>
|
||||
<property>/it-autoflight/output/vert</property>
|
||||
<value>6</value>
|
||||
</not-equals>
|
||||
</condition>
|
||||
<property>/it-autoflight/config/cmd/vs</property>
|
||||
</Kp>
|
||||
<Kp>
|
||||
<condition>
|
||||
<equals>
|
||||
<property>/it-autoflight/output/vert</property>
|
||||
<value>6</value>
|
||||
</equals>
|
||||
</condition>
|
||||
<property>/it-autoflight/config/autoland/kp-pitch</property>
|
||||
</Kp>
|
||||
<Ti>2.5</Ti>
|
||||
<Td>0.001</Td>
|
||||
<u_min>
|
||||
<condition>
|
||||
<not-equals>
|
||||
<property>/it-autoflight/output/vert</property>
|
||||
<value>6</value>
|
||||
</not-equals>
|
||||
</condition>
|
||||
<value>-10</value>
|
||||
</u_min>
|
||||
<u_min>
|
||||
<condition>
|
||||
<equals>
|
||||
<property>/it-autoflight/output/vert</property>
|
||||
<value>6</value>
|
||||
</equals>
|
||||
</condition>
|
||||
<value>0</value>
|
||||
</u_min>
|
||||
<u_max>
|
||||
<condition>
|
||||
<and>
|
||||
|
@ -1295,7 +1293,7 @@
|
|||
</condition>
|
||||
</enable>
|
||||
<input>
|
||||
<property>/it-autoflight/internal/nav1-heading-error-deg</property>
|
||||
<property>/it-autoflight/internal/nav-heading-error-deg</property>
|
||||
</input>
|
||||
<reference>
|
||||
<value>0</value>
|
||||
|
|
|
@ -77,6 +77,10 @@
|
|||
<property>/it-autoflight/output/ap2</property>
|
||||
<value>0</value>
|
||||
</eq>
|
||||
<eq>
|
||||
<property>/gear/gear[0]/wow</property>
|
||||
<value>0</value>
|
||||
</eq>
|
||||
<or>
|
||||
<eq>
|
||||
<property>/it-fbw/law</property>
|
||||
|
|
Reference in a new issue