Merge branch 'master' into FMGC

This commit is contained in:
Joshua Davidson 2019-02-24 17:07:10 -05:00
commit 2d3c6a97a9
28 changed files with 820 additions and 886 deletions

View file

@ -694,6 +694,10 @@
<windowprobeheat type="double">0.5</windowprobeheat>
<qnh-knb>100000</qnh-knb>
<strobe type="double">0.0</strobe>
<beacon type="bool">0</beacon>
<wing-lights type="bool">0</wing-lights>
<landing-lights-l type="float">0.0</landing-lights-l>
<landing-lights-r type="float">0.0</landing-lights-r>
</switches>
<tray n="0">
<lefttrayext type="double">0</lefttrayext>
@ -1077,17 +1081,7 @@
<desc>Autothrottle Disconnect</desc>
<binding>
<command>nasal</command>
<script>
if (getprop("/it-autoflight/output/athr") == 1) {
libraries.athrOff("soft");
setprop("/ECAM/warnings/master-caution-light", 1);
} else {
if (getprop("/it-autoflight/output/athr-warning") == 1) {
setprop("/it-autoflight/output/athr-warning", 0);
setprop("/ECAM/warnings/master-caution-light", 0);
}
}
</script>
<script>libraries.APPanel.ATDiscSoft();</script>
</binding>
</key>
<key n="6">
@ -1326,18 +1320,7 @@
<desc>Autopilot Disconnect</desc>
<binding>
<command>nasal</command>
<script>
if (getprop("/it-autoflight/output/ap1") == 1 or getprop("/it-autoflight/output/ap2") == 1) {
libraries.apOff("soft", 0);
} else {
if (getprop("/it-autoflight/sound/apoffsound") == 1 or getprop("/it-autoflight/sound/apoffsound2") == 1) {
setprop("/it-autoflight/sound/apoffsound", 0);
setprop("/it-autoflight/sound/apoffsound2", 0);
}
setprop("/it-autoflight/output/ap-warning", 0);
setprop("/ECAM/warnings/master-warning-light", 0);
}
</script>
<script>libraries.APPanel.APDiscSoft();</script>
</binding>
</key>
<key n="70">

View file

