Merge branch 'master' into ECAM2

This commit is contained in:
Jonathan Redpath 2019-02-20 13:20:34 +00:00
commit ae19cc42d2
4 changed files with 21 additions and 11 deletions
AircraftConfig
Models/Instruments/MCDU
revision.txt

View file

@ -251,6 +251,14 @@ var colddark = func {
setprop("/controls/flight/speedbrake", 0); setprop("/controls/flight/speedbrake", 0);
setprop("/controls/gear/gear-down", 1); setprop("/controls/gear/gear-down", 1);
setprop("/controls/flight/elevator-trim", 0); 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(); libraries.systemsInit();
failReset(); failReset();
if (getprop("/engines/engine[1]/n2-actual") < 2) { if (getprop("/engines/engine[1]/n2-actual") < 2) {
@ -424,11 +432,13 @@ var taxi_b = func {
systems.ADIRS.skip(1); systems.ADIRS.skip(1);
systems.ADIRS.skip(2); systems.ADIRS.skip(2);
setprop("/controls/adirs/mcducbtn", 1); 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/lighting/nav-lights-switch", 1);
setprop("/controls/radio/rmp[0]/on", 1); setprop("/controls/radio/rmp[0]/on", 1);
setprop("/controls/radio/rmp[1]/on", 1); setprop("/controls/radio/rmp[1]/on", 1);
setprop("/controls/radio/rmp[2]/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/taxi-light-switch", 0.5);
setprop("/controls/switches/landing-lights-l", 0.5); setprop("/controls/switches/landing-lights-l", 0.5);
setprop("/controls/switches/landing-lights-r", 0.5); setprop("/controls/switches/landing-lights-r", 0.5);
@ -464,7 +474,7 @@ var takeoff = func {
var eng_one_chk_c = setlistener("/engines/engine[0]/state", func { var eng_one_chk_c = setlistener("/engines/engine[0]/state", func {
if (getprop("/engines/engine[0]/state") == 3) { if (getprop("/engines/engine[0]/state") == 3) {
removelistener(eng_one_chk_c); 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/taxi-light-switch", 1);
setprop("/controls/switches/landing-lights-l", 1); setprop("/controls/switches/landing-lights-l", 1);
setprop("/controls/switches/landing-lights-r", 1); setprop("/controls/switches/landing-lights-r", 1);

View file

@ -786,7 +786,7 @@
<object-name>left</object-name> <object-name>left</object-name>
<action> <action>
<button>0</button> <button>0</button>
<repeatable>false</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script>mcdu.arrowbutton("left", 0);</script> <script>mcdu.arrowbutton("left", 0);</script>
@ -810,7 +810,7 @@
<object-name>right</object-name> <object-name>right</object-name>
<action> <action>
<button>0</button> <button>0</button>
<repeatable>false</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script>mcdu.arrowbutton("right", 0);</script> <script>mcdu.arrowbutton("right", 0);</script>
@ -834,7 +834,7 @@
<object-name>up</object-name> <object-name>up</object-name>
<action> <action>
<button>0</button> <button>0</button>
<repeatable>false</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script>mcdu.arrowbutton("up", 0);</script> <script>mcdu.arrowbutton("up", 0);</script>
@ -858,7 +858,7 @@
<object-name>down</object-name> <object-name>down</object-name>
<action> <action>
<button>0</button> <button>0</button>
<repeatable>false</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script>mcdu.arrowbutton("down", 0);</script> <script>mcdu.arrowbutton("down", 0);</script>

View file

@ -786,7 +786,7 @@
<object-name>left</object-name> <object-name>left</object-name>
<action> <action>
<button>0</button> <button>0</button>
<repeatable>false</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script>mcdu.arrowbutton("left", 1);</script> <script>mcdu.arrowbutton("left", 1);</script>
@ -810,7 +810,7 @@
<object-name>right</object-name> <object-name>right</object-name>
<action> <action>
<button>0</button> <button>0</button>
<repeatable>false</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script>mcdu.arrowbutton("right", 1);</script> <script>mcdu.arrowbutton("right", 1);</script>
@ -834,7 +834,7 @@
<object-name>up</object-name> <object-name>up</object-name>
<action> <action>
<button>0</button> <button>0</button>
<repeatable>false</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script>mcdu.arrowbutton("up", 1);</script> <script>mcdu.arrowbutton("up", 1);</script>
@ -858,7 +858,7 @@
<object-name>down</object-name> <object-name>down</object-name>
<action> <action>
<button>0</button> <button>0</button>
<repeatable>false</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script>mcdu.arrowbutton("down", 1);</script> <script>mcdu.arrowbutton("down", 1);</script>

View file

@ -1 +1 @@
4765 4766