diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas index 2205402b..fea8dbb7 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas @@ -17,6 +17,10 @@ var blue_psi = 0; var green_psi = 0; var yellow_psi = 0; var autobrakemode = 0; +var nosegear = 0; +var leftgear = 0; +var rightgear = 0; + setprop("/systems/electrical/extra/apu-load", 0); setprop("/systems/electrical/extra/apu-volts", 0); setprop("/systems/electrical/extra/apu-hz", 0); @@ -737,15 +741,113 @@ var canvas_lowerECAM_wheel = { return m; }, getKeys: func() { - return ["TAT","SAT","GW","autobrk","autobrkind","NWSyellowrect","altnbrkyellow","normbrkgreen","spoiler1Rex","spoiler1Rrt","spoiler2Rex","spoiler2Rrt","spoiler3Rex","spoiler3Rrt","spoiler4Rex","spoiler4Rrt","spoiler5Rex","spoiler5Rrt","spoiler1Lex", - "spoiler1Lrt","spoiler2Lex","spoiler2Lrt","spoiler3Lex","spoiler3Lrt","spoiler4Lex","spoiler4Lrt","spoiler5Lex","spoiler5Lrt","spoiler1Rf","spoiler2Rf","spoiler3Rf","spoiler4Rf","spoiler5Rf","spoiler1Lf","spoiler2Lf","spoiler3Lf","spoiler4Lf", - "spoiler5Lf","braketemp1","braketemp2","braketemp3","braketemp4"]; + return ["TAT","SAT","GW","leftdoor""autobrk","autobrkind","NWSyellowrect","altnbrkyellow","normbrkgreen","spoiler1Rex","spoiler1Rrt","spoiler2Rex","spoiler2Rrt","spoiler3Rex","spoiler3Rrt","spoiler4Rex","spoiler4Rrt","spoiler5Rex","spoiler5Rrt","spoiler1Lex","spoiler1Lrt","spoiler2Lex","spoiler2Lrt","spoiler3Lex","spoiler3Lrt","spoiler4Lex","spoiler4Lrt","spoiler5Lex","spoiler5Lrt","spoiler1Rf","spoiler2Rf","spoiler3Rf","spoiler4Rf","spoiler5Rf","spoiler1Lf","spoiler2Lf","spoiler3Lf","spoiler4Lf","spoiler5Lf","braketemp1","braketemp2","braketemp3","braketemp4","Triangle-Left1a","Triangle-Left1b","Triangle-Left1c","Triangle-Left2a","Triangle-Left2b","Triangle-Left2c","Triangle-Right1a","Triangle-Right1b","Triangle-Right1c","Triangle-Right2a","Triangle-Right2b","Triangle-Right2c","Triangle-Nose1a","Triangle-Nose1b","Triangle-Nose1c","Triangle-Nose2a","Triangle-Nose2b","Triangle-Nose2c"]; }, update: func() { blue_psi = getprop("/systems/hydraulic/blue-psi"); green_psi = getprop("/systems/hydraulic/green-psi"); yellow_psi = getprop("/systems/hydraulic/yellow-psi"); autobrakemode = getprop("/controls/autobrake/mode"); + nosegear = getprop("gear/gear[0]/position-norm"); + leftgear = getprop("gear/gear[1]/position-norm"); + rightgear = getprop("gear/gear[2]/position-norm"); + + # Triangles + if (leftgear == 0 or leftgear > 0.8) { + me["Triangle-Left1a"].hide(); + me["Triangle-Left1b"].hide(); + me["Triangle-Left1c"].hide(); + me["Triangle-Left2a"].hide(); + me["Triangle-Left2b"].hide(); + me["Triangle-Left2c"].hide(); + } else { + me["Triangle-Left1a"].show(); + me["Triangle-Left1b"].show(); + me["Triangle-Left1c"].show(); + me["Triangle-Left2a"].show(); + me["Triangle-Left2b"].show(); + me["Triangle-Left2c"].show(); + } + + if (leftgear == 1) { + me["Triangle-Left1a"].setColor(0,1,0); + me["Triangle-Left1b"].setColor(0,1,0); + me["Triangle-Left1c"].setColor(0,1,0); + me["Triangle-Left2a"].setColor(0,1,0); + me["Triangle-Left2b"].setColor(0,1,0); + me["Triangle-Left2c"].setColor(0,1,0); + } else { + me["Triangle-Left1a"].setColor(1,0,0); + me["Triangle-Left1b"].setColor(1,0,0); + me["Triangle-Left1c"].setColor(1,0,0); + me["Triangle-Left2a"].setColor(1,0,0); + me["Triangle-Left2b"].setColor(1,0,0); + me["Triangle-Left2c"].setColor(1,0,0); + } + + if (nosegear == 0 or nosegear > 0.8) { + me["Triangle-Nose1a"].hide(); + me["Triangle-Nose1b"].hide(); + me["Triangle-Nose1c"].hide(); + me["Triangle-Nose2a"].hide(); + me["Triangle-Nose2b"].hide(); + me["Triangle-Nose2c"].hide(); + } else { + me["Triangle-Nose1a"].show(); + me["Triangle-Nose1b"].show(); + me["Triangle-Nose1c"].show(); + me["Triangle-Nose2a"].show(); + me["Triangle-Nose2b"].show(); + me["Triangle-Nose2c"].show(); + } + + if (nosegear == 1) { + me["Triangle-Nose1a"].setColor(0,1,0); + me["Triangle-Nose1b"].setColor(0,1,0); + me["Triangle-Nose1c"].setColor(0,1,0); + me["Triangle-Nose2a"].setColor(0,1,0); + me["Triangle-Nose2b"].setColor(0,1,0); + me["Triangle-Nose2c"].setColor(0,1,0); + } else { + me["Triangle-Nose1a"].setColor(1,0,0); + me["Triangle-Nose1b"].setColor(1,0,0); + me["Triangle-Nose1c"].setColor(1,0,0); + me["Triangle-Nose2a"].setColor(1,0,0); + me["Triangle-Nose2b"].setColor(1,0,0); + me["Triangle-Nose2c"].setColor(1,0,0); + } + + if (rightgear == 0 or rightgear > 0.8) { + me["Triangle-Right1a"].hide(); + me["Triangle-Right1b"].hide(); + me["Triangle-Right1c"].hide(); + me["Triangle-Right2a"].hide(); + me["Triangle-Right2b"].hide(); + me["Triangle-Right2c"].hide(); + } else { + me["Triangle-Right1a"].show(); + me["Triangle-Right1b"].show(); + me["Triangle-Right1c"].show(); + me["Triangle-Right2a"].show(); + me["Triangle-Right2b"].show(); + me["Triangle-Right2c"].show(); + } + + if (rightgear == 1) { + me["Triangle-Right1a"].setColor(0,1,0); + me["Triangle-Right1b"].setColor(0,1,0); + me["Triangle-Right1c"].setColor(0,1,0); + me["Triangle-Right2a"].setColor(0,1,0); + me["Triangle-Right2b"].setColor(0,1,0); + me["Triangle-Right2c"].setColor(0,1,0); + } else { + me["Triangle-Right1a"].setColor(1,0,0); + me["Triangle-Right1b"].setColor(1,0,0); + me["Triangle-Right1c"].setColor(1,0,0); + me["Triangle-Right2a"].setColor(1,0,0); + me["Triangle-Right2b"].setColor(1,0,0); + me["Triangle-Right2c"].setColor(1,0,0); + } # Autobrake if (autobrakemode == 0) { diff --git a/Models/Instruments/Lower-ECAM/res/wheel.svg b/Models/Instruments/Lower-ECAM/res/wheel.svg index 291d66fc..b93ee73b 100644 --- a/Models/Instruments/Lower-ECAM/res/wheel.svg +++ b/Models/Instruments/Lower-ECAM/res/wheel.svg @@ -12,7 +12,7 @@ viewBox="0 0 1024 1024" version="1.1" id="svg2" - inkscape:version="0.92.2 (5c3e80d, 2017-08-06)" + inkscape:version="0.91 r13725" sodipodi:docname="wheel.svg"> @@ -37,14 +37,14 @@ guidetolerance="10" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:window-width="1920" - inkscape:window-height="1030" + inkscape:window-width="1366" + inkscape:window-height="706" id="namedview371" showgrid="true" - inkscape:zoom="0.5894754" - inkscape:cx="651.1434" - inkscape:cy="-151.39764" - inkscape:window-x="1592" + inkscape:zoom="25.460263" + inkscape:cx="341.49099" + inkscape:cy="799.7697" + inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:current-layer="svg2"> @@ -569,9 +569,12 @@ + style="fill:#00ff00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + inkscape:transform-center-x="74.539263" + inkscape:transform-center-y="0.15934295" + inkscape:label="#path4369" /> + sodipodi:nodetypes="ccccc" + inkscape:label="#path4379" /> + sodipodi:nodetypes="cccc" + inkscape:label="#path4381" /> + style="fill:#00ff00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + inkscape:label="#path4383" /> + style="fill:#00ff00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + inkscape:label="#path4385" /> + style="fill:none;fill-rule:evenodd;stroke:#00ff00;stroke-width:2.55999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:label="#path4387" /> + sodipodi:nodetypes="ccccc" + inkscape:label="#path4389" /> + sodipodi:nodetypes="ccccc" + inkscape:label="#path4403" /> + sodipodi:nodetypes="cccc" + inkscape:label="#path4405" /> + style="fill:#00ff00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + inkscape:label="#path4407" /> + style="fill:#00ff00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + inkscape:label="#path4409" /> + style="fill:none;fill-rule:evenodd;stroke:#00ff00;stroke-width:2.55999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:label="#path4411" /> + sodipodi:nodetypes="ccccc" + inkscape:label="#path4413" /> - - + APU N Output gain