@ -251,6 +251,14 @@ var colddark = func {
setprop("/controls/flight/speedbrake", 0);
setprop("/controls/gear/gear-down", 1);
setprop("/controls/flight/elevator-trim", 0);
setprop("/controls/switches/beacon", 0);
setprop("/controls/switches/strobe", 0.0);
setprop("/controls/switches/wing-lights", 0);
setprop("/controls/lighting/nav-lights-switch", 0);
setprop("/controls/lighting/turnoff-light-switch", 0);
setprop("/controls/lighting/taxi-light-switch", 0.0);
setprop("/controls/switches/landing-lights-l", 0.0);
setprop("/controls/switches/landing-lights-r", 0.0);
libraries.systemsInit();
failReset();
if (getprop("/engines/engine[1]/n2-actual") < 2) {
@ -344,7 +352,7 @@ var beforestart_b = func {
systems.ADIRS.skip(1);
systems.ADIRS.skip(2);
setprop("/controls/adirs/mcducbtn", 1);
setprop("/controls/lighting/beacon", 1);
setprop("/controls/switches/beacon", 1);
setprop("/controls/lighting/nav-lights-switch", 1);
setprop("/controls/radio/rmp[0]/on", 1);
setprop("/controls/radio/rmp[1]/on", 1);
@ -424,14 +432,16 @@ var taxi_b = func {
systems.ADIRS.skip(1);
systems.ADIRS.skip(2);
setprop("/controls/adirs/mcducbtn", 1);
setprop("/controls/lighting/beacon", 1);
setprop("/controls/switches/beacon", 1);
setprop("/controls/switches/wing-lights", 1);
setprop("/controls/lighting/nav-lights-switch", 1);
setprop("/controls/radio/rmp[0]/on", 1);
setprop("/controls/radio/rmp[1]/on", 1);
setprop("/controls/radio/rmp[2]/on", 1);
setprop("/controls/lighting/turnoff-light-switch", 1);
setprop("/controls/lighting/taxi-light-switch", 0.5);
setprop("/controls/lighting/landing-lights[1]", 0.5);
setprop("/controls/lighting/landing-lights[2]", 0.5);
setprop("/controls/switches/landing-lights-l", 0.5);
setprop("/controls/switches/landing-lights-r", 0.5);
settimer(taxi_c, 2);
}
var taxi_c = func {
@ -464,10 +474,10 @@ var takeoff = func {
var eng_one_chk_c = setlistener("/engines/engine[0]/state", func {
if (getprop("/engines/engine[0]/state") == 3) {
removelistener(eng_one_chk_c);
setprop("/controls/switches/strobe", 0.5);
setprop("/controls/switches/strobe", 1.0);
setprop("/controls/lighting/taxi-light-switch", 1);
setprop("/controls/lighting/landing-lights[1]", 1);
setprop("/controls/lighting/landing-lights[2]", 1);
setprop("/controls/switches/landing-lights-l", 1);
setprop("/controls/switches/landing-lights-r", 1);
setprop("/controls/flight/speedbrake-arm", 1);
setprop("/controls/flight/flaps", 0.290);
setprop("/controls/flight/slats", 0.666);

View file

@ -630,7 +630,7 @@
<animation>
<type>rotate</type>
<object-name>ParkBrk</object-name>
<property>controls/gear/brake-parking</property>
<property>fdm/jsbsim/fcs/brake-lever</property>
<factor>90</factor>
<axis>
<object-name>ParkBrk.axis</object-name>
@ -1640,7 +1640,7 @@
<animation>
<type>rotate</type>
<object-name>Lcutoff</object-name>
<property>controls/engines/engine[0]/cutoff-switch</property>
<property>fdm/jsbsim/fcs/engine-cutoff[0]</property>
<interpolation>
<entry><ind>0</ind><dep> 0</dep></entry>
<entry><ind>1</ind><dep>-70</dep></entry>
@ -1666,7 +1666,7 @@
<animation>
<type>rotate</type>
<object-name>Rcutoff</object-name>
<property>controls/engines/engine[1]/cutoff-switch</property>
<property>fdm/jsbsim/fcs/engine-cutoff[1]</property>
<interpolation>
<entry><ind>0</ind><dep> 0</dep></entry>
<entry><ind>1</ind><dep>-70</dep></entry>
@ -2196,14 +2196,11 @@
<button>0</button>
<repeatable type="bool">false</repeatable>
<binding>
<condition>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
</condition>
<command>property-toggle</command>
<property>it-autoflight/input/fd1</property>
<command>nasal</command>
<script>
libraries.APPanel.FD1();
setprop("/sim/sounde/btn1", 1);
</script>
</binding>
</action>
</animation>
@ -2301,14 +2298,11 @@
<button>0</button>
<repeatable type="bool">false</repeatable>
<binding>
<condition>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
</condition>
<command>property-toggle</command>
<property>it-autoflight/input/fd2</property>
<command>nasal</command>
<script>
libraries.APPanel.FD2();
setprop("/sim/sounde/btn1", 1);
</script>
</binding>
</action>
</animation>
@ -3716,10 +3710,8 @@
<button>0</button>
<repeatable>false</repeatable>
<binding>
<command>property-cycle</command>
<property>it-autoflight/input/kts-mach</property>
<value>0</value>
<value>1</value>
<command>nasal</command>
<script>libraries.APPanel.IASMach();</script>
</binding>
<binding>
<command>nasal</command>
@ -3736,9 +3728,7 @@
<repeatable>true</repeatable>
<binding>
<command>nasal</command>
<script>
libraries.mcpSPDKnbPush();
</script>
<script>libraries.APPanel.SPDPush();</script>
</binding>
<binding>
<command>nasal</command>
@ -3750,9 +3740,7 @@
<repeatable>true</repeatable>
<binding>
<command>nasal</command>
<script>
libraries.mcpSPDKnbPull();
</script>
<script>libraries.APPanel.SPDPull();</script>
</binding>
<binding>
<command>nasal</command>
@ -3763,42 +3751,8 @@
<button>3</button>
<repeatable>true</repeatable>
<binding>
<condition>
<and>
<equals>
<property>it-autoflight/input/kts-mach</property>
<value>0</value>
</equals>
<equals>
<property>it-autoflight/input/spd-managed</property>
<value>0</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>it-autoflight/input/spd-kts</property>
<step>1</step>
<min>100</min>
<max>350</max>
</binding>
<binding>
<condition>
<and>
<equals>
<property>it-autoflight/input/kts-mach</property>
<value>1</value>
</equals>
<equals>
<property>it-autoflight/input/spd-managed</property>
<value>0</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>it-autoflight/input/spd-mach</property>
<step>0.001</step>
<min>0.50</min>
<max>0.82</max>
<command>nasal</command>
<script>libraries.APPanel.SPDAdjust(1);</script>
</binding>
<binding>
<command>property-adjust</command>
@ -3813,42 +3767,8 @@
<button>4</button>
<repeatable>true</repeatable>
<binding>
<condition>
<and>
<equals>
<property>it-autoflight/input/kts-mach</property>
<value>0</value>
</equals>
<equals>
<property>it-autoflight/input/spd-managed</property>
<value>0</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>it-autoflight/input/spd-kts</property>
<step>-1</step>
<min>100</min>
<max>350</max>
</binding>
<binding>
<condition>
<and>
<equals>
<property>it-autoflight/input/kts-mach</property>
<value>1</value>
</equals>
<equals>
<property>it-autoflight/input/spd-managed</property>
<value>0</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>it-autoflight/input/spd-mach</property>
<step>-0.001</step>
<min>0.50</min>
<max>0.82</max>
<command>nasal</command>
<script>libraries.APPanel.SPDAdjust(-1);</script>
</binding>
<binding>
<command>property-adjust</command>
@ -3869,7 +3789,7 @@
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>libraries.mcpHDGKnbPush();</script>
<script>libraries.APPanel.HDGPush();</script>
</binding>
<binding>
<command>nasal</command>
@ -3881,7 +3801,7 @@
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>libraries.mcpHDGKnbPull();</script>
<script>libraries.APPanel.HDGPull();</script>
</binding>
<binding>
<command>nasal</command>
@ -3892,28 +3812,8 @@
<button>3</button>
<repeatable>true</repeatable>
<binding>
<condition>
<not-equals>
<property>it-autoflight/output/lat</property>
<value>0</value>
</not-equals>
</condition>
<command>nasal</command>
<script>libraries.hdgInput();</script>
</binding>
<binding>
<condition>
<equals>
<property>it-autoflight/custom/show-hdg</property>
<value>1</value>
</equals>
</condition>
<command>property-adjust</command>
<property>it-autoflight/input/hdg</property>
<step>1</step>
<min>1</min>
<max>361</max>
<wrap>true</wrap>
<script>libraries.APPanel.HDGAdjust(1);</script>
</binding>
<binding>
<command>property-adjust</command>
@ -3928,28 +3828,8 @@
<button>4</button>
<repeatable>true</repeatable>
<binding>
<condition>
<not-equals>
<property>it-autoflight/output/lat</property>
<value>0</value>
</not-equals>
</condition>
<command>nasal</command>
<script>libraries.hdgInput();</script>
</binding>
<binding>
<condition>
<equals>
<property>it-autoflight/custom/show-hdg</property>
<value>1</value>
</equals>
</condition>
<command>property-adjust</command>
<property>it-autoflight/input/hdg</property>
<step>-1</step>
<min>1</min>
<max>361</max>
<wrap>true</wrap>
<script>libraries.APPanel.HDGAdjust(-1);</script>
</binding>
<binding>
<command>property-adjust</command>
@ -3969,9 +3849,8 @@
<button>0</button>
<repeatable>false</repeatable>
<binding>
<command>property-assign</command>
<property>it-autoflight/input/lat</property>
<value>2</value>
<command>nasal</command>
<script>libraries.APPanel.LOCButton();</script>
</binding>
<binding>
<command>nasal</command>
@ -4024,9 +3903,7 @@
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>
fmgc.toggle_trkfpa();
</script>
<script>libraries.APPanel.TRKFPA();</script>
</binding>
<binding>
<command>nasal</command>
@ -4041,18 +3918,11 @@
<action>
<button>0</button>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
</binding>
<binding>
<command>nasal</command>
<script>
if (getprop("/it-autoflight/input/ap1") == 0) {
setprop("it-autoflight/input/ap1", 1);
} else {
libraries.apOff("hard", 1);
}
libraries.APPanel.AP1();
setprop("/sim/sounde/btn1", 1);
</script>
</binding>
</action>
@ -4080,18 +3950,11 @@
<action>
<button>0</button>
<repeatable type="bool">false</repeatable>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
</binding>
<binding>
<command>nasal</command>
<script>
if (getprop("/it-autoflight/input/ap2") == 0) {
setprop("it-autoflight/input/ap2", 1);
} else {
libraries.apOff("hard", 2);
}
libraries.APPanel.AP2();
setprop("/sim/sounde/btn1", 1);
</script>
</binding>
</action>
@ -4119,18 +3982,11 @@
<action>
<button>0</button>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
</binding>
<binding>
<command>nasal</command>
<script>
if (getprop("/it-autoflight/input/athr") == 0) {
setprop("it-autoflight/input/athr", 1);
} else {
libraries.athrOff("hard");
}
libraries.APPanel.ATHR();
setprop("/sim/sounde/btn1", 1);
</script>
</binding>
</action>
@ -4155,27 +4011,24 @@
<animation>
<type>pick</type>
<object-name>alt-sel</object-name>
<!--action>
<action>
<button>0</button>
<repeatable>false</repeatable>
<binding>
<command>property-assign</command>
<property>it-autoflight/input/vert</property>
<value>8</value>
<command>nasal</command>
<script>libraries.APPanel.ALTPull();</script>
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
</binding>
</action-->
</action>
<action>
<button>0</button>
<button>1</button>
<repeatable>false</repeatable>
<binding>
<command>property-assign</command>
<property>it-autoflight/input/vert</property>
<value>4</value>
<command>nasal</command>
<script>libraries.APPanel.ALTPush();</script>
</binding>
<binding>
<command>nasal</command>
@ -4186,30 +4039,8 @@
<button>3</button>
<repeatable>true</repeatable>
<binding>
<condition>
<equals>
<property>it-autoflight/config/altitude-dial-mode</property>
<value>0</value>
</equals>
</condition>
<command>property-adjust</command>
<property>it-autoflight/input/alt</property>
<step>100</step>
<min>0</min>
<max>50000</max>
</binding>
<binding>
<condition>
<equals>
<property>it-autoflight/config/altitude-dial-mode</property>
<value>1</value>
</equals>
</condition>
<command>property-adjust</command>
<property>it-autoflight/input/alt</property>
<step>1000</step>
<min>0</min>
<max>50000</max>
<command>nasal</command>
<script>libraries.APPanel.ALTAdjust(1);</script>
</binding>
<binding>
<command>property-adjust</command>
@ -4224,30 +4055,8 @@
<button>4</button>
<repeatable>true</repeatable>
<binding>
<condition>
<equals>
<property>it-autoflight/config/altitude-dial-mode</property>
<value>0</value>
</equals>
</condition>
<command>property-adjust</command>
<property>it-autoflight/input/alt</property>
<step>-100</step>
<min>0</min>
<max>50000</max>
</binding>
<binding>
<condition>
<equals>
<property>it-autoflight/config/altitude-dial-mode</property>
<value>1</value>
</equals>
</condition>
<command>property-adjust</command>
<property>it-autoflight/input/alt</property>
<step>-1000</step>
<min>0</min>
<max>50000</max>
<command>nasal</command>
<script>libraries.APPanel.ALTAdjust(-1);</script>
</binding>
<binding>
<command>property-adjust</command>
@ -4267,10 +4076,8 @@
<button>0</button>
<repeatable type="bool">false</repeatable>
<binding>
<command>property-cycle</command>
<command>property-toggle</command>
<property>it-autoflight/config/altitude-dial-mode</property>
<value>0</value>
<value>1</value>
</binding>
<binding>
<command>nasal</command>
@ -4286,48 +4093,8 @@
<button>0</button>
<repeatable>false</repeatable>
<binding>
<condition>
<equals>
<property>it-autoflight/custom/trk-fpa</property>
<value>0</value>
</equals>
</condition>
<command>property-assign</command>
<property>it-autoflight/input/vert</property>
<value>1</value>
</binding>
<binding>
<condition>
<equals>
<property>it-autoflight/custom/trk-fpa</property>
<value>0</value>
</equals>
</condition>
<command>property-assign</command>
<property>it-autoflight/input/vs</property>
<value>0</value>
</binding>
<binding>
<condition>
<equals>
<property>it-autoflight/custom/trk-fpa</property>
<value>1</value>
</equals>
</condition>
<command>property-assign</command>
<property>it-autoflight/input/vert</property>
<value>5</value>
</binding>
<binding>
<condition>
<equals>
<property>it-autoflight/custom/trk-fpa</property>
<value>1</value>
</equals>
</condition>
<command>property-assign</command>
<property>it-autoflight/input/fpa</property>
<value>0.0</value>
<command>nasal</command>
<script>libraries.APPanel.VSPush();</script>
</binding>
<binding>
<command>nasal</command>
@ -4339,13 +4106,7 @@
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>
if (getprop("/it-autoflight/custom/trk-fpa") == 0) {
setprop("/it-autoflight/input/vert", 1);
} else if (getprop("/it-autoflight/custom/trk-fpa") == 1) {
setprop("/it-autoflight/input/vert", 5);
}
</script>
<script>libraries.APPanel.VSPull();</script>
</binding>
<binding>
<command>nasal</command>
@ -4357,37 +4118,7 @@
<repeatable>true</repeatable>
<binding>
<command>nasal</command>
<script>
if (getprop("/it-autoflight/output/vert") != 1 and getprop("/it-autoflight/custom/trk-fpa") == 0) {
setprop("/it-autoflight/input/vert", 1);
} else if (getprop("/it-autoflight/output/vert") != 5 and getprop("/it-autoflight/custom/trk-fpa") == 1) {
setprop("/it-autoflight/input/vert", 5);
}
</script>
</binding>
<binding>
<condition>
<equals>
<property>it-autoflight/output/vert</property>
<value>1</value>
</equals>
</condition>
<command>property-adjust</command>
<property>it-autoflight/input/vs</property>
<step>100</step>
<max>8000</max>
</binding>
<binding>
<condition>
<equals>
<property>it-autoflight/output/vert</property>
<value>5</value>
</equals>
</condition>
<command>property-adjust</command>
<property>it-autoflight/input/fpa</property>
<step>0.1</step>
<max>20.9</max>
<script>libraries.APPanel.VSAdjust(1);</script>
</binding>
<binding>
<command>property-adjust</command>
@ -4403,37 +4134,7 @@
<repeatable>true</repeatable>
<binding>
<command>nasal</command>
<script>
if (getprop("/it-autoflight/output/vert") != 1 and getprop("/it-autoflight/custom/trk-fpa") == 0) {
setprop("/it-autoflight/input/vert", 1);
} else if (getprop("/it-autoflight/output/vert") != 5 and getprop("/it-autoflight/custom/trk-fpa") == 1) {
setprop("/it-autoflight/input/vert", 5);
}
</script>
</binding>
<binding>
<condition>
<equals>
<property>it-autoflight/output/vert</property>
<value>1</value>
</equals>
</condition>
<command>property-adjust</command>
<property>it-autoflight/input/vs</property>
<step>-100</step>
<min>-6000</min>
</binding>
<binding>
<condition>
<equals>
<property>it-autoflight/output/vert</property>
<value>5</value>
</equals>
</condition>
<command>property-adjust</command>
<property>it-autoflight/input/fpa</property>
<step>-0.1</step>
<min>-20.9</min>
<script>libraries.APPanel.VSAdjust(-1);</script>
</binding>
<binding>
<command>property-adjust</command>
@ -4453,9 +4154,8 @@
<button>0</button>
<repeatable>false</repeatable>
<binding>
<command>property-assign</command>
<property>it-autoflight/input/vert</property>
<value>2</value>
<command>nasal</command>
<script>libraries.APPanel.APPRButton();</script>
</binding>
<binding>
<command>nasal</command>
@ -4520,7 +4220,7 @@
<animation>
<type>rotate</type>
<object-name>FlapsLever</object-name>
<property>controls/flight/flap-lever</property>
<property>fdm/jsbsim/fcs/flap-lever</property>
<interpolation>
<entry><ind>0</ind><dep> 0</dep></entry>
<entry><ind>1</ind><dep>14</dep></entry>
@ -5567,7 +5267,7 @@
<animation>
<type>rotate</type>
<object-name>SpdBrk</object-name>
<property>fdm/jsbsim/spoilers/speedbrake-nul</property>
<property>fdm/jsbsim/spoilers/main-lever</property>
<factor>45</factor>
<axis>
<object-name>SpdBrk.axis</object-name>
@ -5577,7 +5277,7 @@
<animation>
<type>translate</type>
<object-name>SpdBrk</object-name>
<property>controls/flight/speedbrake-arm</property>
<property>fdm/jsbsim/spoilers/lever-arm</property>
<factor>-0.006</factor>
<axis>
<x>1</x>
@ -5589,7 +5289,7 @@
<animation>
<type>translate</type>
<object-name>SpdBrk</object-name>
<property>controls/flight/speedbrake-arm</property>
<property>fdm/jsbsim/spoilers/lever-arm</property>
<factor>0.006</factor>
<axis>
<x>0</x>
@ -5878,7 +5578,7 @@
<name>Engine 1 throttle lever</name>
<type>rotate</type>
<object-name>thr_l</object-name>
<property>controls/engines/engine[0]/throttle-lever</property>
<property>fdm/jsbsim/fcs/throttle-lever[0]</property>
<interpolation>
<entry><ind>0.00000</ind><dep> 0</dep></entry>
<entry><ind>0.00999</ind><dep> 0</dep></entry>
@ -5903,7 +5603,7 @@
<name>Engine 1 throttle lever rev</name>
<type>rotate</type>
<object-name>thr_l</object-name>
<property>controls/engines/engine[0]/reverser</property>
<property>fdm/jsbsim/fcs/reverse-lever[0]</property>
<factor>-3.5</factor>
<axis>
<object-name>trim.axis</object-name>
@ -5913,7 +5613,7 @@
<name>Engine 1 throttle lever rev 2</name>
<type>rotate</type>
<object-name>thr_l</object-name>
<property>controls/engines/engine[0]/throttle-rev</property>
<property>fdm/jsbsim/fcs/reverse-thr-lever[0]</property>
<interpolation>
<entry><ind>0.00</ind><dep> 0</dep></entry>
<entry><ind>0.50</ind><dep>-20</dep></entry>
@ -5953,7 +5653,7 @@
<name>Engine 2 throttle lever</name>
<type>rotate</type>
<object-name>thr_r</object-name>
<property>controls/engines/engine[1]/throttle-lever</property>
<property>fdm/jsbsim/fcs/throttle-lever[1]</property>
<interpolation>
<entry><ind>0.00000</ind><dep> 0</dep></entry>
<entry><ind>0.00999</ind><dep> 0</dep></entry>
@ -5978,7 +5678,7 @@
<name>Engine 2 throttle lever rev</name>
<type>rotate</type>
<object-name>thr_r</object-name>
<property>controls/engines/engine[1]/reverser</property>
<property>fdm/jsbsim/fcs/reverse-lever[1]</property>
<factor>-3.5</factor>
<axis>
<object-name>trim.axis</object-name>
@ -5988,7 +5688,7 @@
<name>Engine 2 throttle lever rev 2</name>
<type>rotate</type>
<object-name>thr_r</object-name>
<property>controls/engines/engine[1]/throttle-rev</property>
<property>fdm/jsbsim/fcs/reverse-thr-lever[1]</property>
<interpolation>
<entry><ind>0.00</ind><dep> 0</dep></entry>
<entry><ind>0.50</ind><dep>-20</dep></entry>

View file

@ -35,7 +35,7 @@
<object-name>BRT</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<condition>
<greater-than-equals>
@ -58,7 +58,7 @@
<object-name>DIM</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<condition>
<greater-than-equals>
@ -81,7 +81,7 @@
<object-name>radnav</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.pagebutton("radnav", 0);</script>
@ -106,7 +106,7 @@
<object-name>init</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.pagebutton("init", 0);</script>
@ -131,7 +131,7 @@
<object-name>data</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.pagebutton("data", 0);</script>
@ -156,7 +156,7 @@
<object-name>mcdu</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.pagebutton("mcdu", 0);</script>
@ -181,7 +181,7 @@
<object-name>perf</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.pagebutton("perf", 0);</script>
@ -206,7 +206,7 @@
<object-name>f-pln</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.pagebutton("f-pln", 0);</script>
@ -231,7 +231,7 @@
<object-name>fuel-pred</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.pagebutton("fuel-pred", 0);</script>
@ -256,7 +256,7 @@
<object-name>L1</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.lskbutton("1", 0);</script>
@ -276,7 +276,7 @@
</action>
<action>
<button>1</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.lskbutton_b("1", 0);</script>
@ -300,7 +300,7 @@
<object-name>L2</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.lskbutton("2", 0);</script>
@ -320,7 +320,7 @@
</action>
<action>
<button>1</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.lskbutton_b("2", 0);</script>
@ -344,7 +344,7 @@
<object-name>L3</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.lskbutton("3", 0);</script>
@ -364,7 +364,7 @@
</action>
<action>
<button>1</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.lskbutton_b("3", 0);</script>
@ -388,7 +388,7 @@
<object-name>L4</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.lskbutton("4", 0);</script>
@ -408,7 +408,7 @@
</action>
<action>
<button>1</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.lskbutton_b("4", 0);</script>
@ -432,7 +432,7 @@
<object-name>L5</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.lskbutton("5", 0);</script>
@ -452,7 +452,7 @@
</action>
<action>
<button>1</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.lskbutton_b("5", 0);</script>
@ -476,7 +476,7 @@
<object-name>L6</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.lskbutton("6", 0);</script>
@ -496,7 +496,7 @@
</action>
<action>
<button>1</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.lskbutton_b("6", 0);</script>
@ -521,7 +521,7 @@
<object-name>R1</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.rskbutton("1", 0);</script>
@ -541,7 +541,7 @@
</action>
<action>
<button>1</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.rskbutton_b("1", 0);</script>
@ -565,7 +565,7 @@
<object-name>R2</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.rskbutton("2", 0);</script>
@ -585,7 +585,7 @@
</action>
<action>
<button>1</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.rskbutton_b("2", 0);</script>
@ -609,7 +609,7 @@
<object-name>R3</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.rskbutton("3", 0);</script>
@ -629,7 +629,7 @@
</action>
<action>
<button>1</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.rskbutton_b("3", 0);</script>
@ -653,7 +653,7 @@
<object-name>R4</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.rskbutton("4", 0);</script>
@ -673,7 +673,7 @@
</action>
<action>
<button>1</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.rskbutton_b("4", 0);</script>
@ -697,7 +697,7 @@
<object-name>R5</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.rskbutton("5", 0);</script>
@ -717,7 +717,7 @@
</action>
<action>
<button>1</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.rskbutton_b("5", 0);</script>
@ -741,7 +741,7 @@
<object-name>R6</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.rskbutton("6", 0);</script>
@ -761,7 +761,7 @@
</action>
<action>
<button>1</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.rskbutton_b("6", 0);</script>

View file

@ -35,7 +35,7 @@
<object-name>BRT</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<condition>
<greater-than-equals>
@ -58,7 +58,7 @@
<object-name>DIM</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<condition>
<greater-than-equals>
@ -81,7 +81,7 @@
<object-name>radnav</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.pagebutton("radnav", 1);</script>
@ -106,7 +106,7 @@
<object-name>init</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.pagebutton("init", 1);</script>
@ -131,7 +131,7 @@
<object-name>data</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.pagebutton("data", 1);</script>
@ -156,7 +156,7 @@
<object-name>mcdu</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.pagebutton("mcdu", 1);</script>
@ -181,7 +181,7 @@
<object-name>perf</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.pagebutton("perf", 1);</script>
@ -206,7 +206,7 @@
<object-name>f-pln</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.pagebutton("f-pln", 1);</script>
@ -231,7 +231,7 @@
<object-name>fuel-pred</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.pagebutton("fuel-pred", 1);</script>
@ -256,7 +256,7 @@
<object-name>L1</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.lskbutton("1", 1);</script>
@ -276,7 +276,7 @@
</action>
<action>
<button>1</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.lskbutton_b("1", 1);</script>
@ -300,7 +300,7 @@
<object-name>L2</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.lskbutton("2", 1);</script>
@ -320,7 +320,7 @@
</action>
<action>
<button>1</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.lskbutton_b("2", 1);</script>
@ -344,7 +344,7 @@
<object-name>L3</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.lskbutton("3", 1);</script>
@ -364,7 +364,7 @@
</action>
<action>
<button>1</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.lskbutton_b("3", 1);</script>
@ -388,7 +388,7 @@
<object-name>L4</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.lskbutton("4", 1);</script>
@ -408,7 +408,7 @@
</action>
<action>
<button>1</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.lskbutton_b("4", 1);</script>
@ -432,7 +432,7 @@
<object-name>L5</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.lskbutton("5", 1);</script>
@ -452,7 +452,7 @@
</action>
<action>
<button>1</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.lskbutton_b("5", 1);</script>
@ -476,7 +476,7 @@
<object-name>L6</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.lskbutton("6", 1);</script>
@ -496,7 +496,7 @@
</action>
<action>
<button>1</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.lskbutton_b("6", 1);</script>
@ -521,7 +521,7 @@
<object-name>R1</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.rskbutton("1", 1);</script>
@ -541,7 +541,7 @@
</action>
<action>
<button>1</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.rskbutton_b("1", 1);</script>
@ -565,7 +565,7 @@
<object-name>R2</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.rskbutton("2", 1);</script>
@ -585,7 +585,7 @@
</action>
<action>
<button>1</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.rskbutton_b("2", 1);</script>
@ -609,7 +609,7 @@
<object-name>R3</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.rskbutton("3", 1);</script>
@ -629,7 +629,7 @@
</action>
<action>
<button>1</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.rskbutton_b("3", 1);</script>
@ -653,7 +653,7 @@
<object-name>R4</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.rskbutton("4", 1);</script>
@ -673,7 +673,7 @@
</action>
<action>
<button>1</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.rskbutton_b("4", 1);</script>
@ -697,7 +697,7 @@
<object-name>R5</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.rskbutton("5", 1);</script>
@ -717,7 +717,7 @@
</action>
<action>
<button>1</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.rskbutton_b("5", 1);</script>
@ -741,7 +741,7 @@
<object-name>R6</object-name>
<action>
<button>0</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.rskbutton("6", 1);</script>
@ -761,7 +761,7 @@
</action>
<action>
<button>1</button>
<repeatable>true</repeatable>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>mcdu.rskbutton_b("6", 1);</script>

View file

@ -379,7 +379,7 @@ setlistener("/flight-management/control/capture-leg", func(n) {
}, 0, 0);
var showNd = func(nd = nil) {
if(nd == nil) nd = "main";
var dlg = canvas.Window.new([512, 512], "dialog");
if (nd == nil) nd = "main";
var dlg = canvas.Window.new([512, 512], "dialog").set("resize", 1);
dlg.setCanvas(nd_display[nd]);
}

View file

@ -4680,7 +4680,7 @@
<repeatable>false</repeatable>
<binding>
<command>property-toggle</command>
<property>controls/lighting/beacon</property>
<property>controls/switches/beacon</property>
</binding>
<binding>
<command>nasal</command>
@ -4692,7 +4692,7 @@
<name>Beacon lights rotate</name>
<type>rotate</type>
<object-name>BeaconLtSwtch</object-name>
<property>controls/lighting/beacon</property>
<property>controls/switches/beacon</property>
<interpolation>
<entry><ind>0</ind><dep>35</dep></entry>
<entry><ind>1</ind><dep>-35</dep></entry>
@ -4718,7 +4718,7 @@
<repeatable>false</repeatable>
<binding>
<command>property-toggle</command>
<property>controls/lighting/wing-lights</property>
<property>controls/switches/wing-lights</property>
</binding>
<binding>
<command>nasal</command>
@ -4730,7 +4730,7 @@
<name>Wing lights rotate</name>
<type>rotate</type>
<object-name>WingLtSwtch</object-name>
<property>controls/lighting/wing-lights</property>
<property>controls/switches/wing-lights</property>
<interpolation>
<entry><ind>0</ind><dep>35</dep></entry>
<entry><ind>1</ind><dep>-35</dep></entry>
@ -4868,7 +4868,7 @@
<repeatable>false</repeatable>
<binding>
<command>property-cycle</command>
<property>controls/lighting/landing-lights[1]</property>
<property>controls/switches/landing-lights-l</property>
<value>0</value>
<value>0.5</value>
<value>1</value>
@ -4883,7 +4883,7 @@
<repeatable>false</repeatable>
<binding>
<command>property-cycle</command>
<property>controls/lighting/landing-lights[1]</property>
<property>controls/switches/landing-lights-l</property>
<value>1</value>
<value>0.5</value>
<value>0</value>
@ -4904,7 +4904,7 @@
<repeatable>false</repeatable>
<binding>
<command>property-cycle</command>
<property>controls/lighting/landing-lights[2]</property>
<property>controls/switches/landing-lights-r</property>
<value>0</value>
<value>0.5</value>
<value>1</value>
@ -4919,7 +4919,7 @@
<repeatable>false</repeatable>
<binding>
<command>property-cycle</command>
<property>controls/lighting/landing-lights[2]</property>
<property>controls/switches/landing-lights-r</property>
<value>1</value>
<value>0.5</value>
<value>0</value>
@ -4935,7 +4935,7 @@
<name>landing light rotate</name>
<type>rotate</type>
<object-name>LandingLtLSwtch</object-name>
<property>controls/lighting/landing-lights[1]</property>
<property>controls/switches/landing-lights-l</property>
<interpolation>
<entry><ind>0</ind><dep>35</dep></entry>
<entry><ind>1</ind><dep>-35</dep></entry>
@ -4956,7 +4956,7 @@
<name>landing light rotate</name>
<type>rotate</type>
<object-name>LandingLtRSwtch</object-name>
<property>controls/lighting/landing-lights[2]</property>
<property>controls/switches/landing-lights-r</property>
<interpolation>
<entry><ind>0</ind><dep>35</dep></entry>
<entry><ind>1</ind><dep>-35</dep></entry>

View file

@ -88,7 +88,7 @@ var at_input_spd_kts = props.globals.getNode("/it-autoflight/input/spd-kts", 1);
var fd_roll = props.globals.getNode("/it-autoflight/fd/roll-bar", 1);
var fd_pitch = props.globals.getNode("/it-autoflight/fd/pitch-bar", 1);
var decision = props.globals.getNode("/instrumentation/mk-viii/inputs/arinc429/decision-height", 1);
var skid_slip = props.globals.getNode("/instrumentation/slip-skid-ball/indicated-slip-skid", 1);
var slip_skid = props.globals.getNode("/instrumentation/pfd/slip-skid", 1);
var FMGCphase = props.globals.getNode("/FMGC/status/phase", 1);
var loc = props.globals.getNode("/instrumentation/nav[0]/heading-needle-deflection-norm", 1);
var gs = props.globals.getNode("/instrumentation/nav[0]/gs-needle-deflection-norm", 1);
@ -732,7 +732,7 @@ var canvas_PFD_base = {
me.AI_horizon_ground_rot.setRotation(-roll_cur * D2R, me["AI_center"].getCenter());
me.AI_horizon_sky_rot.setRotation(-roll_cur * D2R, me["AI_center"].getCenter());
me["AI_slipskid"].setTranslation(math.clamp(skid_slip.getValue(), -7, 7) * -15, 0);
me["AI_slipskid"].setTranslation(math.clamp(slip_skid.getValue(), -15, 15) * 7, 0);
me["AI_bank"].setRotation(-roll_cur * D2R);
if (fbw_law.getValue() == 0) {

View file

@ -42,8 +42,8 @@
id="namedview371"
showgrid="false"
inkscape:zoom="0.70710678"
inkscape:cx="938.79281"
inkscape:cy="528.72437"
inkscape:cx="1179.7256"
inkscape:cy="481.71975"
inkscape:window-x="1592"
inkscape:window-y="-8"
inkscape:window-maximized="1"
@ -2549,61 +2549,16 @@
transform="matrix(0.83705476,-0.54711912,0.83705476,0.54711912,0,0)"
inkscape:label="#rect4872" />
<g
id="GS_scale"
inkscape:label="#g4569"
transform="translate(5.2325902,0)">
id="ALT_group2"
inkscape:label="#g4828">
<rect
transform="matrix(0,1,-1,0,0,0)"
y="-741.82098"
y="-747.05353"
x="509.50464"
height="49.153526"
width="7.7970567"
id="rect4925"
style="fill:#c9d121;fill-opacity:1;stroke:none;stroke-width:4.4806304;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<g
transform="translate(0,-1.0792028)"
id="g4531">
<path
sodipodi:nodetypes="zzzzz"
inkscape:connector-curvature="0"
id="circle4927"
d="m 714.66382,422.10642 c -3.51657,0 -6.36731,-2.85066 -6.36731,-6.36712 0,-3.51646 2.85073,-6.36713 6.36731,-6.36713 3.51658,0 6.36732,2.85066 6.36732,6.36713 0,3.51648 -2.85075,6.36712 -6.36732,6.36712 z"
style="fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:2.39996552;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
sodipodi:nodetypes="zzzzz"
inkscape:connector-curvature="0"
id="circle4929"
d="m 714.66382,324.13136 c -3.51657,0 -6.36731,-2.85066 -6.36731,-6.36712 0,-3.51646 2.85073,-6.36713 6.36731,-6.36713 3.51658,0 6.36732,2.85066 6.36732,6.36713 0,3.51648 -2.85075,6.36712 -6.36732,6.36712 z"
style="fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:2.39996552;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
<g
id="g4565">
<path
sodipodi:nodetypes="zzzzz"
inkscape:connector-curvature="0"
id="circle4931"
d="m 714.66382,716.47762 c -3.51657,0 -6.36731,-2.85066 -6.36731,-6.36712 0,-3.51647 2.85073,-6.36714 6.36731,-6.36714 3.51658,0 6.36732,2.85066 6.36732,6.36714 0,3.51647 -2.85075,6.36712 -6.36732,6.36712 z"
style="fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:2.39996552;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
sodipodi:nodetypes="zzzzz"
inkscape:connector-curvature="0"
id="circle4933"
d="m 714.66382,618.50242 c -3.51657,0 -6.36731,-2.85066 -6.36731,-6.36712 0,-3.51647 2.85073,-6.36714 6.36731,-6.36714 3.51658,0 6.36732,2.85066 6.36732,6.36714 0,3.51647 -2.85075,6.36712 -6.36732,6.36712 z"
style="fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:2.39996552;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
</g>
<rect
inkscape:label="#rect4872"
transform="matrix(0.54714118,0.83704034,-0.54714118,0.83704034,0,0)"
y="-368.9328"
x="949.0885"
height="33.211578"
width="33.211578"
id="GS_pointer"
style="fill:none;fill-opacity:1;stroke:#b055be;stroke-width:4.03498697;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<g
id="ALT_group2"
inkscape:label="#g4828">
<text
id="QNH_std"
y="885.26117"
@ -2726,6 +2681,59 @@
y="885.26117"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38.39944839px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#179ab7;fill-opacity:1;stroke-width:0.75">1013</tspan></text>
</g>
<g
id="GS_scale"
inkscape:label="#g4569"
transform="translate(5.2325902,0)">
<rect
style="fill:#c9d121;fill-opacity:1;stroke:none;stroke-width:4.4806304;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect4898"
width="7.7970567"
height="49.153526"
x="509.50464"
y="-741.82098"
transform="matrix(0,1,-1,0,0,0)" />
<g
transform="translate(0,-1.0792028)"
id="g4531">
<path
sodipodi:nodetypes="zzzzz"
inkscape:connector-curvature="0"
id="circle4927"
d="m 714.66382,422.10642 c -3.51657,0 -6.36731,-2.85066 -6.36731,-6.36712 0,-3.51646 2.85073,-6.36713 6.36731,-6.36713 3.51658,0 6.36732,2.85066 6.36732,6.36713 0,3.51648 -2.85075,6.36712 -6.36732,6.36712 z"
style="fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:2.39996552;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
sodipodi:nodetypes="zzzzz"
inkscape:connector-curvature="0"
id="circle4929"
d="m 714.66382,324.13136 c -3.51657,0 -6.36731,-2.85066 -6.36731,-6.36712 0,-3.51646 2.85073,-6.36713 6.36731,-6.36713 3.51658,0 6.36732,2.85066 6.36732,6.36713 0,3.51648 -2.85075,6.36712 -6.36732,6.36712 z"
style="fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:2.39996552;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
<g
id="g4565">
<path
sodipodi:nodetypes="zzzzz"
inkscape:connector-curvature="0"
id="circle4931"
d="m 714.66382,716.47762 c -3.51657,0 -6.36731,-2.85066 -6.36731,-6.36712 0,-3.51647 2.85073,-6.36714 6.36731,-6.36714 3.51658,0 6.36732,2.85066 6.36732,6.36714 0,3.51647 -2.85075,6.36712 -6.36732,6.36712 z"
style="fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:2.39996552;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
sodipodi:nodetypes="zzzzz"
inkscape:connector-curvature="0"
id="circle4933"
d="m 714.66382,618.50242 c -3.51657,0 -6.36731,-2.85066 -6.36731,-6.36712 0,-3.51647 2.85073,-6.36714 6.36731,-6.36714 3.51658,0 6.36732,2.85066 6.36732,6.36714 0,3.51647 -2.85075,6.36712 -6.36732,6.36712 z"
style="fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:2.39996552;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
</g>
<rect
inkscape:label="#rect4872"
transform="matrix(0.54714118,0.83704034,-0.54714118,0.83704034,0,0)"
y="-368.9328"
x="949.0885"
height="33.211578"
width="33.211578"
id="GS_pointer"
style="fill:none;fill-opacity:1;stroke:#b055be;stroke-width:4.03498697;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<rect
style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.4000001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
id="ALT_mask"

Before

(image error) Size: 277 KiB

After

(image error) Size: 277 KiB

View file

@ -7,8 +7,6 @@
<path>green-navlight.ac</path>
<nopreview/>
<effect>
<inherits-from>Aircraft/IDG-A32X/Models/lights/ALS/green-navlight</inherits-from>
<object-name>green-navlightals</object-name>

View file

@ -13,10 +13,10 @@
<type>select</type>
<object-name>Light</object-name>
<condition>
<greater-than>
<property>controls/lighting/nav-lights-switch</property>
<value>0</value>
</greater-than>
<equals>
<property>/sim/model/lights/nav-lights</property>
<value>1</value>
</equals>
</condition>
</animation>

View file

@ -25,10 +25,16 @@
<object-name>Cone</object-name>
<condition>
<and>
<greater-than-equals>
<property>systems/electrical/bus/ac-ess</property>
<value>110</value>
</greater-than-equals>
<or>
<greater-than-equals>
<property>systems/electrical/bus/ac1</property>
<value>110</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/ac2</property>
<value>110</value>
</greater-than-equals>
</or>
<greater-than-equals>
<property>/sim/model/lights/nose-lights</property>
<value>0.5</value>

View file

@ -26,7 +26,7 @@
<condition>
<and>
<greater-than-equals>
<property>systems/electrical/bus/ac-ess</property>
<property>systems/electrical/bus/ac1</property>
<value>110</value>
</greater-than-equals>
<property>controls/lighting/landing-lights[2]</property>

View file

@ -28,7 +28,7 @@
<condition>
<and>
<greater-than-equals>
<property>systems/electrical/bus/ac-ess</property>
<property>systems/electrical/bus/ac2</property>
<value>110</value>
</greater-than-equals>
<property>controls/lighting/landing-lights[2]</property>

View file

@ -13,10 +13,10 @@
<type>select</type>
<object-name>Light</object-name>
<condition>
<greater-than>
<property>controls/lighting/nav-lights-switch</property>
<value>0</value>
</greater-than>
<equals>
<property>/sim/model/lights/nav-lights</property>
<value>1</value>
</equals>
</condition>
</animation>

View file

@ -13,10 +13,10 @@
<type>select</type>
<object-name>Light</object-name>
<condition>
<greater-than>
<property>controls/lighting/nav-lights-switch</property>
<value>0</value>
</greater-than>
<equals>
<property>/sim/model/lights/nav-lights</property>
<value>1</value>
</equals>
</condition>
</animation>

View file

@ -614,6 +614,12 @@ var vertical = func {
}
}
var disarmGS = func {
alandt.stop();
alandt1.stop();
setprop("/it-autoflight/output/appr-armed", 0);
}
# Helpers
var toggle_trkfpa = func {
var trkfpa = getprop("/it-autoflight/custom/trk-fpa");

View file

@ -275,7 +275,11 @@ var rskbutton = func(btn, i) {
perfCRZInput("R6",i);
} else if ((getprop("/MCDU[" ~ i ~ "]/page") == "DATA") or (getprop("/MCDU[" ~ i ~ "]/page") == "PRINTFUNC") or (getprop("/MCDU[" ~ i ~ "]/page") == "PRINTFUNC2")) {
if (getprop("/MCDU[" ~ i ~ "]/scratchpad") != "AOC DISABLED") {
setprop("/MCDU[" ~ i ~ "]/last-scratchpad", getprop("/MCDU[" ~ i ~ "]/scratchpad"));
if (getprop("/MCDU[" ~ i ~ "]/scratchpad-msg") == 1) {
setprop("/MCDU[" ~ i ~ "]/last-scratchpad", "");
} else {
setprop("/MCDU[" ~ i ~ "]/last-scratchpad", getprop("/MCDU[" ~ i ~ "]/scratchpad"));
}
}
setprop("/MCDU[" ~ i ~ "]/scratchpad-msg", 1);
setprop("/MCDU[" ~ i ~ "]/scratchpad", "AOC DISABLED");
@ -463,7 +467,7 @@ var button = func(btn, i) {
setprop("/MCDU[" ~ i ~ "]/scratchpad-msg", 0);
} else if (size(scratchpad) > 0) {
setprop("/MCDU[" ~ i ~ "]/last-scratchpad", "");
setprop("/MCDU[" ~ i ~ "]/scratchpad", left(scratchpad, size(scratchpad)-1));
setprop("/MCDU[" ~ i ~ "]/scratchpad", left(scratchpad, size(scratchpad) - 1));
setprop("/MCDU[" ~ i ~ "]/scratchpad-msg", 0);
}
} else if (btn == "0") {
@ -520,7 +524,7 @@ var button = func(btn, i) {
var notAllowed = func(i) {
if (getprop("/MCDU[" ~ i ~ "]/scratchpad") != "NOT ALLOWED") {
if (getprop("/MCDU[" ~ i ~ "]/scratchpad-msg") == 1) { # Messages clear after NOT ALLOWED
if (getprop("/MCDU[" ~ i ~ "]/scratchpad-msg") == 1) {
setprop("/MCDU[" ~ i ~ "]/last-scratchpad", "");
} else {
setprop("/MCDU[" ~ i ~ "]/last-scratchpad", getprop("/MCDU[" ~ i ~ "]/scratchpad"));

View file

@ -35,6 +35,10 @@ var variousReset = func {
setprop("/controls/switches/wiperRspd", 0); # -1 = INTM 0 = OFF 1 = LO 2 = HI
setprop("/controls/lighting/strobe", 0);
setprop("/controls/lighting/beacon", 0);
setprop("/controls/switches/beacon", 0);
setprop("/controls/switches/wing-lights", 0);
setprop("/controls/switches/landing-lights-l", 0);
setprop("/controls/switches/landing-lights-r", 0);
setprop("/controls/lighting/wing-lights", 0);
setprop("/controls/lighting/nav-lights-switch", 0);
setprop("/controls/lighting/landing-lights[1]", 0);
@ -160,66 +164,372 @@ var CVR_test = func {
}
}
var mcpSPDKnbPull = func {
setprop("/it-autoflight/input/spd-managed", 0);
fmgc.ManagedSPD.stop();
var ias = getprop("/instrumentation/airspeed-indicator/indicated-speed-kt");
var mach = getprop("/instrumentation/airspeed-indicator/indicated-mach");
if (getprop("/it-autoflight/input/kts-mach") == 0) {
if (ias >= 100 and ias <= 360) {
setprop("/it-autoflight/input/spd-kts", math.round(ias, 1));
} else if (ias < 100) {
setprop("/it-autoflight/input/spd-kts", 100);
} else if (ias > 360) {
setprop("/it-autoflight/input/spd-kts", 360);
}
} else if (getprop("/it-autoflight/input/kts-mach") == 1) {
if (mach >= 0.50 and mach <= 0.95) {
setprop("/it-autoflight/input/spd-mach", math.round(mach, 0.001));
} else if (mach < 0.50) {
setprop("/it-autoflight/input/spd-mach", 0.50);
} else if (mach > 0.95) {
setprop("/it-autoflight/input/spd-mach", 0.95);
}
}
}
var ktsMach = props.globals.getNode("/it-autoflight/input/kts-mach", 1);
var iasSet = props.globals.getNode("/it-autoflight/input/spd-kts", 1);
var machSet = props.globals.getNode("/it-autoflight/input/spd-mach", 1);
var hdgSet = props.globals.getNode("/it-autoflight/input/hdg", 1);
var altSet = props.globals.getNode("/it-autoflight/input/alt", 1);
var altSetMode = props.globals.getNode("/it-autoflight/config/altitude-dial-mode", 1);
var vsSet = props.globals.getNode("/it-autoflight/input/vs", 1);
var fpaSet = props.globals.getNode("/it-autoflight/input/fpa", 1);
var iasNow = props.globals.getNode("/instrumentation/airspeed-indicator/indicated-speed-kt", 1);
var machNow = props.globals.getNode("/instrumentation/airspeed-indicator/indicated-mach", 1);
var spdManaged = props.globals.getNode("/it-autoflight/input/spd-managed", 1);
var showHDG = props.globals.getNode("/it-autoflight/custom/show-hdg", 1);
var trkfpaSW = props.globals.getNode("/it-autoflight/custom/trk-fpa", 1);
var latMode = props.globals.getNode("/it-autoflight/output/lat", 1);
var vertMode = props.globals.getNode("/it-autoflight/output/vert", 1);
var locArm = props.globals.getNode("/it-autoflight/output/loc-armed", 1);
var apprArm = props.globals.getNode("/it-autoflight/output/appr-armed", 1);
var dcEss = props.globals.getNode("/systems/electrical/bus/dc-ess", 1);
var fd1 = props.globals.getNode("/it-autoflight/output/fd1", 1);
var fd2 = props.globals.getNode("/it-autoflight/output/fd2", 1);
var ap1 = props.globals.getNode("/it-autoflight/output/ap1", 1);
var ap2 = props.globals.getNode("/it-autoflight/output/ap2", 1);
var athr = props.globals.getNode("/it-autoflight/output/athr", 1);
var mcpSPDKnbPush = func {
if (getprop("/FMGC/internal/cruise-lvl-set") == 1 and getprop("/FMGC/internal/cost-index-set") == 1) {
setprop("/it-autoflight/input/spd-managed", 1);
fmgc.ManagedSPD.start();
}
}
var mcpHDGKnbPull = func {
if (getprop("/it-autoflight/output/fd1") == 1 or getprop("/it-autoflight/output/fd2") == 1 or getprop("/it-autoflight/output/ap1") == 1 or getprop("/it-autoflight/output/ap2") == 1) {
var latmode = getprop("/it-autoflight/output/lat");
var showhdg = getprop("/it-autoflight/custom/show-hdg");
if (latmode == 0 or showhdg == 0) {
setprop("/it-autoflight/input/lat", 3);
setprop("/it-autoflight/custom/show-hdg", 1);
var APPanel = {
AP1: func() {
if (dcEss.getValue() >= 25) {
if (!ap1.getBoolValue()) {
setprop("it-autoflight/input/ap1", 1);
} else {
libraries.apOff("hard", 1);
}
}
},
AP2: func() {
if (dcEss.getValue() >= 25) {
if (!ap2.getBoolValue()) {
setprop("it-autoflight/input/ap2", 1);
} else {
libraries.apOff("hard", 2);
}
}
},
ATHR: func() {
if (dcEss.getValue() >= 25) {
if (!athr.getBoolValue()) {
setprop("it-autoflight/input/athr", 1);
} else {
libraries.athrOff("hard");
}
}
},
FD1: func() {
if (dcEss.getValue() >= 25) {
if (!fd1.getBoolValue()) {
setprop("it-autoflight/input/fd1", 1);
} else {
setprop("it-autoflight/input/fd1", 0);
}
}
},
FD2: func() {
if (dcEss.getValue() >= 25) {
if (!fd2.getBoolValue()) {
setprop("it-autoflight/input/fd2", 1);
} else {
setprop("it-autoflight/input/fd2", 0);
}
}
},
APDiscSoft: func() {
if (ap1.getBoolValue() or ap2.getBoolValue()) {
libraries.apOff("soft", 0);
} else {
setprop("/it-autoflight/input/lat", 0);
setprop("/it-autoflight/custom/show-hdg", 1);
if (getprop("/it-autoflight/sound/apoffsound") == 1 or getprop("/it-autoflight/sound/apoffsound2") == 1) {
setprop("/it-autoflight/sound/apoffsound", 0);
setprop("/it-autoflight/sound/apoffsound2", 0);
}
setprop("/it-autoflight/output/ap-warning", 0);
setprop("/ECAM/warnings/master-warning-light", 0);
}
}
}
},
ATDiscSoft: func() {
if (athr.getBoolValue()) {
libraries.athrOff("soft");
setprop("/ECAM/warnings/master-caution-light", 1);
} else {
if (getprop("/it-autoflight/output/athr-warning") == 1) {
setprop("/it-autoflight/output/athr-warning", 0);
setprop("/ECAM/warnings/master-caution-light", 0);
}
}
},
IASMach: func() {
if (dcEss.getValue() >= 25) {
if (ktsMach.getBoolValue()) {
ktsMach.setBoolValue(0);
} else {
ktsMach.setBoolValue(1);
}
}
},
SPDPush: func() {
if (dcEss.getValue() >= 25) {
if (getprop("/FMGC/internal/cruise-lvl-set") == 1 and getprop("/FMGC/internal/cost-index-set") == 1) {
spdManaged.setBoolValue(1);
fmgc.ManagedSPD.start();
}
}
},
SPDPull: func() {
if (dcEss.getValue() >= 25) {
spdManaged.setBoolValue(0);
fmgc.ManagedSPD.stop();
var ias = iasNow.getValue();
var mach = machNow.getValue();
if (!ktsMach.getBoolValue()) {
if (ias >= 100 and ias <= 350) {
iasSet.setValue(math.round(ias));
} else if (ias < 100) {
iasSet.setValue(100);
} else if (ias > 350) {
iasSet.setValue(350);
}
} else if (ktsMach.getBoolValue()) {
if (mach >= 0.50 and mach <= 0.82) {
machSet.setValue(math.round(mach, 0.001));
} else if (mach < 0.50) {
machSet.setValue(0.50);
} else if (mach > 0.82) {
machSet.setValue(0.82);
}
}
}
},
SPDAdjust: func(d) {
if (dcEss.getValue() >= 25) {
if (!spdManaged.getBoolValue()) {
if (ktsMach.getBoolValue()) {
var machTemp = machSet.getValue();
if (d == 1) {
machTemp = math.round(machTemp + 0.001, 0.001); # Kill floating point error
} else if (d == -1) {
machTemp = math.round(machTemp - 0.001, 0.001); # Kill floating point error
} else if (d == 10) {
machTemp = math.round(machTemp + 0.01, 0.01); # Kill floating point error
} else if (d == -10) {
machTemp = math.round(machTemp - 0.01, 0.01); # Kill floating point error
}
if (machTemp < 0.50) {
machSet.setValue(0.50);
} else if (machTemp > 0.82) {
machSet.setValue(0.82);
} else {
machSet.setValue(machTemp);
}
} else {
var iasTemp = iasSet.getValue();
if (d == 1) {
iasTemp = iasTemp + 1;
} else if (d == -1) {
iasTemp = iasTemp - 1;
} else if (d == 10) {
iasTemp = iasTemp + 10;
} else if (d == -10) {
iasTemp = iasTemp - 10;
}
if (iasTemp < 100) {
iasSet.setValue(100);
} else if (iasTemp > 350) {
iasSet.setValue(350);
} else {
iasSet.setValue(iasTemp);
}
}
}
}
},
HDGPush: func() {
if (fd1.getBoolValue() or fd2.getBoolValue() or ap1.getBoolValue() or ap2.getBoolValue()) {
setprop("/it-autoflight/input/lat", 1);
}
},
HDGPull: func() {
if (fd1.getBoolValue() or fd2.getBoolValue() or ap1.getBoolValue() or ap2.getBoolValue()) {
if (latMode.getValue() == 0 or !showHDG.getBoolValue()) {
setprop("/it-autoflight/input/lat", 3);
showHDG.setBoolValue(1);
} else {
setprop("/it-autoflight/input/lat", 0);
showHDG.setBoolValue(1);
}
}
},
HDGAdjust: func(d) {
if (dcEss.getValue() >= 25) {
if (latMode.getValue() != 0) {
hdgInput();
}
if (showHDG.getBoolValue()) {
var hdgTemp = hdgSet.getValue();
if (d == 1) {
hdgTemp = hdgTemp + 1;
} else if (d == -1) {
hdgTemp = hdgTemp - 1;
} else if (d == 10) {
hdgTemp = hdgTemp + 10;
} else if (d == -10) {
hdgTemp = hdgTemp - 10;
}
if (hdgTemp < 0.5) {
hdgSet.setValue(hdgTemp + 360);
} else if (hdgTemp >= 360.5) {
hdgSet.setValue(hdgTemp - 360);
} else {
hdgSet.setValue(hdgTemp);
}
}
}
},
LOCButton: func() {
if (dcEss.getValue() >= 25) {
var vertTemp = vertMode.getValue();
if ((locArm.getBoolValue() or latMode.getValue() == 2) and !apprArm.getBoolValue() and vertTemp != 2 and vertTemp != 6) {
setprop("/it-autoflight/input/lat", 0);
} else {
setprop("/it-autoflight/input/lat", 2);
if (apprArm.getBoolValue() or vertTemp == 2) {
fmgc.disarmGS();
}
}
}
},
TRKFPA: func() {
if (dcEss.getValue() >= 25) {
fmgc.toggle_trkfpa();
}
},
ALTPush: func() {
if (dcEss.getValue() >= 25) {
# setprop("/it-autoflight/input/vert", 8); # He don't work yet m8
}
},
ALTPull: func() {
if (dcEss.getValue() >= 25) {
setprop("/it-autoflight/input/vert", 4);
}
},
ALTAdjust: func(d) {
if (dcEss.getValue() >= 25) {
var altTemp = altSet.getValue();
if (d == 1) {
if (altSetMode.getBoolValue()) {
altTemp = altTemp + 1000;
} else {
altTemp = altTemp + 100;
}
} else if (d == -1) {
if (altSetMode.getBoolValue()) {
altTemp = altTemp - 1000;
} else {
altTemp = altTemp - 100;
}
} else if (d == 2) {
altTemp = altTemp + 100;
} else if (d == -2) {
altTemp = altTemp - 100;
} else if (d == 10) {
altTemp = altTemp + 1000;
} else if (d == -10) {
altTemp = altTemp - 1000;
}
if (altTemp < 0) {
altSet.setValue(0);
} else if (altTemp > 50000) {
altSet.setValue(50000);
} else {
altSet.setValue(altTemp);
}
}
},
VSPush: func() {
if (dcEss.getValue() >= 25) {
if (trkfpaSW.getBoolValue()) {
setprop("/it-autoflight/input/vert", 5);
setprop("/it-autoflight/input/fpa", 0);
} else {
setprop("/it-autoflight/input/vert", 1);
setprop("/it-autoflight/input/vs", 0);
}
}
},
VSPull: func() {
if (dcEss.getValue() >= 25) {
if (trkfpaSW.getBoolValue()) {
setprop("/it-autoflight/input/vert", 5);
} else {
setprop("/it-autoflight/input/vert", 1);
}
}
},
VSAdjust: func(d) {
if (dcEss.getValue() >= 25) {
if (vertMode.getValue() == 1) {
var vsTemp = vsSet.getValue();
if (d == 1) {
vsTemp = vsTemp + 100;
} else if (d == -1) {
vsTemp = vsTemp - 100;
} else if (d == 10) {
vsTemp = vsTemp + 1000;
} else if (d == -10) {
vsTemp = vsTemp - 1000;
}
if (vsTemp < -6000) {
vsSet.setValue(-6000);
} else if (vsTemp > 6000) {
vsSet.setValue(6000);
} else {
vsSet.setValue(vsTemp);
}
} else if (vertMode.getValue() == 5) {
var fpaTemp = fpaSet.getValue();
if (d == 1) {
fpaTemp = math.round(fpaTemp + 0.1, 0.1);
} else if (d == -1) {
fpaTemp = math.round(fpaTemp - 0.1, 0.1);
} else if (d == 10) {
fpaTemp = fpaTemp + 1;
} else if (d == -10) {
fpaTemp = fpaTemp - 1;
}
if (fpaTemp < -9.9) {
fpaSet.setValue(-9.9);
} else if (fpaTemp > 9.9) {
fpaSet.setValue(9.9);
} else {
fpaSet.setValue(fpaTemp);
}
}
if ((vertMode.getValue() != 1 and !trkfpaSW.getBoolValue()) or (vertMode.getValue() != 5 and trkfpaSW.getBoolValue())) {
me.VSPull();
}
}
},
APPRButton: func() {
if (dcEss.getValue() >= 25) {
var vertTemp = vertMode.getValue();
if ((locArm.getBoolValue() or latMode.getValue() == 2) and (apprArm.getBoolValue() or vertTemp == 2 or vertTemp == 6)) {
setprop("/it-autoflight/input/lat", 0);
me.VSPull();
} else {
setprop("/it-autoflight/input/vert", 2);
}
}
},
};
var hdgInput = func {
var latmode = getprop("/it-autoflight/output/lat");
if (latmode != 0) {
setprop("/it-autoflight/custom/show-hdg", 1);
if (latMode.getValue() != 0) {
showHDG.setBoolValue(1);
var hdgnow = getprop("/it-autoflight/input/hdg");
setprop("/modes/fcu/hdg-time", getprop("/sim/time/elapsed-sec"));
}
}
var mcpHDGKnbPush = func {
if (getprop("/it-autoflight/output/fd1") == 1 or getprop("/it-autoflight/output/fd2") == 1 or getprop("/it-autoflight/output/ap1") == 1 or getprop("/it-autoflight/output/ap2") == 1) {
setprop("/it-autoflight/input/lat", 1);
}
}
var toggleSTD = func {
var Std = getprop("/modes/altimeter/std");
if (Std == 1) {

View file

@ -40,6 +40,7 @@ setprop("/engines/engine[1]/oil-qt-actual", qty2);
##########
var beacon_switch = props.globals.getNode("/controls/switches/beacon", 1);
var beacon_ctl = props.globals.getNode("/controls/lighting/beacon", 1);
var beacon = aircraft.light.new("/sim/model/lights/beacon", [0.1, 1], "/controls/lighting/beacon");
var strobe_switch = props.globals.getNode("/controls/switches/strobe", 1);
var strobe_light = props.globals.getNode("/controls/lighting/strobe", 1);
@ -47,6 +48,8 @@ var strobe = aircraft.light.new("/sim/model/lights/strobe", [0.05, 0.06, 0.05, 1
var tail_strobe = aircraft.light.new("/sim/model/lights/tailstrobe", [0.1, 1], "/controls/lighting/strobe");
var logo_lights = getprop("/sim/model/lights/logo-lights");
var nav_lights = props.globals.getNode("/sim/model/lights/nav-lights");
var wing_switch = props.globals.getNode("/controls/switches/wing-lights", 1);
var wing_ctl = props.globals.getNode("/controls/lighting/wing-lights", 1);
var dome_light = props.globals.initNode("/sim/model/lights/dome-light", 0.0, "DOUBLE");
var wow = getprop("/gear/gear[2]/wow");
var slats = getprop("/controls/flight/slats");
@ -58,8 +61,10 @@ var settingT = getprop("/controls/lighting/taxi-light-switch");
var settingTurnoff = getprop("/controls/lighting/turnoff-light-switch");
var setting = getprop("/controls/lighting/nav-lights-switch");
var domeSetting = getprop("/controls/lighting/dome-norm");
var landl = getprop("/controls/lighting/landing-lights[1]");
var landr = getprop("/controls/lighting/landing-lights[2]");
var landL = props.globals.getNode("controls/lighting/landing-lights[1]", 1);
var landR = props.globals.getNode("controls/lighting/landing-lights[2]", 1);
var landlSw = props.globals.getNode("/controls/switches/landing-lights-l", 1);
var landrSw = props.globals.getNode("/controls/switches/landing-lights-r", 1);
###################
# Tire Smoke/Rain #
@ -507,7 +512,7 @@ var lightsLoop = maketimer(0.2, func {
wow = getprop("/gear/gear[2]/wow");
slats = getprop("/controls/flight/slats");
if (getprop("/systems/electrical/bus/ac1") > 0 or getprop("/systems/electrical/bus/ac2") > 0) {
if (getprop("/systems/electrical/bus/ac1") > 0 or getprop("/systems/electrical/bus/ac2") > 0 or getprop("/systems/electrical/bus/dc1") > 0 or getprop("/systems/electrical/bus/dc2") > 0) {
setprop("/systems/electrical/nav-lights-power", 1);
} else {
setprop("/systems/electrical/nav-lights-power", 0);
@ -542,15 +547,45 @@ var lightsLoop = maketimer(0.2, func {
# strobe
strobe_sw = strobe_switch.getValue();
if (strobe_sw == 1) {
if (strobe_sw == 1 and getprop("/systems/electrical/bus/ac2") > 0) {
strobe_light.setValue(1);
} elsif (strobe_sw == 0.5 and getprop("/gear/gear[1]/wow") == 0 and getprop("/gear/gear[2]/wow") == 0) {
} elsif (strobe_sw == 0.5 and getprop("/gear/gear[1]/wow") == 0 and getprop("/gear/gear[2]/wow") == 0 and getprop("/systems/electrical/bus/ac2") > 0) {
# todo: use lgciu output 5
strobe_light.setValue(1);
} else {
strobe_light.setValue(0);
}
# beacon
if (beacon_switch.getValue() == 1 and (getprop("/systems/electrical/bus/ac1") > 0 or getprop("/systems/electrical/bus/ac2") > 0)) {
beacon_ctl.setValue(1);
} else {
beacon_ctl.setValue(0);
}
# wing
if (wing_switch.getValue() == 1 and (getprop("/systems/electrical/bus/ac1") > 0 or getprop("/systems/electrical/bus/ac2") > 0)) {
wing_ctl.setValue(1);
} else {
wing_ctl.setValue(0);
}
# landL
if (landlSw.getValue() == 1 and getprop("/systems/electrical/bus/ac1") > 0) {
landL.setValue(1);
} else {
landL.setValue(0);
}
if (landrSw.getValue() == 1 and getprop("/systems/electrical/bus/ac2") > 0) {
landR.setValue(1);
} else {
landR.setValue(0);
}
# signs
if (getprop("/systems/pressurization/cabinalt-norm") > 11300) {

View file

@ -442,7 +442,7 @@
<property>metrics/bw-ft</property>
<property>aero/bi2vel</property>
<property>velocities/r-aero-rad_sec</property>
<value>0.2</value>
<value>0.1</value>
</product>
</function>

View file

@ -1691,11 +1691,56 @@
<output>/engines/engine[1]/n2-actual</output>
<output>/engines/engine[4]/n2</output>
</lag_filter>
<lag_filter name="fcs/throttle-lever[0]">
<input>/controls/engines/engine[0]/throttle-lever</input>
<c1>20</c1>
</lag_filter>
<lag_filter name="fcs/throttle-lever[1]">
<input>/controls/engines/engine[1]/throttle-lever</input>
<c1>20</c1>
</lag_filter>
<lag_filter name="fcs/reverse-lever[0]">
<input>/controls/engines/engine[0]/reverser</input>
<c1>20</c1>
</lag_filter>
<lag_filter name="fcs/reverse-lever[1]">
<input>/controls/engines/engine[1]/reverser</input>
<c1>20</c1>
</lag_filter>
<lag_filter name="fcs/reverse-thr-lever[0]">
<input>/controls/engines/engine[0]/throttle-rev</input>
<c1>20</c1>
</lag_filter>
<lag_filter name="fcs/reverse-thr-lever[1]">
<input>/controls/engines/engine[1]/throttle-rev</input>
<c1>20</c1>
</lag_filter>
<lag_filter name="fcs/engine-cutoff[0]">
<input>/controls/engines/engine[0]/cutoff-switch</input>
<c1>20</c1>
</lag_filter>
<lag_filter name="fcs/engine-cutoff[1]">
<input>/controls/engines/engine[1]/cutoff-switch</input>
<c1>20</c1>
</lag_filter>
</channel>
<channel name="SFCC">
<lag_filter name="fcs/flap-lever">
<input>/controls/flight/flap-lever</input>
<c1>20</c1>
</lag_filter>
<switch name="fcs/sfcc/unit1-avail">
<default value="0"/>
<test logic="OR" value="1">
@ -1905,6 +1950,11 @@
<channel name="Brakes">
<lag_filter name="fcs/brake-lever">
<input>/controls/gear/brake-parking</input>
<c1>20</c1>
</lag_filter>
<pure_gain name="/services/chokes/nose-half">
<input>/services/chokes/nose</input>
<gain>0.5</gain>

View file

@ -84,6 +84,11 @@
</function>
</fcs_function>
<lag_filter name="spoilers/main-lever">
<input>spoilers/speedbrake-nul</input>
<c1>20</c1>
</lag_filter>
<summer name="spoilers/main-cmd">
<input>spoilers/speedbrake-nul</input>
<input>spoilers/auto-speedbrake-cmd</input>
@ -93,6 +98,11 @@
</clipto>
<output>fbw/spoiler-output</output>
</summer>
<lag_filter name="spoilers/lever-arm">
<input>/controls/flight/speedbrake-arm</input>
<c1>20</c1>
</lag_filter>
</channel>

View file

@ -19,8 +19,8 @@
<expression>
<table>
<property>/fdm/jsbsim/velocities/vc-kts</property>
<entry><ind>140</ind><dep>-1.5</dep></entry>
<entry><ind>350</ind><dep>-0.6</dep></entry>
<entry><ind>140</ind><dep>-1.0</dep></entry>
<entry><ind>350</ind><dep>-0.5</dep></entry>
</table>
</expression>
</Kp>
@ -46,8 +46,8 @@
<expression>
<table>
<property>/fdm/jsbsim/velocities/vc-kts</property>
<entry><ind>140</ind><dep>-1.5</dep></entry>
<entry><ind>350</ind><dep>-0.6</dep></entry>
<entry><ind>140</ind><dep>-1.0</dep></entry>
<entry><ind>350</ind><dep>-0.5</dep></entry>
</table>
</expression>
</Ki>

View file

@ -728,10 +728,10 @@
<gain>1.0</gain>
<input>
<condition>
<greater-than>
<greater-than-equals>
<property>/it-autoflight/internal/heading-predicted-cmd</property>
<value>360</value>
</greater-than>
<value>360.5</value>
</greater-than-equals>
</condition>
<expression>
<dif>

View file

@ -337,5 +337,25 @@
</input>
<output>/instrumentation/pfd/vs-digit-trans</output>
</filter>
<filter>
<name>Slip/Skid Indicator</name>
<debug>false</debug>
<type>exponential</type>
<input>
<condition>
<property>/fdm/jsbsim/position/wow</property>
</condition>
<expression>
<product>
<property>/fdm/jsbsim/accelerations/Ny</property>
<value>-25</value>
</product>
</expression>
</input>
<input>/fdm/jsbsim/aero/beta-deg</input>
<output>/instrumentation/pfd/slip-skid</output>
<filter-time>0.16</filter-time>
</filter>
</PropertyList>

View file

@ -4,7 +4,6 @@
<!-- IT-AUTOFLIGHT Autopilot Control Dialog -->
<PropertyList>
<name>autopilot</name>
@ -39,13 +38,7 @@
<pref-width>43</pref-width>
<binding>
<command>nasal</command>
<script>
if (getprop("/it-autoflight/input/athr") == 0) {
setprop("it-autoflight/input/athr", 1);
} else {
libraries.athrOff("hard");
}
</script>
<script>libraries.APPanel.ATHR();</script>
</binding>
</button>
<button>
@ -53,13 +46,7 @@
<pref-width>43</pref-width>
<binding>
<command>nasal</command>
<script>
if (getprop("/it-autoflight/input/ap1") == 0) {
setprop("it-autoflight/input/ap1", 1);
} else {
libraries.apOff("hard", 1);
}
</script>
<script>libraries.APPanel.AP1();</script>
</binding>
</button>
<button>
@ -67,29 +54,23 @@
<pref-width>43</pref-width>
<binding>
<command>nasal</command>
<script>
if (getprop("/it-autoflight/input/ap2") == 0) {
setprop("it-autoflight/input/ap2", 1);
} else {
libraries.apOff("hard", 2);
}
</script>
<script>libraries.APPanel.AP2();</script>
</binding>
</button>
<button>
<legend>FD1</legend>
<pref-width>43</pref-width>
<binding>
<command>property-toggle</command>
<property>/it-autoflight/input/fd1</property>
<command>nasal</command>
<script>libraries.APPanel.FD1();</script>
</binding>
</button>
<button>
<legend>FD2</legend>
<pref-width>43</pref-width>
<binding>
<command>property-toggle</command>
<property>/it-autoflight/input/fd2</property>
<command>nasal</command>
<script>libraries.APPanel.FD2();</script>
</binding>
</button>
</group>
@ -102,16 +83,7 @@
<pref-width>119</pref-width>
<binding>
<command>nasal</command>
<script>
if (getprop("/it-autoflight/input/athr") == 1) {
libraries.athrOff("soft");
} else {
if (getprop("/it-autoflight/output/athr-warning") == 1) {
setprop("/it-autoflight/output/athr-warning", 0);
setprop("/ECAM/warnings/master-caution-light", 0);
}
}
</script>
<script>libraries.APPanel.ATDiscSoft();</script>
</binding>
</button>
<button>
@ -119,18 +91,7 @@
<pref-width>119</pref-width>
<binding>
<command>nasal</command>
<script>
if (getprop("/it-autoflight/input/ap1") == 1 or getprop("/it-autoflight/input/ap1") == 2) {
libraries.apOff("soft", 0);
} else {
if (getprop("/it-autoflight/sound/apoffsound") == 1 or getprop("/it-autoflight/sound/apoffsound2") == 1) {
setprop("/it-autoflight/sound/apoffsound", 0);
setprop("/it-autoflight/sound/apoffsound2", 0);
}
setprop("/it-autoflight/output/ap-warning", 0);
setprop("/ECAM/warnings/master-warning-light", 0);
}
</script>
<script>libraries.APPanel.APDiscSoft();</script>
</binding>
</button>
</group>
@ -359,9 +320,7 @@
<pref-width>65</pref-width>
<binding>
<command>nasal</command>
<script>
libraries.mcpSPDKnbPush();
</script>
<script>libraries.APPanel.SPDPush();</script>
</binding>
</button>
@ -370,19 +329,15 @@
<pref-width>65</pref-width>
<binding>
<command>nasal</command>
<script>
libraries.mcpSPDKnbPull();
</script>
<script>libraries.APPanel.SPDPull();</script>
</binding>
</button>
<button>
<legend>Speed/Mach</legend>
<binding>
<command>property-cycle</command>
<property>/it-autoflight/input/kts-mach</property>
<value>0</value>
<value>1</value>
<command>nasal</command>
<script>libraries.APPanel.IASMach();</script>
</binding>
</button>
@ -416,12 +371,8 @@
</and>
</enable>
<binding>
<command>property-adjust</command>
<property>/it-autoflight/input/spd-kts</property>
<min>100</min>
<max>350</max>
<step>-10</step>
<wrap>false</wrap>
<command>nasal</command>
<script>libraries.APPanel.SPDAdjust(-10);</script>
</binding>
</button>
<button>
@ -443,12 +394,8 @@
</and>
</enable>
<binding>
<command>property-adjust</command>
<property>/it-autoflight/input/spd-kts</property>
<min>100</min>
<max>350</max>
<step>-1</step>
<wrap>false</wrap>
<command>nasal</command>
<script>libraries.APPanel.SPDAdjust(-1);</script>
</binding>
</button>
@ -470,9 +417,6 @@
</equals>
</and>
</enable>
<binding>
<command>dialog-apply</command>
</binding>
</input>
<button>
@ -494,12 +438,8 @@
</and>
</enable>
<binding>
<command>property-adjust</command>
<property>/it-autoflight/input/spd-kts</property>
<min>100</min>
<max>350</max>
<step>1</step>
<wrap>false</wrap>
<command>nasal</command>
<script>libraries.APPanel.SPDAdjust(1);</script>
</binding>
</button>
<button>
@ -522,12 +462,8 @@
</and>
</enable>
<binding>
<command>property-adjust</command>
<property>/it-autoflight/input/spd-kts</property>
<min>100</min>
<max>350</max>
<step>10</step>
<wrap>false</wrap>
<command>nasal</command>
<script>libraries.APPanel.SPDAdjust(10);</script>
</binding>
</button>
@ -561,12 +497,8 @@
</and>
</enable>
<binding>
<command>property-adjust</command>
<property>/it-autoflight/input/spd-mach</property>
<min>0.50</min>
<max>0.82</max>
<step>-0.01</step>
<wrap>false</wrap>
<command>nasal</command>
<script>libraries.APPanel.SPDAdjust(-10);</script>
</binding>
</button>
<button>
@ -588,12 +520,8 @@
</and>
</enable>
<binding>
<command>property-adjust</command>
<property>/it-autoflight/input/spd-mach</property>
<min>0.50</min>
<max>0.82</max>
<step>-0.001</step>
<wrap>false</wrap>
<command>nasal</command>
<script>libraries.APPanel.SPDAdjust(-1);</script>
</binding>
</button>
@ -615,9 +543,6 @@
</equals>
</and>
</enable>
<binding>
<command>dialog-apply</command>
</binding>
</input>
<button>
@ -639,12 +564,8 @@
</and>
</enable>
<binding>
<command>property-adjust</command>
<property>/it-autoflight/input/spd-mach</property>
<min>0.50</min>
<max>0.82</max>
<step>0.001</step>
<wrap>false</wrap>
<command>nasal</command>
<script>libraries.APPanel.SPDAdjust(1);</script>
</binding>
</button>
<button>
@ -667,12 +588,8 @@
</and>
</enable>
<binding>
<command>property-adjust</command>
<property>/it-autoflight/input/spd-mach</property>
<min>0.50</min>
<max>0.82</max>
<step>0.01</step>
<wrap>false</wrap>
<command>nasal</command>
<script>libraries.APPanel.SPDAdjust(10);</script>
</binding>
</button>
@ -700,7 +617,7 @@
<pref-width>75</pref-width>
<binding>
<command>nasal</command>
<script>libraries.mcpHDGKnbPush();</script>
<script>libraries.APPanel.HDGPush();</script>
</binding>
</button>
@ -709,7 +626,7 @@
<pref-width>75</pref-width>
<binding>
<command>nasal</command>
<script>libraries.mcpHDGKnbPull();</script>
<script>libraries.APPanel.HDGPull();</script>
</binding>
</button>
@ -717,9 +634,8 @@
<legend>LOC</legend>
<pref-width>75</pref-width>
<binding>
<command>property-assign</command>
<property>/it-autoflight/input/lat</property>
<value>2</value>
<command>nasal</command>
<script>libraries.APPanel.LOCButton();</script>
</binding>
</button>
</group>
@ -746,12 +662,8 @@
</equals>
</enable>
<binding>
<command>property-adjust</command>
<property>/it-autoflight/input/hdg</property>
<min>1</min>
<max>361</max>
<step>-10</step>
<wrap>true</wrap>
<command>nasal</command>
<script>libraries.APPanel.HDGAdjust(-10);</script>
</binding>
</button>
<button>
@ -767,12 +679,8 @@
</equals>
</enable>
<binding>
<command>property-adjust</command>
<property>/it-autoflight/input/hdg</property>
<min>1</min>
<max>361</max>
<step>-1</step>
<wrap>true</wrap>
<command>nasal</command>
<script>libraries.APPanel.HDGAdjust(-1);</script>
</binding>
</button>
@ -788,9 +696,6 @@
<value>1</value>
</equals>
</enable>
<binding>
<command>dialog-apply</command>
</binding>
</input>
<button>
@ -806,12 +711,8 @@
</equals>
</enable>
<binding>
<command>property-adjust</command>
<property>/it-autoflight/input/hdg</property>
<min>1</min>
<max>361</max>
<step>1</step>
<wrap>true</wrap>
<command>nasal</command>
<script>libraries.APPanel.HDGAdjust(1);</script>
</binding>
</button>
<button>
@ -828,12 +729,8 @@
</equals>
</enable>
<binding>
<command>property-adjust</command>
<property>/it-autoflight/input/hdg</property>
<min>1</min>
<max>361</max>
<step>10</step>
<wrap>true</wrap>
<command>nasal</command>
<script>libraries.APPanel.HDGAdjust(10);</script>
</binding>
</button>
</group>
@ -900,48 +797,8 @@
<legend>V/S Push</legend>
<pref-width>75</pref-width>
<binding>
<condition>
<equals>
<property>/it-autoflight/custom/trk-fpa</property>
<value>0</value>
</equals>
</condition>
<command>property-assign</command>
<property>/it-autoflight/input/vert</property>
<value>1</value>
</binding>
<binding>
<condition>
<equals>
<property>/it-autoflight/custom/trk-fpa</property>
<value>0</value>
</equals>
</condition>
<command>property-assign</command>
<property>/it-autoflight/input/vs</property>
<value>0</value>
</binding>
<binding>
<condition>
<equals>
<property>/it-autoflight/custom/trk-fpa</property>
<value>1</value>
</equals>
</condition>
<command>property-assign</command>
<property>/it-autoflight/input/vert</property>
<value>5</value>
</binding>
<binding>
<condition>
<equals>
<property>/it-autoflight/custom/trk-fpa</property>
<value>1</value>
</equals>
</condition>
<command>property-assign</command>
<property>/it-autoflight/input/fpa</property>
<value>0.0</value>
<command>nasal</command>
<script>libraries.APPanel.VSPush();</script>
</binding>
</button>
@ -950,13 +807,7 @@
<pref-width>75</pref-width>
<binding>
<command>nasal</command>
<script>
if (getprop("/it-autoflight/custom/trk-fpa") == 0) {
setprop("/it-autoflight/input/vert", 1);
} else if (getprop("/it-autoflight/custom/trk-fpa") == 1) {
setprop("/it-autoflight/input/vert", 5);
}
</script>
<script>libraries.APPanel.VSPull();</script>
</binding>
</button>
@ -964,9 +815,8 @@
<pref-width>75</pref-width>
<legend>APPR</legend>
<binding>
<command>property-assign</command>
<property>/it-autoflight/input/vert</property>
<value>2</value>
<command>nasal</command>
<script>libraries.APPanel.APPRButton();</script>
</binding>
</button>
</group>
@ -987,12 +837,8 @@
<pref-height>25</pref-height>
<legend>&lt;&lt;</legend>
<binding>
<command>property-adjust</command>
<property>/it-autoflight/input/alt</property>
<min>0</min>
<max>50000</max>
<step>-1000</step>
<wrap>false</wrap>
<command>nasal</command>
<script>libraries.APPanel.ALTAdjust(-10);</script>
</binding>
</button>
<button>
@ -1002,12 +848,8 @@
<pref-height>25</pref-height>
<legend>&lt;</legend>
<binding>
<command>property-adjust</command>
<property>/it-autoflight/input/alt</property>
<min>0</min>
<max>50000</max>
<step>-100</step>
<wrap>false</wrap>
<command>nasal</command>
<script>libraries.APPanel.ALTAdjust(-2);</script>
</binding>
</button>
@ -1029,12 +871,8 @@
<pref-height>25</pref-height>
<legend>&gt;</legend>
<binding>
<command>property-adjust</command>
<property>/it-autoflight/input/alt</property>
<min>0</min>
<max>50000</max>
<step>100</step>
<wrap>false</wrap>
<command>nasal</command>
<script>libraries.APPanel.ALTAdjust(2);</script>
</binding>
</button>
<button>
@ -1045,12 +883,8 @@
<pref-height>25</pref-height>
<legend>&gt;&gt;</legend>
<binding>
<command>property-adjust</command>
<property>/it-autoflight/input/alt</property>
<min>0</min>
<max>50000</max>
<step>1000</step>
<wrap>false</wrap>
<command>nasal</command>
<script>libraries.APPanel.ALTAdjust(10);</script>
</binding>
</button>
</group>
@ -1077,12 +911,8 @@
</equals>
</enable>
<binding>
<command>property-adjust</command>
<property>/it-autoflight/input/vs</property>
<min>-6000</min>
<max>6000</max>
<step>-1000</step>
<wrap>false</wrap>
<command>nasal</command>
<script>libraries.APPanel.VSAdjust(-10);</script>
</binding>
</button>
<button>
@ -1098,12 +928,8 @@
</equals>
</enable>
<binding>
<command>property-adjust</command>
<property>/it-autoflight/input/vs</property>
<min>-6000</min>
<max>6000</max>
<step>-100</step>
<wrap>false</wrap>
<command>nasal</command>
<script>libraries.APPanel.VSAdjust(-1);</script>
</binding>
</button>
@ -1119,9 +945,6 @@
<value>1</value>
</equals>
</enable>
<binding>
<command>dialog-apply</command>
</binding>
</input>
<button>
@ -1137,12 +960,8 @@
</equals>
</enable>
<binding>
<command>property-adjust</command>
<property>/it-autoflight/input/vs</property>
<min>-6000</min>
<max>6000</max>
<step>100</step>
<wrap>false</wrap>
<command>nasal</command>
<script>libraries.APPanel.VSAdjust(1);</script>
</binding>
</button>
<button>
@ -1159,12 +978,8 @@
</equals>
</enable>
<binding>
<command>property-adjust</command>
<property>/it-autoflight/input/vs</property>
<min>-6000</min>
<max>6000</max>
<step>1000</step>
<wrap>false</wrap>
<command>nasal</command>
<script>libraries.APPanel.VSAdjust(10);</script>
</binding>
</button>
</group>
@ -1191,12 +1006,8 @@
</equals>
</enable>
<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>
<command>nasal</command>
<script>libraries.APPanel.VSAdjust(-10);</script>
</binding>
</button>
<button>
@ -1212,12 +1023,8 @@
</equals>
</enable>
<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>
<command>nasal</command>
<script>libraries.APPanel.VSAdjust(-1);</script>
</binding>
</button>
@ -1233,9 +1040,6 @@
<value>5</value>
</equals>
</enable>
<binding>
<command>dialog-apply</command>
</binding>
</input>
<button>
@ -1251,12 +1055,8 @@
</equals>
</enable>
<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>
<command>nasal</command>
<script>libraries.APPanel.VSAdjust(1);</script>
</binding>
</button>
<button>
@ -1273,12 +1073,8 @@
</equals>
</enable>
<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>
<command>nasal</command>
<script>libraries.APPanel.VSAdjust(10);</script>
</binding>
</button>
</group>
@ -1315,9 +1111,7 @@
<pref-width>120</pref-width>
<binding>
<command>nasal</command>
<script>
fmgc.toggle_trkfpa();
</script>
<script>libraries.APPanel.TRKFPA();</script>
</binding>
</button>

View file

@ -1 +1 @@
4759
4770