Merge branch 'master' into dev

This commit is contained in:
Joshua Davidson 2018-09-23 18:56:26 -04:00
commit 792c606b98
2 changed files with 7 additions and 7 deletions

View file

@ -1333,13 +1333,13 @@ var canvas_lowerECAM_elec = {
if (getprop("/systems/electrical/bus/ac1") >= 110) {
me["AC1-in"].show();
} else {
me["AC1-in"].hide()
me["AC1-in"].hide();
}
if (getprop("/systems/electrical/bus/ac2") >= 110) {
me["AC2-in"].show();
} else {
me["AC2-in"].hide()
me["AC2-in"].hide();
}
if (getprop("/systems/electrical/ac1-src") == "APU" or getprop("/systems/electrical/ac1-src") == "EXT" or getprop("/systems/electrical/ac1-src") == "XTIE" or getprop("/systems/electrical/ac2-src") == "XTIE") {
@ -2337,18 +2337,18 @@ var canvas_lowerECAM_hyd = {
if (getprop("/systems/hydraulic/yellow-fire-valve") == 1) {
me["Fire-Valve-Yellow"].setColor(0.7333,0.3803,0);
me["Fire-Valve-Yellow"].setRotation(90 * D2R)
me["Fire-Valve-Yellow"].setRotation(90 * D2R);
} else {
me["Fire-Valve-Yellow"].setColor(0.0509,0.7529,0.2941);
me["Fire-Valve-Yellow"].setRotation(0)
me["Fire-Valve-Yellow"].setRotation(0);
}
if (getprop("/systems/hydraulic/green-fire-valve") == 1) {
me["Fire-Valve-Green"].setColor(0.7333,0.3803,0);
me["Fire-Valve-Green"].setRotation(90 * D2R)
me["Fire-Valve-Green"].setRotation(90 * D2R);
} else {
me["Fire-Valve-Green"].setColor(0.0509,0.7529,0.2941);
me["Fire-Valve-Green"].setRotation(0)
me["Fire-Valve-Green"].setRotation(0);
}
me.updateBottomStatus();

View file

@ -1 +1 @@
4650
4651