Merge branch 'master' into dev

This commit is contained in:
Joshua Davidson 2018-09-14 16:06:17 -04:00
commit ba48e45b7a
4 changed files with 4 additions and 5 deletions

View file

@ -152,7 +152,6 @@ var canvas_IESI = {
} }
# Attitude # Attitude
me.AI_horizon_trans.setTranslation(0, pitch.getValue() * 16.74); me.AI_horizon_trans.setTranslation(0, pitch.getValue() * 16.74);
me.AI_horizon_rot.setRotation(-roll.getValue() * D2R, me["AI_center"].getCenter()); me.AI_horizon_rot.setRotation(-roll.getValue() * D2R, me["AI_center"].getCenter());
@ -179,7 +178,7 @@ var canvas_IESI = {
me["ALT_digits"].setText(sprintf("%s", altitude_ind.getValue())); me["ALT_digits"].setText(sprintf("%s", altitude_ind.getValue()));
me["ALT_meters"].setText(sprintf("%5.0f", me.altitude * 0.3048)); me["ALT_meters"].setText(sprintf("%5.0f", me.altitude * 0.3048));
altTens = num(right(sprintf("%02d", altitude_ind.getValue()), 2)); altTens = num(right(sprintf("%02d", altitude.getValue()), 2));
me["ALT_tens"].setTranslation(0, altTens * 3.16); me["ALT_tens"].setTranslation(0, altTens * 3.16);
# QNH # QNH

View file

@ -248,4 +248,4 @@ var decreaseManVS = func {
if (manvs <= 1 and manvs >= 0 and !auto) { if (manvs <= 1 and manvs >= 0 and !auto) {
setprop("/systems/pressurization/outflowpos-man", manvs - 0.001); setprop("/systems/pressurization/outflowpos-man", manvs - 0.001);
} }
} }

View file

@ -585,4 +585,4 @@ if (getprop("/controls/flight/auto-coordination") == 1) {
setprop("/controls/flight/aileron-drives-tiller", 0); setprop("/controls/flight/aileron-drives-tiller", 0);
} }
setprop("/systems/acconfig/libraries-loaded", 1); setprop("/systems/acconfig/libraries-loaded", 1);

View file

@ -1 +1 @@
4638 4639