Merge branch 'master' into dev

This commit is contained in:
Joshua Davidson 2018-09-25 09:55:35 -04:00
commit a703f9d5c1
2 changed files with 1 additions and 3 deletions

View file

@ -61,8 +61,6 @@ var eng1_n2 = props.globals.getNode("/engines/engine[0]/n2-actual", 1);
var eng2_n2 = props.globals.getNode("/engines/engine[1]/n2-actual", 1);
var eng1_epr = props.globals.getNode("/engines/engine[0]/epr-actual", 1);
var eng2_epr = props.globals.getNode("/engines/engine[1]/epr-actual", 1);
var eng1_n2mode = props.globals.getNode("/systems/fadec/eng1/egt", 1);
var eng2_n2mode = props.globals.getNode("/systems/fadec/eng2/egt", 1);
var eng1_egt = props.globals.getNode("/engines/engine[0]/egt-actual", 1);
var eng2_egt = props.globals.getNode("/engines/engine[1]/egt-actual", 1);
var eng1_egtmode = props.globals.getNode("/systems/fadec/eng1/egt", 1);

View file

@ -1 +1 @@
4651
4652