diff --git a/Engines/cfm56_5b3.xml b/Engines/cfm56_5b3.xml index f528479d..7b656efd 100644 --- a/Engines/cfm56_5b3.xml +++ b/Engines/cfm56_5b3.xml @@ -13,7 +13,7 @@ 33000 - 8.2 + 7.1 0.8 0.03 23.4 diff --git a/Engines/cfm56_5b4.xml b/Engines/cfm56_5b4.xml index 0ad9ce03..a9776fc8 100644 --- a/Engines/cfm56_5b4.xml +++ b/Engines/cfm56_5b4.xml @@ -13,7 +13,7 @@ 27000 - 8.2 + 7.1 0.8 0.03 23.4 diff --git a/Engines/cfm56_5b6.xml b/Engines/cfm56_5b6.xml index 021e7a4f..c1ab7c74 100644 --- a/Engines/cfm56_5b6.xml +++ b/Engines/cfm56_5b6.xml @@ -13,7 +13,7 @@ 23300 - 8.2 + 7.1 0.8 0.03 23.4 diff --git a/Engines/v2522_a5.xml b/Engines/v2522_a5.xml index d5bf4557..040ef942 100644 --- a/Engines/v2522_a5.xml +++ b/Engines/v2522_a5.xml @@ -13,7 +13,7 @@ 23000 - 8.1 + 7.1 0.8 0.03 23.4 diff --git a/Engines/v2527_a5.xml b/Engines/v2527_a5.xml index e76c3c6a..8e125b4f 100644 --- a/Engines/v2527_a5.xml +++ b/Engines/v2527_a5.xml @@ -13,7 +13,7 @@ 26600 - 8.1 + 7.1 0.8 0.03 23.4 diff --git a/Engines/v2533_a5.xml b/Engines/v2533_a5.xml index 10aa2f1d..f3a22ffc 100644 --- a/Engines/v2533_a5.xml +++ b/Engines/v2533_a5.xml @@ -13,7 +13,7 @@ 32000 - 8.1 + 7.1 0.8 0.03 23.4 diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml index e217f8e4..4dc64d17 100644 --- a/Models/FlightDeck/a320.flightdeck.xml +++ b/Models/FlightDeck/a320.flightdeck.xml @@ -166,7 +166,7 @@ - + /options/EIS2 /options/eng CFM @@ -214,6 +214,35 @@ + + Aircraft/A320Family/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-CFM.xml + + -0.5807 + 0 + -0.0442 + -15 + + + + /options/EIS2 + + /options/eng + CFM + + + + /systems/electrical/bus/ac1 + 25 + + + /systems/electrical/bus/ac2 + 25 + + + + + + Aircraft/A320Family/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-IAE.xml diff --git a/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-CFM.xml b/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-CFM.xml new file mode 100644 index 00000000..f54add32 --- /dev/null +++ b/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-CFM.xml @@ -0,0 +1,1118 @@ + + + + + resCFM/eicasCFM.ac + + + select + XX.1 + XX1 + + + + /controls/engines/engine-start-switch + 2 + + + /engines/engine[0]/n2 + 5 + + + + + + + select + XX.2 + XX2 + + + + /controls/engines/engine-start-switch + 2 + + + /engines/engine[1]/n2 + 5 + + + + + + + select + osgtext-green1 + n11 + egt1 + n1limy1 + thrpos1 + rev1.g + rev1.y + + + + /controls/engines/engine-start-switch + 2 + + + /engines/engine[0]/n2 + 5 + + + + + + + select + osgtext-green2 + n12 + egt2 + n1limy2 + thrpos2 + rev2.g + rev2.y + + + + /controls/engines/engine-start-switch + 2 + + + /engines/engine[1]/n2 + 5 + + + + + + + select + thrpos1 + + + /engines/engine[0]/reverser-pos-norm + 0.01 + + + + + + select + thrpos2 + + + /engines/engine[1]/reverser-pos-norm + 0.01 + + + + + + select + rev1.y + + + + /engines/engine[0]/reverser-pos-norm + 0.01 + + + /engines/engine[0]/reverser-pos-norm + 0.9500000001 + + + + + + + select + rev2.y + + + + /engines/engine[1]/reverser-pos-norm + 0.01 + + + /engines/engine[1]/reverser-pos-norm + 0.9500000001 + + + + + + + select + rev1.g + + + /engines/engine[0]/reverser-pos-norm + 0.95 + + + + + + select + rev2.g + + + /engines/engine[1]/reverser-pos-norm + 0.95 + + + + + + material + osgtext-green + osgtext-green1 + osgtext-green2 + rev1.g + rev2.g + + 0 + 0.543 + 0 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + 0 + 0.543 + 0 + + + + + material + XX.1 + XX.2 + + 1 + 0.45 + 0 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + 1 + 0.45 + 0 + + + + + material + rev1.y + rev2.y + + 1 + 1 + 0 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + 1 + 1 + 0 + + + + + material + osgtext-blue + + 0.06 + 0.55 + 1 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + 0.06 + 0.55 + 1 + + + + + + + + + osgtext-green1 + + 0.0004 + -0.0265 + 0.0527 + + center-center + yz-plane + number-value + %3.1f + /engines/engine/n1 + false + helvetica_bold.txf + true + false + false + 0.005 + + 32 + 32 + + + + + osgtext-green2 + + 0.0004 + 0.0420 + 0.0527 + + center-center + yz-plane + number-value + %3.1f + /engines/engine[1]/n1 + false + helvetica_bold.txf + true + false + false + 0.005 + + 32 + 32 + + + + + XX.1 + + 0.0004 + -0.0265 + 0.0527 + + center-center + yz-plane + text-value + XX + autopilot/serviceable + false + helvetica_bold.txf + true + false + false + 0.005 + + 32 + 32 + + + + + XX.2 + + 0.0004 + 0.0420 + 0.0527 + + center-center + yz-plane + text-value + XX + autopilot/serviceable + false + helvetica_bold.txf + true + false + false + 0.005 + + 32 + 32 + + + + + rev1.y + + 0.0004 + -0.0345 + 0.0645 + + center-center + yz-plane + text-value + REV + autopilot/serviceable + false + helvetica_bold.txf + true + false + true + 0.0065 + + 32 + 32 + + + + + rev2.y + + 0.0004 + 0.0340 + 0.0645 + + center-center + yz-plane + REV + text-value + autopilot/serviceable + false + helvetica_bold.txf + true + false + true + 0.0065 + + 32 + 32 + + + + + rev1.g + + 0.0004 + -0.0345 + 0.0645 + + center-center + yz-plane + text-value + REV + autopilot/serviceable + false + helvetica_bold.txf + true + false + true + 0.0065 + + 32 + 32 + + + + + rev2.g + + 0.0004 + 0.0340 + 0.0645 + + center-center + yz-plane + REV + text-value + autopilot/serviceable + false + helvetica_bold.txf + true + false + true + 0.0065 + + 32 + 32 + + + + + + + osgtext-green1 + + 0.0004 + -0.0349 + 0.0278 + + center-center + yz-plane + number-value + %4.0f + /engines/engine/egt-actual + false + helvetica_bold.txf + true + false + false + 0.005 + + 32 + 32 + + + + + osgtext-green2 + + 0.0004 + 0.0334 + 0.0278 + + center-center + yz-plane + number-value + %4.0f + /engines/engine[1]/egt-actual + false + helvetica_bold.txf + true + false + false + 0.005 + + 32 + 32 + + + + + XX.1 + + 0.0004 + -0.0349 + 0.0278 + + center-center + yz-plane + text-value + XX + autopilot/serviceable + false + helvetica_bold.txf + true + false + false + 0.005 + + 32 + 32 + + + + + XX.2 + + 0.0004 + 0.0334 + 0.0278 + + center-center + yz-plane + text-value + XX + autopilot/serviceable + false + helvetica_bold.txf + true + false + false + 0.005 + + 32 + 32 + + + + + + + osgtext-green1 + + 0.0004 + -0.0349 + 0.011 + + center-center + yz-plane + number-value + %3.1f + /engines/engine/n2 + false + helvetica_bold.txf + true + false + false + 0.005 + + 32 + 32 + + + + + osgtext-green2 + + 0.0004 + 0.0336 + 0.011 + + center-center + yz-plane + number-value + %3.1f + /engines/engine[1]/n2 + false + helvetica_bold.txf + true + false + false + 0.005 + + 32 + 32 + + + + + XX.1 + + 0.0004 + -0.0349 + 0.011 + + center-center + yz-plane + text-value + XX + autopilot/serviceable + false + helvetica_bold.txf + true + false + false + 0.005 + + 32 + 32 + + + + + XX.2 + + 0.0004 + 0.0336 + 0.011 + + center-center + yz-plane + text-value + XX + autopilot/serviceable + false + helvetica_bold.txf + true + false + false + 0.005 + + 32 + 32 + + + + + + + osgtext-blue + + 0.0004 + 0.07 + 0.072 + + center-center + yz-plane + text-value + %s + /controls/engines/thrust-limit + false + helvetica_bold.txf + true + false + false + 0.005 + + 32 + 32 + + + + + osgtext-green + + 0.0004 + 0.07 + 0.066 + + center-center + yz-plane + number-value + %3.1f + /controls/engines/n1-limit + false + helvetica_bold.txf + true + false + false + 0.005 + + 32 + 32 + + + + + + + osgtext-green1 + + 0.0004 + -0.0349 + -0.0036 + + center-center + yz-plane + number-value + %4.0f + /engines/engine/fuel-flow_actual + false + helvetica_bold.txf + true + false + false + 0.005 + + 32 + 32 + + + + + osgtext-green2 + + 0.0004 + 0.0336 + -0.0036 + + center-center + yz-plane + number-value + %4.0f + /engines/engine[1]/fuel-flow_actual + false + helvetica_bold.txf + true + false + false + 0.005 + + 32 + 32 + + + + + XX.1 + + 0.0004 + -0.0349 + -0.0036 + + center-center + yz-plane + text-value + XX + autopilot/serviceable + false + helvetica_bold.txf + true + false + false + 0.005 + + 32 + 32 + + + + + XX.2 + + 0.0004 + 0.0336 + -0.0036 + + center-center + yz-plane + text-value + XX + autopilot/serviceable + false + helvetica_bold.txf + true + false + false + 0.005 + + 32 + 32 + + + + + + + osgtext-green + + 0.0004 + -0.0447 + -0.0160 + + center-center + yz-plane + number-value + %5.1f + consumables/fuel/total-fuel-kg + false + helvetica_bold.txf + true + false + false + 0.006 + + 32 + 32 + + + + + + + + + rotate + n11 + /engines/engine/n1 + + 23-13 + 50 53 + 100152 + 110170 + +
+ 0 + -0.0350 + 0.0591 +
+ + -1 + 0 + 0 + +
+ + + rotate + n12 + /engines/engine[1]/n1 + + 23-13 + 50 53 + 100152 + 110170 + +
+ 0 + 0.0335 + 0.0591 +
+ + -1 + 0 + 0 + +
+ + + rotate + n1limy1 + /controls/engines/n1-limit + + 23-13 + 50 53 + 100152 + 110170 + +
+ 0 + -0.0350 + 0.0591 +
+ + -1 + 0 + 0 + +
+ + + rotate + n1limy2 + /controls/engines/n1-limit + + 23-13 + 50 53 + 100152 + 110170 + +
+ 0 + 0.0335 + 0.0591 +
+ + -1 + 0 + 0 + +
+ + + rotate + thrpos1 + /controls/engines/engine[0]/throttle + + 0.00000-12 + 0.23350 53 + 0.59999135 + 0.60000136 + 0.64999136 + 0.65000137 + 0.77999146 + 0.78000147 + 0.82999147 + 0.83000148 + 0.94999154 + 0.95000155 + 1.00000155 + +
+ 0 + -0.0350 + 0.0591 +
+ + -1 + 0 + 0 + +
+ + + rotate + thrpos2 + /controls/engines/engine[1]/throttle + + 0.00000-12 + 0.23350 53 + 0.59999135 + 0.60000136 + 0.64999136 + 0.65000137 + 0.77999146 + 0.78000147 + 0.82999147 + 0.83000148 + 0.94999154 + 0.95000155 + 1.00000155 + +
+ 0 + 0.0335 + 0.0591 +
+ + -1 + 0 + 0 + +
+ + + + + rotate + egt1 + /engines/engine/egt-actual + + 0 0 + 500 90 + 1000180 + +
+ 0 + -0.0351 + 0.0271 +
+ + -1 + 0 + 0 + +
+ + + rotate + egt2 + /engines/engine[1]/egt-actual + + 0 0 + 500 90 + 1000180 + +
+ 0 + 0.0334 + 0.0271 +
+ + -1 + 0 + 0 + +
+ + + + + osgtext-green + + 0.0007 + 0.0335 + -0.0172 + + center-center + yz-plane + text-value + %s + /controls/flight/flap-txt + false + helvetica_bold.txf + true + false + false + 0.005 + + 32 + 32 + + + + + + + + + +
diff --git a/Models/Instruments/Upper-ECAM-EIS2/resCFM/eicasCFM-extra.png b/Models/Instruments/Upper-ECAM-EIS2/resCFM/eicasCFM-extra.png index 7565c53e..ce53f213 100644 Binary files a/Models/Instruments/Upper-ECAM-EIS2/resCFM/eicasCFM-extra.png and b/Models/Instruments/Upper-ECAM-EIS2/resCFM/eicasCFM-extra.png differ diff --git a/Models/Instruments/Upper-ECAM-EIS2/resCFM/eicasCFM.ac b/Models/Instruments/Upper-ECAM-EIS2/resCFM/eicasCFM.ac index ec178b92..1b1a01ac 100644 --- a/Models/Instruments/Upper-ECAM-EIS2/resCFM/eicasCFM.ac +++ b/Models/Instruments/Upper-ECAM-EIS2/resCFM/eicasCFM.ac @@ -4,7 +4,7 @@ MATERIAL "DefaultWhite.001" rgb 0 0 0 amb 0 0 0 emis 0 0 0 spec 0 0 0 shi 64 MATERIAL "ac3dmat9" rgb 0 0.356863 0.717647 amb 0 0 0 emis 0 0.356863 0.717647 spec 0 0 0 shi 0 trans 0 MATERIAL "Material.001" rgb 0.8 0.5614 0 amb 1 1 1 emis 0.8 0.8 0.8 spec 0.5 0.5 0.5 shi 50 trans 0 OBJECT world -kids 18 +kids 14 OBJECT poly name "egt2" loc 0.000794735 0.027279 -0.0182949 @@ -45,25 +45,6 @@ refs 4 kids 0 OBJECT poly name "n12" -loc 0.000794736 -0.000248273 -0.0255507 -texture "symbols.png" -crease 45.000000 -numvert 4 -0 -0.00188643 0.00651396 -0 -0.00245427 0.00633497 -0 0.00156807 -0.00661433 -0 0.00270377 -0.0062563 -numsurf 1 -SURF 0x30 -mat 0 -refs 4 -0 0.343129 0.181706 -1 0.343129 0.146419 -2 0.0771681 0.146419 -3 0.0771681 0.181706 -kids 0 -OBJECT poly -name "epr2" loc 0.000794735 0.0565868 -0.0269054 texture "symbols.png" crease 45.000000 @@ -82,7 +63,7 @@ refs 4 3 0.0771681 0.181706 kids 0 OBJECT poly -name "eprlimy2" +name "n1limy2" loc 0.00028362 0.057454 -0.016538 texture "yellow.png" crease 30.000002 @@ -957,7 +938,7 @@ refs 3 60 0.5 0.5 kids 0 OBJECT poly -name "eprlimy1" +name "n1limy1" loc 0.00028362 0.057454 0.0520734 texture "yellow.png" crease 30.000002 @@ -1832,25 +1813,6 @@ refs 3 0 0.5 0.5 kids 0 OBJECT poly -name "n11" -loc 0.000794736 -0.000248273 0.0430787 -texture "symbols.png" -crease 45.000000 -numvert 4 -0 0.00270377 -0.0062563 -0 0.00156807 -0.00661432 -0 -0.00245427 0.00633497 -0 -0.00188643 0.00651396 -numsurf 1 -SURF 0x30 -mat 0 -refs 4 -3 0.343129 0.181706 -2 0.343129 0.146419 -1 0.0771681 0.146419 -0 0.0771681 0.181706 -kids 0 -OBJECT poly name "egt1" loc 0.000794735 0.027279 0.0503317 texture "symbols.png" @@ -1870,7 +1832,7 @@ refs 4 3 0.0771681 0.181706 kids 0 OBJECT poly -name "epr1" +name "n11" loc 0.000794735 0.0565868 0.0416832 texture "symbols.png" crease 45.000000 @@ -1891,7 +1853,7 @@ kids 0 OBJECT poly name "face" loc 1.66782e-005 -0.0851298 -0.51126 -texture "eicasIAE.png" +texture "eicasCFM.png" crease 45.000000 numvert 16 0 0.00773945 0.430689 @@ -2023,7 +1985,7 @@ kids 0 OBJECT poly name "XX2" loc 2.26668e-005 -0.0851298 -0.51126 -texture "eicasIAE-extra.png" +texture "eicasCFM-extra.png" crease 45.000000 numvert 8 0 0.104181 0.495741 @@ -2058,56 +2020,9 @@ refs 4 4 0.81184 0.621658 kids 0 OBJECT poly -name "XX4" -loc 2.26668e-005 -0.0851298 -0.51126 -texture "eicasIAE-extra.png" -crease 45.000000 -numvert 4 -0 0.104181 0.495741 -0 0.0812431 0.495741 -0 0.104181 0.460072 -0 0.0812431 0.460072 -numsurf 1 -SURF 0x10 -mat 0 -refs 4 -2 0.81184 0.621658 -0 0.594542 0.621658 -1 0.594542 0.478566 -3 0.81184 0.478567 -kids 0 -OBJECT poly -name "XX3" -loc 2.26668e-005 -0.0851298 -0.51126 -texture "eicasIAE-extra.png" -crease 45.000000 -numvert 6 -0 0.104181 0.56434 -0 0.0812431 0.56434 -0 0.101015 0.527829 -0 0.0812431 0.527829 -0 0.104181 0.527829 -0 0.104181 0.531131 -numsurf 2 -SURF 0x10 -mat 0 -refs 3 -4 0.399062 0.621658 -5 0.378944 0.621658 -2 0.399062 0.601908 -SURF 0x10 -mat 0 -refs 5 -1 0.176631 0.478566 -3 0.399062 0.478566 -2 0.399062 0.601908 -5 0.378944 0.621658 -0 0.176631 0.621658 -kids 0 -OBJECT poly name "XX1" loc 2.26668e-005 -0.0851298 -0.51126 -texture "eicasIAE-extra.png" +texture "eicasCFM-extra.png" crease 45.000000 numvert 8 0 0.161764 0.56434 diff --git a/Models/Instruments/Upper-ECAM-EIS2/resCFM/eicasCFM.png b/Models/Instruments/Upper-ECAM-EIS2/resCFM/eicasCFM.png index c7850f12..d897a8a2 100644 Binary files a/Models/Instruments/Upper-ECAM-EIS2/resCFM/eicasCFM.png and b/Models/Instruments/Upper-ECAM-EIS2/resCFM/eicasCFM.png differ diff --git a/Models/Instruments/Upper-ECAM-EIS2/resIAE/eicasIAE-extra.png b/Models/Instruments/Upper-ECAM-EIS2/resIAE/eicasIAE-extra.png index 4ff5e284..ee0eb3e1 100644 Binary files a/Models/Instruments/Upper-ECAM-EIS2/resIAE/eicasIAE-extra.png and b/Models/Instruments/Upper-ECAM-EIS2/resIAE/eicasIAE-extra.png differ diff --git a/Models/Instruments/Upper-ECAM-EIS2/resIAE/eicasIAE.png b/Models/Instruments/Upper-ECAM-EIS2/resIAE/eicasIAE.png index 48997183..4ab1e7f5 100644 Binary files a/Models/Instruments/Upper-ECAM-EIS2/resIAE/eicasIAE.png and b/Models/Instruments/Upper-ECAM-EIS2/resIAE/eicasIAE.png differ diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM-CFM.xml b/Models/Instruments/Upper-ECAM/Upper-ECAM-CFM.xml index cf30afb1..ddde3cb1 100644 --- a/Models/Instruments/Upper-ECAM/Upper-ECAM-CFM.xml +++ b/Models/Instruments/Upper-ECAM/Upper-ECAM-CFM.xml @@ -197,8 +197,6 @@ material XX.1 XX.2 - XX.3 - XX.4 1 0.45