From a0e085c334d43ed62b382f7f3b1fb19715aa2738 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Sat, 30 Dec 2017 11:33:28 -0500 Subject: [PATCH] A3XX: Add IESI 90sec init, fix autobrake MAX not disabling (#119) --- Models/Instruments/IESI/IESI.nas | 25 +- Models/Instruments/IESI/res/iesi.svg | 3683 +++++++++++++------------- Nasal/brakes.nas | 3 + revision.txt | 2 +- 4 files changed, 1913 insertions(+), 1800 deletions(-) diff --git a/Models/Instruments/IESI/IESI.nas b/Models/Instruments/IESI/IESI.nas index 896379ec..f14386b1 100644 --- a/Models/Instruments/IESI/IESI.nas +++ b/Models/Instruments/IESI/IESI.nas @@ -58,6 +58,18 @@ var canvas_IESI_base = { return []; }, update: func() { + if (getprop("/systems/electrical/battery1-amps") >= 120 or getprop("/systems/electrical/battery2-amps") >= 120 or getprop("/systems/electrical/bus/dc1") >= 25 or getprop("/systems/electrical/bus/dc2") >= 25) { + if (getprop("/systems/acconfig/autoconfig-running") != 1 and getprop("/instrumentation/iesi/iesi-init") != 1) { + setprop("/instrumentation/iesi/iesi-init", 1); + setprop("/instrumentation/iesi/iesi-init-time", getprop("/sim/time/elapsed-sec")); + } else if (getprop("/systems/acconfig/autoconfig-running") == 1 and getprop("/instrumentation/iesi/iesi-init") != 1) { + setprop("/instrumentation/iesi/iesi-init", 1); + setprop("/instrumentation/iesi/iesi-init-time", getprop("/sim/time/elapsed-sec") - 87); + } + } else { + setprop("/instrumentation/iesi/iesi-init", 0); + } + if (getprop("/systems/electrical/battery1-amps") >= 120 or getprop("/systems/electrical/battery2-amps") >= 120 or getprop("/systems/electrical/bus/dc1") >= 25 or getprop("/systems/electrical/bus/dc2") >= 25) { IESI.page.show(); IESI.update(); @@ -75,9 +87,18 @@ var canvas_IESI = { return m; }, getKeys: func() { - return ["ASI_scale","ASI_mach","ASI_mach_decimal","AI_center","AI_horizon","AI_bank","AI_slipskid","ALT_scale","ALT_one","ALT_two","ALT_three","ALT_four","ALT_five","ALT_digits","ALT_tens","ALT_meters","QNH_setting","QNH_std"]; + return ["IESI","IESI_Init","ASI_scale","ASI_mach","ASI_mach_decimal","AI_center","AI_horizon","AI_bank","AI_slipskid","ALT_scale","ALT_one","ALT_two","ALT_three","ALT_four","ALT_five","ALT_digits","ALT_tens","ALT_meters","QNH_setting","QNH_std"]; }, update: func() { + elapsedtime = getprop("/sim/time/elapsed-sec"); + if (getprop("/instrumentation/iesi/iesi-init-time") + 90 >= elapsedtime) { + me["IESI"].hide(); + me["IESI_Init"].show(); + } else { + me["IESI_Init"].hide(); + me["IESI"].show(); + } + # Airspeed # Subtract 30, since the scale starts at 30, but don"t allow less than 0, or more than 420 situations if (getprop("/instrumentation/airspeed-indicator/indicated-speed-kt") <= 30) { @@ -163,7 +184,7 @@ setlistener("sim/signals/fdm-initialized", func { IESI_update.start(); }); -var IESI_update = maketimer(0.05, func { +var IESI_update = maketimer(0.07, func { canvas_IESI_base.update(); }); diff --git a/Models/Instruments/IESI/res/iesi.svg b/Models/Instruments/IESI/res/iesi.svg index 08f6cf4d..6e50dc10 100644 --- a/Models/Instruments/IESI/res/iesi.svg +++ b/Models/Instruments/IESI/res/iesi.svg @@ -41,9 +41,9 @@ inkscape:window-height="1030" id="namedview371" showgrid="false" - inkscape:zoom="2.8284271" - inkscape:cx="633.94957" - inkscape:cy="1033.6202" + inkscape:zoom="1" + inkscape:cx="593.66324" + inkscape:cy="533.76317" inkscape:window-x="1592" inkscape:window-y="-8" inkscape:window-maximized="1" @@ -63,1612 +63,1907 @@ originy="0" /> + inkscape:groupmode="layer" + id="IESI" + inkscape:label="IESI"> - + id="AI_horizon" + inkscape:label="#g4573"> + + + + + - - - - - - + + 10 - - - - - 10 + + + + + 20 - - - - - 20 + + + + + 30 - - - - - 30 + + + + + 40 - - - - - 40 + + + + + 50 - - - - - 50 + + + + + 60 - - - - - 60 + + + + + 70 - - - - - 70 + + + + + 80 - - - - - 80 + + + + + 90 - - - - - - 90 + + + + + + 10 - - - - - 10 + + + + + 20 - - - - - 20 + + + + + 30 - - - - - 30 + + + + + 40 - - - - - 40 + + + + + 50 - - - - - 50 + + + + + 60 - - - - - 60 + + + + + 70 - - - - - 70 + + + + + 80 - - - - - 80 + + + + + 90 - - - - - - 90 + + + + + + 000 - - - 000 + + + 000 - - 000 + + 000 - - - - - - - - - 000 + + + + + + + + + 000 - - - - - - 000 + + + + + + 000 - - - - - - - - - - 000 + + + + + + + + + + 280 - 280 + 300 - - - - - 300 + + + + + 320 - - - 320 + + + 340 - - - 340 + + + 360 - - - 360 + + + 380 - - - 380 + + + 400 - - - 400 + + + 420 - - 420 + + 260 - - - 260 + + + 240 - - - 240 + + + 220 - - - - - - 220 + + + + + + 200 - - - - - 200 + + + + + 180 - - - - - 180 + + + + + 160 - - - - - 160 + + + + + 140 - - - - - 140 + + + + + 120 - - - - - 120 + + + + + 100 - - - - - 100 + + + + + 80 - - - - - 80 + + + + + 60 - - - - - 60 + + + + + 40 + id="text4438" + transform="scale(0.95383278,1.0484018)" + inkscape:label="#text975">40 + + + + + + + - - - - - - - - + 00 - 00 + . + style="font-style:normal;font-weight:normal;font-size:30.52176857px;line-height:1.25;font-family:sans-serif;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:0.75" + xml:space="preserve">. + + + + + + + 00 + 40200080604020008060 + 00 + M + + + + + + + + + + + + + + + + + + + + + + + + + + + + + STD - + id="IESI_Init" + inkscape:label="#g4490"> + y="720.3349" + x="330.414" + height="91.330338" + width="363.17239" + id="rect4448" + style="fill:#c9d121;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + INIT 90s - - - 00 - 40200080604020008060 - 00 - M - - + style="fill:#c9d121;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" + id="rect4466" + width="243.81277" + height="91.330353" + x="16" + y="503.70544" /> + SPD - - - - - - - - - - - - - - - - - - - - - - - - + y="503.70544" + x="764.18719" + height="91.330353" + width="243.81277" + id="rect4472" + style="fill:#c9d121;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + ALT + + ATT diff --git a/Nasal/brakes.nas b/Nasal/brakes.nas index 8079a6df..c9ffc22a 100644 --- a/Nasal/brakes.nas +++ b/Nasal/brakes.nas @@ -79,4 +79,7 @@ var absChk = maketimer(0.2, func { setprop("/controls/gear/brake-right", 0); } } + if (getprop("/controls/autobrake/mode") == 3 and getprop("/controls/gear/gear-down") == 0) { + arm_autobrake(0); + } }); diff --git a/revision.txt b/revision.txt index 0930d746..bbc24e95 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4209 \ No newline at end of file +4210 \ No newline at end of file