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

A3XX: Add IESI 90sec init, fix autobrake MAX not disabling (#119)

Browse source
This commit is contained in:
Joshua Davidson 2017-12-30 11:33:28 -05:00
parent 03f016117b
commit a0e085c334
4 changed files with 1913 additions and 1800 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Models/Instruments/IESI/IESI.nas
View file

@ -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();
});

151
Models/Instruments/IESI/res/iesi.svg
View file

@ -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"
@ -62,6 +62,10 @@
originx="0"
originy="0" />
</sodipodi:namedview>
<g
inkscape:groupmode="layer"
id="IESI"
inkscape:label="IESI">
<g
id="AI_horizon"
inkscape:label="#g4573">
@ -1669,32 +1673,6 @@
x="82.027168"
id="tspan4668"
sodipodi:role="line">.</tspan></text>
<text
inkscape:label="#text979"
transform="scale(1.0000144,0.9999856)"
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:38.39944839px;line-height:1.25;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:0.75"
x="607.13068"
y="981.46228"
id="QNH_setting"><tspan
sodipodi:role="line"
id="tspan977"
x="607.13068"
y="981.46228"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:86px;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/29.92</tspan></text>
<text
id="QNH_std"
y="981.46252"
x="487.22318"
style="font-style:normal;font-weight:normal;font-size:38.39944839px;line-height:1.25;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:0.75"
xml:space="preserve"
transform="scale(1.0000144,0.9999856)"
inkscape:label="#text979"><tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:86px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#179ab7;fill-opacity:1;stroke-width:0.75"
y="981.46252"
x="487.22318"
id="tspan4618"
sodipodi:role="line">STD</tspan></text>
<rect
style="opacity:0.46000001;fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:1.27696717;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="ALT_tens_clip"
@ -1823,9 +1801,9 @@
id="text4305"
y="98.899239"
x="865.3996"
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:#179ab7;fill-opacity:1;stroke:none;stroke-width:0.75;"
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:#179ab7;fill-opacity:1;stroke:none;stroke-width:0.75"
xml:space="preserve"><tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:74px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#179ab7;fill-opacity:1;stroke-width:0.75;"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:74px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#179ab7;fill-opacity:1;stroke-width:0.75"
y="98.899239"
x="865.3996"
id="tspan4307"
@ -1985,4 +1963,115 @@
inkscape:label="#path912"
inkscape:transform-center-y="-228.40743" />
</g>
</g>
<text
inkscape:label="#text979"
transform="scale(1.0000144,0.9999856)"
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:38.39944839px;line-height:1.25;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:0.75"
x="607.13068"
y="981.46228"
id="QNH_setting"><tspan
sodipodi:role="line"
id="tspan977"
x="607.13068"
y="981.46228"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:86px;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/29.92</tspan></text>
<text
id="QNH_std"
y="981.46252"
x="487.22318"
style="font-style:normal;font-weight:normal;font-size:38.39944839px;line-height:1.25;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:0.75"
xml:space="preserve"
transform="scale(1.0000144,0.9999856)"
inkscape:label="#text979"><tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:86px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#179ab7;fill-opacity:1;stroke-width:0.75"
y="981.46252"
x="487.22318"
id="tspan4618"
sodipodi:role="line">STD</tspan></text>
<g
id="IESI_Init"
inkscape:label="#g4490">
<rect
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" />
<text
inkscape:label="#text979"
transform="scale(1.0000144,0.9999856)"
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:38.39944839px;line-height:1.25;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:0.75"
x="510.22949"
y="796.40295"
id="text4462"><tspan
sodipodi:role="line"
id="tspan4464"
x="510.22949"
y="796.40295"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:86px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke-width:0.75">INIT 90s</tspan></text>
<rect
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" />
<text
id="text4468"
y="579.77039"
x="137.55525"
style="font-style:normal;font-weight:normal;font-size:38.39944839px;line-height:1.25;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:0.75"
xml:space="preserve"
transform="scale(1.0000144,0.9999856)"
inkscape:label="#text979"><tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:86px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke-width:0.75"
y="579.77039"
x="137.55525"
id="tspan4470"
sodipodi:role="line">SPD</tspan></text>
<rect
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" />
<text
inkscape:label="#text979"
transform="scale(1.0000144,0.9999856)"
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:38.39944839px;line-height:1.25;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:0.75"
x="885.73169"
y="579.77039"
id="text4474"><tspan
sodipodi:role="line"
id="tspan4476"
x="885.73169"
y="579.77039"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:86px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke-width:0.75">ALT</tspan></text>
<rect
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="rect4484"
width="243.81277"
height="91.330353"
x="390.0936"
y="287.07605" />
<text
id="text4486"
y="363.13785"
x="511.64346"
style="font-style:normal;font-weight:normal;font-size:38.39944839px;line-height:1.25;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:0.75"
xml:space="preserve"
transform="scale(1.0000144,0.9999856)"
inkscape:label="#text979"><tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:86px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke-width:0.75"
y="363.13785"
x="511.64346"
id="tspan4488"
sodipodi:role="line">ATT</tspan></text>
</g>
</svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 113 KiB

After

Width:  |  Height:  |  Size: 121 KiB

3
Nasal/brakes.nas
View file

@ -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);
}
});

2
revision.txt
View file

@ -1 +1 @@
4209
4210