diff --git a/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-CFM.xml b/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-CFM.xml index 08eec1c9..61d11909 100644 --- a/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-CFM.xml +++ b/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-CFM.xml @@ -20,7 +20,7 @@ /engines/engine[0]/n2 - 5 + 2 @@ -38,12 +38,34 @@ /engines/engine[1]/n2 - 5 + 2 + + select + XX.3 + + + /engines/engine[0]/n2 + 2 + + + + + + select + XX.4 + + + /engines/engine[1]/n2 + 2 + + + + select osgtext-green1 @@ -61,7 +83,7 @@ /engines/engine[0]/n2 - 5 + 2 @@ -84,12 +106,34 @@ /engines/engine[1]/n2 - 5 + 2 + + select + osgtext-green3 + + + /engines/engine[0]/n2 + 2 + + + + + + select + osgtext-green4 + + + /engines/engine[1]/n2 + 2 + + + + select thrpos1 @@ -173,6 +217,8 @@ osgtext-green osgtext-green1 osgtext-green2 + osgtext-green3 + osgtext-green4 rev1.g rev2.g @@ -201,6 +247,8 @@ material XX.1 XX.2 + XX.3 + XX.4 1 0.4 @@ -571,7 +619,7 @@ - osgtext-green1 + osgtext-green3 0.0004 -0.0349 @@ -595,7 +643,7 @@ - osgtext-green2 + osgtext-green4 0.0004 0.0336 @@ -619,7 +667,7 @@ - XX.1 + XX.3 0.0004 -0.0349 @@ -643,7 +691,7 @@ - XX.2 + XX.4 0.0004 0.0336 @@ -719,7 +767,7 @@ - osgtext-green1 + osgtext-green3 0.0004 -0.0349 @@ -743,7 +791,7 @@ - osgtext-green2 + osgtext-green4 0.0004 0.0336 @@ -767,7 +815,7 @@ - XX.1 + XX.3 0.0004 -0.0349 @@ -791,7 +839,7 @@ - XX.2 + XX.4 0.0004 0.0336 diff --git a/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-IAE.xml b/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-IAE.xml index e88c2e28..240f5085 100644 --- a/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-IAE.xml +++ b/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-IAE.xml @@ -20,7 +20,7 @@ /engines/engine[0]/n2 - 5 + 2 @@ -38,7 +38,7 @@ /engines/engine[1]/n2 - 5 + 2 @@ -68,6 +68,74 @@ + + select + XX.5 + + + /engines/engine[0]/n2 + 2 + + + + + + select + XX.6 + + + /engines/engine[1]/n2 + 2 + + + + + + select + osgtext-green1 + epr1 + egt1 + eprlimy1 + thrpos1 + rev1.g + rev1.y + + + + /controls/engines/engine-start-switch + 2 + + + /engines/engine[0]/n2 + 2 + + + + + + + select + osgtext-green2 + epr2 + egt2 + eprlimy2 + thrpos2 + rev2.g + rev2.y + + + + /controls/engines/engine-start-switch + 2 + + + /engines/engine[1]/n2 + 2 + + + + + select osgtext-green3 @@ -94,47 +162,23 @@ select - osgtext-green1 - epr1 - egt1 - eprlimy1 - thrpos1 - rev1.g - rev1.y + osgtext-green5 - - - /controls/engines/engine-start-switch - 2 - - - /engines/engine[0]/n2 - 5 - - + + /engines/engine[0]/n2 + 2 + select - osgtext-green2 - epr2 - egt2 - eprlimy2 - thrpos2 - rev2.g - rev2.y + osgtext-green6 - - - /controls/engines/engine-start-switch - 2 - - - /engines/engine[1]/n2 - 5 - - + + /engines/engine[1]/n2 + 2 + @@ -223,6 +267,8 @@ osgtext-green2 osgtext-green3 osgtext-green4 + osgtext-green5 + osgtext-green6 rev1.g rev2.g @@ -253,6 +299,8 @@ XX.2 XX.3 XX.4 + XX.5 + XX.6 1 0.4 @@ -769,7 +817,7 @@ - osgtext-green1 + osgtext-green5 0.0004 -0.069 @@ -793,7 +841,7 @@ - osgtext-green2 + osgtext-green6 0.0004 0.069 @@ -817,7 +865,7 @@ - XX.1 + XX.5 0.0004 -0.069 @@ -841,7 +889,7 @@ - XX.2 + XX.6 0.0004 0.069 @@ -917,7 +965,7 @@ - osgtext-green1 + osgtext-green5 0.0004 -0.069 @@ -941,7 +989,7 @@ - osgtext-green2 + osgtext-green6 0.0004 0.069 @@ -965,7 +1013,7 @@ - XX.1 + XX.5 0.0004 -0.069 @@ -989,7 +1037,7 @@ - XX.2 + XX.6 0.0004 0.069 diff --git a/Models/Instruments/Upper-ECAM-MSG/ECAM-MSG.xml b/Models/Instruments/Upper-ECAM-MSG/ECAM-MSG.xml index 7b05ca0e..4714dde9 100644 --- a/Models/Instruments/Upper-ECAM-MSG/ECAM-MSG.xml +++ b/Models/Instruments/Upper-ECAM-MSG/ECAM-MSG.xml @@ -10,694 +10,30 @@ EMPTY.ac - - - + + LEFT-MSG.xml + + + + /ECAM/left-msg + MSG + + + /ECAM/left-msg + TO-MEMO + + + + - - Line1W - - 0.0004 - -0.078 - -0.029 - - left-center - yz-plane - text-value - %s - /ECAM/msg/line1 - false - lucida.txf - true - false - false - 0.005 - - 64 - 64 - - - - - select - Line1W + + TO-MEMO.xml - /ECAM/msg/line1c - w + /ECAM/left-msg + TO-MEMO - - - - Line2W - - 0.0004 - -0.078 - -0.035 - - left-center - yz-plane - text-value - %s - /ECAM/msg/line2 - false - lucida.txf - true - false - false - 0.005 - - 64 - 64 - - - - - select - Line2W - - - /ECAM/msg/line2c - w - - - - - - Line3W - - 0.0004 - -0.078 - -0.041 - - left-center - yz-plane - text-value - %s - /ECAM/msg/line3 - false - lucida.txf - true - false - false - 0.005 - - 64 - 64 - - - - - select - Line3W - - - /ECAM/msg/line3c - w - - - - - - Line4W - - 0.0004 - -0.078 - -0.047 - - left-center - yz-plane - text-value - %s - /ECAM/msg/line4 - false - lucida.txf - true - false - false - 0.005 - - 64 - 64 - - - - - select - Line4W - - - /ECAM/msg/line4c - w - - - - - - Line5W - - 0.0004 - -0.078 - -0.053 - - left-center - yz-plane - text-value - %s - /ECAM/msg/line5 - false - lucida.txf - true - false - false - 0.005 - - 64 - 64 - - - - - select - Line5W - - - /ECAM/msg/line5c - w - - - - - - Line6W - - 0.0004 - -0.078 - -0.059 - - left-center - yz-plane - text-value - %s - /ECAM/msg/line6 - false - lucida.txf - true - false - false - 0.005 - - 64 - 64 - - - - - select - Line6W - - - /ECAM/msg/line6c - w - - - - - - Line7W - - 0.0004 - -0.078 - -0.065 - - left-center - yz-plane - text-value - %s - /ECAM/msg/line7 - false - lucida.txf - true - false - false - 0.005 - - 64 - 64 - - - - - select - Line7W - - - /ECAM/msg/line7c - w - - - - - - Line8W - - 0.0004 - -0.078 - -0.071 - - left-center - yz-plane - text-value - %s - /ECAM/msg/line8 - false - lucida.txf - true - false - false - 0.005 - - 64 - 64 - - - - - select - Line8W - - - /ECAM/msg/line8c - w - - - - - - - - - - Line1G - - 0.0004 - -0.078 - -0.029 - - left-center - yz-plane - text-value - %s - /ECAM/msg/line1 - false - lucida.txf - true - false - false - 0.005 - - 64 - 64 - - - - - select - Line1G - - - /ECAM/msg/line1c - g - - - - - - Line2G - - 0.0004 - -0.078 - -0.035 - - left-center - yz-plane - text-value - %s - /ECAM/msg/line2 - false - lucida.txf - true - false - false - 0.005 - - 64 - 64 - - - - - select - Line2G - - - /ECAM/msg/line2c - g - - - - - - Line3G - - 0.0004 - -0.078 - -0.041 - - left-center - yz-plane - text-value - %s - /ECAM/msg/line3 - false - lucida.txf - true - false - false - 0.005 - - 64 - 64 - - - - - select - Line3G - - - /ECAM/msg/line3c - g - - - - - - Line4G - - 0.0004 - -0.078 - -0.047 - - left-center - yz-plane - text-value - %s - /ECAM/msg/line4 - false - lucida.txf - true - false - false - 0.005 - - 64 - 64 - - - - - select - Line4G - - - /ECAM/msg/line4c - g - - - - - - Line5G - - 0.0004 - -0.078 - -0.053 - - left-center - yz-plane - text-value - %s - /ECAM/msg/line5 - false - lucida.txf - true - false - false - 0.005 - - 64 - 64 - - - - - select - Line5G - - - /ECAM/msg/line5c - g - - - - - - Line6G - - 0.0004 - -0.078 - -0.059 - - left-center - yz-plane - text-value - %s - /ECAM/msg/line6 - false - lucida.txf - true - false - false - 0.005 - - 64 - 64 - - - - - select - Line6G - - - /ECAM/msg/line6c - g - - - - - - Line7G - - 0.0004 - -0.078 - -0.065 - - left-center - yz-plane - text-value - %s - /ECAM/msg/line7 - false - lucida.txf - true - false - false - 0.005 - - 64 - 64 - - - - - select - Line7G - - - /ECAM/msg/line7c - g - - - - - - Line8G - - 0.0004 - -0.078 - -0.071 - - left-center - yz-plane - text-value - %s - /ECAM/msg/line8 - false - lucida.txf - true - false - false - 0.005 - - 64 - 64 - - - - - select - Line8G - - - /ECAM/msg/line8c - g - - - - - - - - - - - material - Line1W - Line2W - Line3W - Line4W - Line5W - Line6W - Line7W - Line8W - - 1 - 1 - 1 - - - 0 - 0 - 0 - - - 0 - 0 - 0 - - - 1 - 1 - 1 - - - - - - material - Line1G - Line2G - Line3G - Line4G - Line5G - Line6G - Line7G - Line8G - - 0 - 0.543 - 0 - - - 0 - 0 - 0 - - - 0 - 0 - 0 - - - 0 - 0.543 - 0 - - - - - - - - + diff --git a/Models/Instruments/Upper-ECAM-MSG/LEFT-MSG.xml b/Models/Instruments/Upper-ECAM-MSG/LEFT-MSG.xml new file mode 100644 index 00000000..47078aa4 --- /dev/null +++ b/Models/Instruments/Upper-ECAM-MSG/LEFT-MSG.xml @@ -0,0 +1,1602 @@ + + + + + + + EMPTY.ac + + + + + + + Line1W + + 0.0004 + -0.078 + -0.029 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line1 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line1W + + + /ECAM/msg/line1c + w + + + + + + Line2W + + 0.0004 + -0.078 + -0.035 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line2 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line2W + + + /ECAM/msg/line2c + w + + + + + + Line3W + + 0.0004 + -0.078 + -0.041 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line3 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line3W + + + /ECAM/msg/line3c + w + + + + + + Line4W + + 0.0004 + -0.078 + -0.047 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line4 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line4W + + + /ECAM/msg/line4c + w + + + + + + Line5W + + 0.0004 + -0.078 + -0.053 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line5 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line5W + + + /ECAM/msg/line5c + w + + + + + + Line6W + + 0.0004 + -0.078 + -0.059 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line6 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line6W + + + /ECAM/msg/line6c + w + + + + + + Line7W + + 0.0004 + -0.078 + -0.065 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line7 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line7W + + + /ECAM/msg/line7c + w + + + + + + Line8W + + 0.0004 + -0.078 + -0.071 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line8 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line8W + + + /ECAM/msg/line8c + w + + + + + + + + + + Line1G + + 0.0004 + -0.078 + -0.029 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line1 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line1G + + + /ECAM/msg/line1c + g + + + + + + Line2G + + 0.0004 + -0.078 + -0.035 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line2 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line2G + + + /ECAM/msg/line2c + g + + + + + + Line3G + + 0.0004 + -0.078 + -0.041 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line3 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line3G + + + /ECAM/msg/line3c + g + + + + + + Line4G + + 0.0004 + -0.078 + -0.047 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line4 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line4G + + + /ECAM/msg/line4c + g + + + + + + Line5G + + 0.0004 + -0.078 + -0.053 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line5 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line5G + + + /ECAM/msg/line5c + g + + + + + + Line6G + + 0.0004 + -0.078 + -0.059 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line6 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line6G + + + /ECAM/msg/line6c + g + + + + + + Line7G + + 0.0004 + -0.078 + -0.065 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line7 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line7G + + + /ECAM/msg/line7c + g + + + + + + Line8G + + 0.0004 + -0.078 + -0.071 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line8 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line8G + + + /ECAM/msg/line8c + g + + + + + + + + + + Line1B + + 0.0004 + -0.078 + -0.029 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line1 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line1B + + + /ECAM/msg/line1c + b + + + + + + Line2B + + 0.0004 + -0.078 + -0.035 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line2 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line2B + + + /ECAM/msg/line2c + b + + + + + + Line3B + + 0.0004 + -0.078 + -0.041 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line3 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line3B + + + /ECAM/msg/line3c + b + + + + + + Line4B + + 0.0004 + -0.078 + -0.047 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line4 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line4B + + + /ECAM/msg/line4c + b + + + + + + Line5B + + 0.0004 + -0.078 + -0.053 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line5 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line5B + + + /ECAM/msg/line5c + b + + + + + + Line6B + + 0.0004 + -0.078 + -0.059 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line6 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line6B + + + /ECAM/msg/line6c + b + + + + + + Line7B + + 0.0004 + -0.078 + -0.065 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line7 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line7B + + + /ECAM/msg/line7c + b + + + + + + Line8B + + 0.0004 + -0.078 + -0.071 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line8 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line8B + + + /ECAM/msg/line8c + b + + + + + + + + + + Line1A + + 0.0004 + -0.078 + -0.029 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line1 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line1A + + + /ECAM/msg/line1c + a + + + + + + Line2A + + 0.0004 + -0.078 + -0.035 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line2 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line2A + + + /ECAM/msg/line2c + a + + + + + + Line3A + + 0.0004 + -0.078 + -0.041 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line3 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line3A + + + /ECAM/msg/line3c + a + + + + + + Line4A + + 0.0004 + -0.078 + -0.047 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line4 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line4A + + + /ECAM/msg/line4c + a + + + + + + Line5A + + 0.0004 + -0.078 + -0.053 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line5 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line5A + + + /ECAM/msg/line5c + a + + + + + + Line6A + + 0.0004 + -0.078 + -0.059 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line6 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line6A + + + /ECAM/msg/line6c + a + + + + + + Line7A + + 0.0004 + -0.078 + -0.065 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line7 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line7A + + + /ECAM/msg/line7c + a + + + + + + Line8A + + 0.0004 + -0.078 + -0.071 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line8 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line8A + + + /ECAM/msg/line8c + a + + + + + + + + + + Line1R + + 0.0004 + -0.078 + -0.029 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line1 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line1R + + + /ECAM/msg/line1c + r + + + + + + Line2R + + 0.0004 + -0.078 + -0.035 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line2 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line2R + + + /ECAM/msg/line2c + r + + + + + + Line3R + + 0.0004 + -0.078 + -0.041 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line3 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line3R + + + /ECAM/msg/line3c + r + + + + + + Line4R + + 0.0004 + -0.078 + -0.047 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line4 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line4R + + + /ECAM/msg/line4c + r + + + + + + Line5R + + 0.0004 + -0.078 + -0.053 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line5 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line5R + + + /ECAM/msg/line5c + r + + + + + + Line6R + + 0.0004 + -0.078 + -0.059 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line6 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line6R + + + /ECAM/msg/line6c + r + + + + + + Line7R + + 0.0004 + -0.078 + -0.065 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line7 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line7R + + + /ECAM/msg/line7c + r + + + + + + Line8R + + 0.0004 + -0.078 + -0.071 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line8 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line8R + + + /ECAM/msg/line8c + r + + + + + + + + + + + material + Line1W + Line2W + Line3W + Line4W + Line5W + Line6W + Line7W + Line8W + + 1 + 1 + 1 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + 1 + 1 + 1 + + + + + + material + Line1G + Line2G + Line3G + Line4G + Line5G + Line6G + Line7G + Line8G + + 0 + 0.543 + 0 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + 0 + 0.543 + 0 + + + + + + material + Line1B + Line2B + Line3B + Line4B + Line5B + Line6B + Line7B + Line8B + + 0 + 0.5 + 0.7 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + 0 + 0.5 + 0.7 + + + + + + material + Line1A + Line2A + Line3A + Line4A + Line5A + Line6A + Line7A + Line8A + + 1 + 0.4 + 0 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + 1 + 0.4 + 0 + + + + + + material + Line1R + Line2R + Line3R + Line4R + Line5R + Line6R + Line7R + Line8R + + 1 + 0 + 0 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + 1 + 0 + 0 + + + + diff --git a/Models/Instruments/Upper-ECAM-MSG/TO-MEMO.xml b/Models/Instruments/Upper-ECAM-MSG/TO-MEMO.xml new file mode 100644 index 00000000..3a05edf5 --- /dev/null +++ b/Models/Instruments/Upper-ECAM-MSG/TO-MEMO.xml @@ -0,0 +1,714 @@ + + + + + + + EMPTY.ac + + + + + + + Title + + 0.0004 + -0.078 + -0.029 + + left-center + yz-plane + text-value + T.O + autopilot/servicable + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + Line1G + + 0.0004 + -0.078 + -0.029 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line1 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + Line2G + + 0.0004 + -0.078 + -0.035 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line2 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + Line3G + + 0.0004 + -0.078 + -0.041 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line3 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + Line4G + + 0.0004 + -0.078 + -0.047 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line4 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + Line5G + + 0.0004 + -0.078 + -0.053 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line5 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + Line6G + + 0.0004 + -0.078 + -0.059 + + left-center + yz-plane + text-value + %s + /ECAM/msg/line6 + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + Line7G + + 0.0004 + -0.078 + -0.029 + + left-center + yz-plane + text-value + MAX + autopilot/servicable + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line7G + + + /systems/unused/ecam1 + 1 + + + + + + Line8G + + 0.0004 + -0.078 + -0.035 + + left-center + yz-plane + text-value + ON + autopilot/servicable + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line8G + + + + /controls/switches/no-smoking-sign + 1 + + + /controls/switches/seatbelt-sign + 1 + + + + + + + Line9G + + 0.0004 + -0.078 + -0.041 + + left-center + yz-plane + text-value + READY + autopilot/servicable + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line9G + + + /systems/unused/ecam1 + 1 + + + + + + Line10G + + 0.0004 + -0.078 + -0.047 + + left-center + yz-plane + text-value + ARM + autopilot/servicable + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line10G + + + /controls/flight/speedbrake-arm + 1 + + + + + + Line11G + + 0.0004 + -0.078 + -0.053 + + left-center + yz-plane + text-value + T.O + autopilot/servicable + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line11G + + + + /controls/flight/flap-pos + 1 + + + /controls/flight/flap-pos + 2 + + + /controls/flight/flap-pos + 3 + + + /controls/flight/flap-pos + 4 + + + + + + + Line12G + + 0.0004 + -0.078 + -0.059 + + left-center + yz-plane + text-value + T.O CONFIG NORMAL + autopilot/servicable + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line12G + + + + /controls/switches/no-smoking-sign + 1 + + + /controls/switches/seatbelt-sign + 1 + + + /controls/flight/speedbrake-arm + 1 + + + + /controls/flight/flap-pos + 1 + + + /controls/flight/flap-pos + 2 + + + /controls/flight/flap-pos + 3 + + + /controls/flight/flap-pos + 4 + + + + + + + + + + + + Line1B + + 0.0004 + -0.078 + -0.029 + + left-center + yz-plane + text-value + . . . . . . . . . . MAX + autopilot/servicable + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line1B + + + /systems/unused/ecam1 + 1 + + + + + + Line2B + + 0.0004 + -0.078 + -0.035 + + left-center + yz-plane + text-value + . . . . . . . . . . . . . . ON + autopilot/servicable + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line2B + + + + /controls/switches/no-smoking-sign + 1 + + + /controls/switches/seatbelt-sign + 1 + + + + + + + Line3B + + 0.0004 + -0.078 + -0.041 + + left-center + yz-plane + text-value + . . . . . . . . . . . .CHECK + autopilot/servicable + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line3B + + + /systems/unused/ecam1 + 1 + + + + + + Line4B + + 0.0004 + -0.078 + -0.047 + + left-center + yz-plane + text-value + . . . . . . . . . . . . . ARM + autopilot/servicable + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line4B + + + /controls/flight/speedbrake-arm + 1 + + + + + + Line5B + + 0.0004 + -0.078 + -0.053 + + left-center + yz-plane + text-value + . . . . . . . . . . . . . . T.O + autopilot/servicable + false + helvetica_bold.txf + true + false + false + 0.005 + + 64 + 64 + + + + + select + Line5B + + + + /controls/flight/flap-pos + 1 + + + /controls/flight/flap-pos + 2 + + + /controls/flight/flap-pos + 3 + + + /controls/flight/flap-pos + 4 + + + + + + + + + + + + material + Title + Line1G + Line2G + Line3G + Line4G + Line5G + Line6G + Line7G + Line8G + Line9G + Line10G + Line11G + Line12G + + 0 + 0.543 + 0 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + 0 + 0.543 + 0 + + + + + + material + Line1B + Line2B + Line3B + Line4B + Line5B + + 0 + 0.5 + 0.7 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + 0 + 0.5 + 0.7 + + + + diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM-CFM.xml b/Models/Instruments/Upper-ECAM/Upper-ECAM-CFM.xml index 11dae266..04aba019 100644 --- a/Models/Instruments/Upper-ECAM/Upper-ECAM-CFM.xml +++ b/Models/Instruments/Upper-ECAM/Upper-ECAM-CFM.xml @@ -20,7 +20,7 @@ /engines/engine[0]/n2 - 5 + 2 @@ -38,12 +38,34 @@ /engines/engine[1]/n2 - 5 + 2 + + select + XX.3 + + + /engines/engine[0]/n2 + 2 + + + + + + select + XX.4 + + + /engines/engine[1]/n2 + 2 + + + + select osgtext-green1 @@ -61,7 +83,7 @@ /engines/engine[0]/n2 - 5 + 2 @@ -84,12 +106,34 @@ /engines/engine[1]/n2 - 5 + 2 + + select + osgtext-green3 + + + /engines/engine[0]/n2 + 2 + + + + + + select + osgtext-green4 + + + /engines/engine[1]/n2 + 2 + + + + select thrpos1 @@ -173,6 +217,8 @@ osgtext-green osgtext-green1 osgtext-green2 + osgtext-green3 + osgtext-green4 rev1.g rev2.g @@ -201,6 +247,8 @@ material XX.1 XX.2 + XX.3 + XX.4 1 0.4 @@ -571,7 +619,7 @@ - osgtext-green1 + osgtext-green3 0.0004 -0.066 @@ -595,7 +643,7 @@ - osgtext-green2 + osgtext-green4 0.0004 0.00 @@ -619,7 +667,7 @@ - XX.1 + XX.3 0.0004 -0.066 @@ -643,7 +691,7 @@ - XX.2 + XX.4 0.0004 0.00 @@ -719,7 +767,7 @@ - osgtext-green1 + osgtext-green3 0.0004 -0.066 @@ -743,7 +791,7 @@ - osgtext-green2 + osgtext-green4 0.0004 0.00 @@ -767,7 +815,7 @@ - XX.1 + XX.3 0.0004 -0.066 @@ -791,7 +839,7 @@ - XX.2 + XX.4 0.0004 0.00 diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM-IAE.xml b/Models/Instruments/Upper-ECAM/Upper-ECAM-IAE.xml index 857f2159..702c83da 100644 --- a/Models/Instruments/Upper-ECAM/Upper-ECAM-IAE.xml +++ b/Models/Instruments/Upper-ECAM/Upper-ECAM-IAE.xml @@ -20,7 +20,7 @@ /engines/engine[0]/n2 - 5 + 2 @@ -38,7 +38,7 @@ /engines/engine[1]/n2 - 5 + 2 @@ -68,6 +68,74 @@ + + select + XX.5 + + + /engines/engine[0]/n2 + 2 + + + + + + select + XX.6 + + + /engines/engine[1]/n2 + 2 + + + + + + select + osgtext-green1 + epr1 + egt1 + eprlimy1 + thrpos1 + rev1.g + rev1.y + + + + /controls/engines/engine-start-switch + 2 + + + /engines/engine[0]/n2 + 2 + + + + + + + select + osgtext-green2 + epr2 + egt2 + eprlimy2 + thrpos2 + rev2.g + rev2.y + + + + /controls/engines/engine-start-switch + 2 + + + /engines/engine[1]/n2 + 2 + + + + + select osgtext-green3 @@ -94,47 +162,23 @@ select - osgtext-green1 - epr1 - egt1 - eprlimy1 - thrpos1 - rev1.g - rev1.y + osgtext-green5 - - - /controls/engines/engine-start-switch - 2 - - - /engines/engine[0]/n2 - 5 - - + + /engines/engine[0]/n2 + 2 + select - osgtext-green2 - epr2 - egt2 - eprlimy2 - thrpos2 - rev2.g - rev2.y + osgtext-green6 - - - /controls/engines/engine-start-switch - 2 - - - /engines/engine[1]/n2 - 5 - - + + /engines/engine[1]/n2 + 2 + @@ -223,6 +267,8 @@ osgtext-green2 osgtext-green3 osgtext-green4 + osgtext-green5 + osgtext-green6 rev1.g rev2.g @@ -253,6 +299,8 @@ XX.2 XX.3 XX.4 + XX.5 + XX.6 1 0.4 @@ -769,7 +817,7 @@ - osgtext-green1 + osgtext-green5 0.0004 -0.066 @@ -793,7 +841,7 @@ - osgtext-green2 + osgtext-green6 0.0004 0.00 @@ -817,7 +865,7 @@ - XX.1 + XX.5 0.0004 -0.066 @@ -841,7 +889,7 @@ - XX.2 + XX.6 0.0004 0.00 @@ -917,7 +965,7 @@ - osgtext-green1 + osgtext-green5 0.0004 0.0395 @@ -941,7 +989,7 @@ - osgtext-green2 + osgtext-green6 0.0004 0.0605 @@ -965,7 +1013,7 @@ - XX.1 + XX.5 0.0004 0.0395 @@ -989,7 +1037,7 @@ - XX.2 + XX.6 0.0004 0.0605 diff --git a/Nasal/ECAM.nas b/Nasal/ECAM.nas index a8f63d64..55e8c884 100644 --- a/Nasal/ECAM.nas +++ b/Nasal/ECAM.nas @@ -8,6 +8,8 @@ ################## setprop("/position/gear-agl-ft", 0); +setprop("/ECAM/noupdate", 0); +setprop("/ECAM/donotrevert", 0); ###################################################### # w = White, b = Blue, g = Green, a = Amber, r = Red # @@ -15,19 +17,20 @@ setprop("/position/gear-agl-ft", 0); var ECAMinit = func { MSGclr(); -# ECAMloop.start(); + ECAMloop.start(); } var MSGclr = func { - setprop("/ECAM/msg/memo", "clear"); - setprop("/ECAM/msg/line1", " "); - setprop("/ECAM/msg/line2", " "); - setprop("/ECAM/msg/line3", " "); - setprop("/ECAM/msg/line4", " "); - setprop("/ECAM/msg/line5", " "); - setprop("/ECAM/msg/line6", " "); - setprop("/ECAM/msg/line7", " "); - setprop("/ECAM/msg/line8", " "); + setprop("/ECAM/ecam-checklist-active", 0); + setprop("/ECAM/left-msg", "NONE"); + setprop("/ECAM/msg/line1", ""); + setprop("/ECAM/msg/line2", ""); + setprop("/ECAM/msg/line3", ""); + setprop("/ECAM/msg/line4", ""); + setprop("/ECAM/msg/line5", ""); + setprop("/ECAM/msg/line6", ""); + setprop("/ECAM/msg/line7", ""); + setprop("/ECAM/msg/line8", ""); setprop("/ECAM/msg/line1c", "w"); setprop("/ECAM/msg/line2c", "w"); setprop("/ECAM/msg/line3c", "w"); @@ -39,7 +42,32 @@ var MSGclr = func { } var ECAMloop = maketimer(1, func { - if (getprop("/FMGC/status/phase") == 0 or getprop("/FMGC/status/phase") == 1) { - # Activate T.O memo logic + var noUpdate = getprop("/ECAM/noupdate"); + var doNotRevert = getprop("/ECAM/donotrevert"); + if (getprop("/FMGC/status/phase") == 0 and getprop("/engines/engine[0]/state") == 3 and getprop("/engines/engine[1]/state") == 3) { + setprop("/ECAM/left-msg", "TO-MEMO"); + } else if (!doNotRevert) { + setprop("/ECAM/left-msg", "NONE"); + } + + var leftMSG = getprop("/ECAM/left-msg"); + + if (leftMSG == "TO-MEMO" and !noUpdate) { + setprop("/ECAM/msg/line1", " AUTO BRK"); + setprop("/ECAM/msg/line2", " SIGNS"); + setprop("/ECAM/msg/line3", " CABIN"); + setprop("/ECAM/msg/line4", " SPLRS"); + setprop("/ECAM/msg/line5", " FLAPS"); + setprop("/ECAM/msg/line6", ""); + setprop("/ECAM/msg/line7", ""); + setprop("/ECAM/msg/line8", ""); + setprop("/ECAM/msg/line1c", "g"); + setprop("/ECAM/msg/line2c", "g"); + setprop("/ECAM/msg/line3c", "g"); + setprop("/ECAM/msg/line4c", "g"); + setprop("/ECAM/msg/line5c", "g"); + setprop("/ECAM/msg/line6c", "g"); + setprop("/ECAM/msg/line7c", "g"); + setprop("/ECAM/msg/line8c", "g"); } });