diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml index 9c5eabd8..c9770c42 100644 --- a/Models/Instruments/OHpanel/OHpanel.xml +++ b/Models/Instruments/OHpanel/OHpanel.xml @@ -73,6 +73,10 @@ CFuelTank1Btn2O CFuelTank2Btn1F CFuelTank2Btn2O + Eng1AntiIceBtn1F + Eng1AntiIceBtn2O + Eng2AntiIceBtn1F + Eng2AntiIceBtn2O Eng1BleedBtn1F Eng1BleedBtn2O Eng2BleedBtn1F @@ -100,6 +104,7 @@ LFuelTank2Btn1F LFuelTank2Btn2O IrsOnBatLightOB + PrbWinHeatBtn2O PTU1F PTU2O RamAirBtn2O @@ -107,13 +112,12 @@ RFuelTank1Btn2O RFuelTank2Btn1F RFuelTank2Btn2O + WingAntiIceBtn1F + WingAntiIceBtn2O YellowElecPump1F YellowElecPump2O YellowEngPump1F YellowEngPump2O - PrbWinHeatBtn2 - PrbWinHeatBtn2O - PrbWinHeatBtn1 @@ -3593,177 +3597,19 @@ - - select - WingAntiIceBtn2O - - - - /controls/deice/wing - 1 - - - /controls/switches/annun-test - 1 - - - - - - - select - WingAntiIceBtn1F - - - /controls/switches/annun-test - 1 - - - - - - select - WingAntiIceBtn1 - - - /controls/switches/annun-test - 0 - - - - - - select - WingAntiIceBtn2 - - - /controls/deice/wing - 0 - - - - - - select - Eng1AntiIceBtn2O - - - - /controls/deice/lengine - 1 - - - /controls/switches/annun-test - 1 - - - - - - - select - Eng1AntiIceBtn1F - - - /controls/switches/annun-test - 1 - - - - - - select - Eng1AntiIceBtn1 - - - /controls/switches/annun-test - 0 - - - - - - select - Eng1AntiIceBtn2 - - - /controls/deice/lengine - 0 - - - - - - select - Eng2AntiIceBtn2O - - - - /controls/deice/rengine - 1 - - - /controls/switches/annun-test - 1 - - - - - - - select - Eng2AntiIceBtn1F - - - /controls/switches/annun-test - 1 - - - - - - select - Eng2AntiIceBtn1 - - - /controls/switches/annun-test - 0 - - - - - - select - Eng2AntiIceBtn2 - - - /controls/deice/rengine - 0 - - - - Wing Anti-ice Pick pick - WingAntiIceBtn2O - WingAntiIceBtn2 - WingAntiIceBtn1F WingAntiIceBtn1 + WingAntiIceBtn1F + WingAntiIceBtn2 + WingAntiIceBtn2O false - - /systems/electrical/battery1-amps - 120 - - - /systems/electrical/battery2-amps - 120 - /systems/electrical/bus/dc1 25 @@ -3783,28 +3629,48 @@ + + + select + WingAntiIceBtn1F + + + /controls/switches/annun-test + 1 + + + + + + select + WingAntiIceBtn2O + + + + /controls/deice/wing + 1 + + + /controls/switches/annun-test + 1 + + + + Left Engine Anti-ice Pick pick - Eng1AntiIceBtn2O - Eng1AntiIceBtn2 - Eng1AntiIceBtn1F Eng1AntiIceBtn1 + Eng1AntiIceBtn1F + Eng1AntiIceBtn2 + Eng1AntiIceBtn2O false - - /systems/electrical/battery1-amps - 120 - - - /systems/electrical/battery2-amps - 120 - /systems/electrical/bus/dc1 25 @@ -3825,27 +3691,47 @@ + + select + Eng1AntiIceBtn1F + + + /controls/switches/annun-test + 1 + + + + + + select + Eng1AntiIceBtn2O + + + + /controls/deice/lengine + 1 + + + /controls/switches/annun-test + 1 + + + + + Right Engine Anti-ice Pick pick - Eng2AntiIceBtn2O - Eng2AntiIceBtn2 - Eng2AntiIceBtn1F Eng2AntiIceBtn1 + Eng2AntiIceBtn1F + Eng2AntiIceBtn2 + Eng2AntiIceBtn2O false - - /systems/electrical/battery1-amps - 120 - - - /systems/electrical/battery2-amps - 120 - /systems/electrical/bus/dc1 25 @@ -3866,15 +3752,24 @@ - - select - PrbWinHeatBtn2O + Eng2AntiIceBtn1F + + + /controls/switches/annun-test + 1 + + + + + + select + Eng2AntiIceBtn2O - /controls/switches/windowprobeheat + /controls/deice/rengine 1 @@ -3885,37 +3780,21 @@ - - select - PrbWinHeatBtn2 - - - /controls/switches/windowprobeheat - 0.5 - - - + + Window Probe Heat Toggle pick + PrbWinHeatBtn1 PrbWinHeatBtn2 PrbWinHeatBtn2O - PrbWinHeatBtn1 false - - /systems/electrical/battery1-amps - 120 - - - /systems/electrical/battery2-amps - 120 - /systems/electrical/bus/dc1 25 @@ -3938,13 +3817,30 @@ + + select + PrbWinHeatBtn2O + + + + /controls/switches/windowprobeheat + 1 + + + /controls/switches/annun-test + 1 + + + + + APU master switch pick pick APUMasterBtn1 - APUMasterBtn2 APUMasterBtn1F + APUMasterBtn2 APUMasterBtn2O diff --git a/Models/Instruments/OHpanel/res/ohpanel.ac b/Models/Instruments/OHpanel/res/ohpanel.ac index 1cf2497c..fdd67c6c 100644 --- a/Models/Instruments/OHpanel/res/ohpanel.ac +++ b/Models/Instruments/OHpanel/res/ohpanel.ac @@ -10,50 +10,326 @@ MATERIAL "ac3dmat1" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 1 1 1 shi 128 trans OBJECT world kids 273 OBJECT poly -name "WingAntiIceBtn1F" -loc 0.000113685 -5.00064e-005 -4.99785e-005 +name "PrbWinHeatBtn2O" +loc 0.000175806 -0.17185 0.0418501 data 8 -Cube.040 -texture "buttons5.png" +Cube.063 +texture "buttons2.png" crease 30.000000 numvert 8 --0.01 -0.2082 0.1337 --0.01 -0.2082 0.1537 --0.007 -0.2082 0.1537 --0.007 -0.2082 0.1337 --0.01 -0.2182 0.1337 --0.01 -0.2182 0.1537 --0.007 -0.2182 0.1537 --0.007 -0.2182 0.1337 +-0.007 -0.0564 -0.0528 +-0.007 -0.0564 -0.0328 +-0.01 -0.0564 -0.0328 +-0.01 -0.0564 -0.0528 +-0.007 -0.0464 -0.0528 +-0.007 -0.0464 -0.0328 +-0.01 -0.0464 -0.0328 +-0.01 -0.0464 -0.0528 numsurf 4 SURF 0x0 mat 4 refs 4 -3 0.503906 0.492188 -7 0.503906 0.242188 -4 0.503906 0.242188 -0 0.503906 0.492188 +0 0.5 0.5 +1 0 0.5 +2 0 0.5 +3 0.5 0.5 SURF 0x0 mat 4 refs 4 -6 0.00390625 0.242188 -2 0.00390634 0.492188 -1 0.00390634 0.492188 -5 0.00390625 0.242188 +0 0.5 0.5 +4 0.5 0.75 +5 9.31321e-008 0.75 +1 0 0.5 SURF 0x0 mat 4 refs 4 -7 0.503906 0.242188 -3 0.503906 0.492188 -2 0.00390634 0.492188 -6 0.00390625 0.242188 +1 0 0.5 +5 9.31321e-008 0.75 +6 9.31321e-008 0.75 +2 0 0.5 SURF 0x0 mat 4 refs 4 -3 0.503906 0.492188 -0 0.503906 0.492188 -1 0.00390634 0.492188 -2 0.00390634 0.492188 +4 0.5 0.75 +0 0.5 0.5 +3 0.5 0.5 +7 0.5 0.75 +kids 0 +OBJECT poly +name "WingAntiIceBtn2O" +loc 0.000175806 -0.17185 0.18645 +data 8 +Cube.063 +texture "buttons2.png" +crease 30.000000 +numvert 8 +-0.01 -0.0464 -0.0528 +-0.01 -0.0464 -0.0328 +-0.007 -0.0464 -0.0328 +-0.007 -0.0464 -0.0528 +-0.01 -0.0564 -0.0528 +-0.01 -0.0564 -0.0328 +-0.007 -0.0564 -0.0328 +-0.007 -0.0564 -0.0528 +numsurf 4 +SURF 0x0 +mat 4 +refs 4 +3 0.5 0.75 +7 0.5 0.5 +4 0.5 0.5 +0 0.5 0.75 +SURF 0x0 +mat 4 +refs 4 +6 0 0.5 +2 9.31321e-008 0.75 +1 9.31321e-008 0.75 +5 0 0.5 +SURF 0x0 +mat 4 +refs 4 +7 0.5 0.5 +3 0.5 0.75 +2 9.31321e-008 0.75 +6 0 0.5 +SURF 0x0 +mat 4 +refs 4 +7 0.5 0.5 +6 0 0.5 +5 0 0.5 +4 0.5 0.5 +kids 0 +OBJECT poly +name "WingAntiIceBtn1F" +loc 0.000175806 -0.17185 0.10225 +data 8 +Cube.061 +texture "buttons2.png" +crease 30.000000 +numvert 8 +-0.01 -0.0364 0.0314 +-0.01 -0.0364 0.0514 +-0.007 -0.0364 0.0514 +-0.007 -0.0364 0.0314 +-0.01 -0.0464 0.0314 +-0.01 -0.0464 0.0514 +-0.007 -0.0464 0.0514 +-0.007 -0.0464 0.0314 +numsurf 4 +SURF 0x0 +mat 4 +refs 4 +3 0.5 0.5 +7 0.5 0.25 +4 0.5 0.25 +0 0.5 0.5 +SURF 0x0 +mat 4 +refs 4 +6 0 0.25 +2 9.31321e-008 0.5 +1 9.31321e-008 0.5 +5 0 0.25 +SURF 0x0 +mat 4 +refs 4 +7 0.5 0.25 +3 0.5 0.5 +2 9.31321e-008 0.5 +6 0 0.25 +SURF 0x0 +mat 4 +refs 4 +3 0.5 0.5 +0 0.5 0.5 +1 9.31321e-008 0.5 +2 9.31321e-008 0.5 +kids 0 +OBJECT poly +name "Eng1AntiIceBtn2O" +loc 0.000175806 -0.17185 0.11805 +data 8 +Cube.063 +texture "buttons2.png" +crease 30.000000 +numvert 8 +-0.007 -0.0564 -0.0528 +-0.007 -0.0564 -0.0328 +-0.01 -0.0564 -0.0328 +-0.01 -0.0564 -0.0528 +-0.007 -0.0464 -0.0528 +-0.007 -0.0464 -0.0328 +-0.01 -0.0464 -0.0328 +-0.01 -0.0464 -0.0528 +numsurf 4 +SURF 0x0 +mat 4 +refs 4 +0 0.5 0.5 +1 0 0.5 +2 0 0.5 +3 0.5 0.5 +SURF 0x0 +mat 4 +refs 4 +0 0.5 0.5 +4 0.5 0.75 +5 9.31321e-008 0.75 +1 0 0.5 +SURF 0x0 +mat 4 +refs 4 +1 0 0.5 +5 9.31321e-008 0.75 +6 9.31321e-008 0.75 +2 0 0.5 +SURF 0x0 +mat 4 +refs 4 +4 0.5 0.75 +0 0.5 0.5 +3 0.5 0.5 +7 0.5 0.75 +kids 0 +OBJECT poly +name "Eng1AntiIceBtn1F" +loc 0.000175806 -0.17185 0.0338501 +data 8 +Cube.061 +texture "buttons2.png" +crease 30.000000 +numvert 8 +-0.007 -0.0464 0.0314 +-0.007 -0.0464 0.0514 +-0.01 -0.0464 0.0514 +-0.01 -0.0464 0.0314 +-0.007 -0.0364 0.0314 +-0.007 -0.0364 0.0514 +-0.01 -0.0364 0.0514 +-0.01 -0.0364 0.0314 +numsurf 4 +SURF 0x0 +mat 4 +refs 4 +4 0.5 0.5 +7 0.5 0.5 +6 9.31321e-008 0.5 +5 9.31321e-008 0.5 +SURF 0x0 +mat 4 +refs 4 +0 0.5 0.25 +4 0.5 0.5 +5 9.31321e-008 0.5 +1 0 0.25 +SURF 0x0 +mat 4 +refs 4 +1 0 0.25 +5 9.31321e-008 0.5 +6 9.31321e-008 0.5 +2 0 0.25 +SURF 0x0 +mat 4 +refs 4 +4 0.5 0.5 +0 0.5 0.25 +3 0.5 0.25 +7 0.5 0.5 +kids 0 +OBJECT poly +name "Eng2AntiIceBtn2O" +loc 0.000175806 -0.17185 0.0856499 +data 8 +Cube.063 +texture "buttons2.png" +crease 30.000000 +numvert 8 +-0.01 -0.0464 -0.0528 +-0.01 -0.0464 -0.0328 +-0.007 -0.0464 -0.0328 +-0.007 -0.0464 -0.0528 +-0.01 -0.0564 -0.0528 +-0.01 -0.0564 -0.0328 +-0.007 -0.0564 -0.0328 +-0.007 -0.0564 -0.0528 +numsurf 4 +SURF 0x0 +mat 4 +refs 4 +3 0.5 0.75 +7 0.5 0.5 +4 0.5 0.5 +0 0.5 0.75 +SURF 0x0 +mat 4 +refs 4 +6 0 0.5 +2 9.31321e-008 0.75 +1 9.31321e-008 0.75 +5 0 0.5 +SURF 0x0 +mat 4 +refs 4 +7 0.5 0.5 +3 0.5 0.75 +2 9.31321e-008 0.75 +6 0 0.5 +SURF 0x0 +mat 4 +refs 4 +7 0.5 0.5 +6 0 0.5 +5 0 0.5 +4 0.5 0.5 +kids 0 +OBJECT poly +name "Eng2AntiIceBtn1F" +loc 0.000175806 -0.17185 0.00145005 +data 8 +Cube.061 +texture "buttons2.png" +crease 30.000000 +numvert 8 +-0.01 -0.0364 0.0314 +-0.01 -0.0364 0.0514 +-0.007 -0.0364 0.0514 +-0.007 -0.0364 0.0314 +-0.01 -0.0464 0.0314 +-0.01 -0.0464 0.0514 +-0.007 -0.0464 0.0514 +-0.007 -0.0464 0.0314 +numsurf 4 +SURF 0x0 +mat 4 +refs 4 +3 0.5 0.5 +7 0.5 0.25 +4 0.5 0.25 +0 0.5 0.5 +SURF 0x0 +mat 4 +refs 4 +6 0 0.25 +2 9.31321e-008 0.5 +1 9.31321e-008 0.5 +5 0 0.25 +SURF 0x0 +mat 4 +refs 4 +7 0.5 0.25 +3 0.5 0.5 +2 9.31321e-008 0.5 +6 0 0.25 +SURF 0x0 +mat 4 +refs 4 +3 0.5 0.5 +0 0.5 0.5 +1 9.31321e-008 0.5 +2 9.31321e-008 0.5 kids 0 OBJECT poly name "WingAntiIceBtn1" @@ -102,282 +378,6 @@ refs 4 7 0.503906 0.492188 kids 0 OBJECT poly -name "WingAntiIceBtn2O" -loc 0.000113685 -5.00064e-005 -4.99785e-005 -data 8 -Cube.039 -texture "buttons5.png" -crease 30.000000 -numvert 8 --0.007 -0.2282 0.1337 --0.007 -0.2282 0.1537 --0.01 -0.2282 0.1537 --0.01 -0.2282 0.1337 --0.007 -0.2182 0.1337 --0.007 -0.2182 0.1537 --0.01 -0.2182 0.1537 --0.01 -0.2182 0.1337 -numsurf 4 -SURF 0x0 -mat 4 -refs 4 -0 0.5 0.5 -1 0 0.5 -2 0 0.5 -3 0.5 0.5 -SURF 0x0 -mat 4 -refs 4 -0 0.5 0.5 -4 0.5 0.75 -5 9.31321e-008 0.75 -1 0 0.5 -SURF 0x0 -mat 4 -refs 4 -1 0 0.5 -5 9.31321e-008 0.75 -6 9.31321e-008 0.75 -2 0 0.5 -SURF 0x0 -mat 4 -refs 4 -4 0.5 0.75 -0 0.5 0.5 -3 0.5 0.5 -7 0.5 0.75 -kids 0 -OBJECT poly -name "Eng2AntiIceBtn2O" -loc 0.000113685 -5.00064e-005 -4.99785e-005 -data 8 -Cube.035 -texture "buttons5.png" -crease 30.000000 -numvert 8 --0.007 -0.2282 0.0329 --0.007 -0.2282 0.0529 --0.01 -0.2282 0.0529 --0.01 -0.2282 0.0329 --0.007 -0.2182 0.0329 --0.007 -0.2182 0.0529 --0.01 -0.2182 0.0529 --0.01 -0.2182 0.0329 -numsurf 4 -SURF 0x0 -mat 4 -refs 4 -0 0.5 0.5 -1 0 0.5 -2 0 0.5 -3 0.5 0.5 -SURF 0x0 -mat 4 -refs 4 -0 0.5 0.5 -4 0.5 0.75 -5 9.31321e-008 0.75 -1 0 0.5 -SURF 0x0 -mat 4 -refs 4 -1 0 0.5 -5 9.31321e-008 0.75 -6 9.31321e-008 0.75 -2 0 0.5 -SURF 0x0 -mat 4 -refs 4 -4 0.5 0.75 -0 0.5 0.5 -3 0.5 0.5 -7 0.5 0.75 -kids 0 -OBJECT poly -name "Eng2AntiIceBtn1F" -loc 0.000113685 -5.00064e-005 -4.99785e-005 -data 8 -Cube.036 -texture "buttons5.png" -crease 30.000000 -numvert 8 --0.007 -0.2182 0.0329 --0.007 -0.2182 0.0529 --0.01 -0.2182 0.0529 --0.01 -0.2182 0.0329 --0.007 -0.2082 0.0329 --0.007 -0.2082 0.0529 --0.01 -0.2082 0.0529 --0.01 -0.2082 0.0329 -numsurf 4 -SURF 0x0 -mat 4 -refs 4 -4 0.503906 0.492188 -7 0.503906 0.492188 -6 0.00390634 0.492188 -5 0.00390634 0.492188 -SURF 0x0 -mat 4 -refs 4 -0 0.503906 0.242188 -4 0.503906 0.492188 -5 0.00390634 0.492188 -1 0.00390625 0.242188 -SURF 0x0 -mat 4 -refs 4 -1 0.00390625 0.242188 -5 0.00390634 0.492188 -6 0.00390634 0.492188 -2 0.00390625 0.242188 -SURF 0x0 -mat 4 -refs 4 -4 0.503906 0.492188 -0 0.503906 0.242188 -3 0.503906 0.242188 -7 0.503906 0.492188 -kids 0 -OBJECT poly -name "Eng1AntiIceBtn1F" -loc 0.000113685 -5.00064e-005 -4.99785e-005 -data 8 -Cube.037 -texture "buttons5.png" -crease 30.000000 -numvert 8 --0.007 -0.2182 0.0653 --0.007 -0.2182 0.0853 --0.01 -0.2182 0.0853 --0.01 -0.2182 0.0653 --0.007 -0.2082 0.0653 --0.007 -0.2082 0.0853 --0.01 -0.2082 0.0853 --0.01 -0.2082 0.0653 -numsurf 4 -SURF 0x0 -mat 4 -refs 4 -4 0.501459 0.501976 -7 0.501459 0.501976 -6 0.0014592 0.501976 -5 0.0014592 0.501976 -SURF 0x0 -mat 4 -refs 4 -0 0.501459 0.251976 -4 0.501459 0.501976 -5 0.0014592 0.501976 -1 0.00145911 0.251976 -SURF 0x0 -mat 4 -refs 4 -1 0.00145911 0.251976 -5 0.0014592 0.501976 -6 0.0014592 0.501976 -2 0.00145911 0.251976 -SURF 0x0 -mat 4 -refs 4 -4 0.501459 0.501976 -0 0.501459 0.251976 -3 0.501459 0.251976 -7 0.501459 0.501976 -kids 0 -OBJECT poly -name "Eng1AntiIceBtn2O" -loc 0.000113685 -5.00064e-005 -4.99785e-005 -data 8 -Cube.038 -texture "buttons5.png" -crease 30.000000 -numvert 8 --0.007 -0.2282 0.0653 --0.007 -0.2282 0.0853 --0.01 -0.2282 0.0853 --0.01 -0.2282 0.0653 --0.007 -0.2182 0.0653 --0.007 -0.2182 0.0853 --0.01 -0.2182 0.0853 --0.01 -0.2182 0.0653 -numsurf 4 -SURF 0x0 -mat 4 -refs 4 -0 0.5 0.5 -1 0 0.5 -2 0 0.5 -3 0.5 0.5 -SURF 0x0 -mat 4 -refs 4 -0 0.5 0.5 -4 0.5 0.75 -5 9.31321e-008 0.75 -1 0 0.5 -SURF 0x0 -mat 4 -refs 4 -1 0 0.5 -5 9.31321e-008 0.75 -6 9.31321e-008 0.75 -2 0 0.5 -SURF 0x0 -mat 4 -refs 4 -4 0.5 0.75 -0 0.5 0.5 -3 0.5 0.5 -7 0.5 0.75 -kids 0 -OBJECT poly -name "PrbWinHeatBtn2O" -loc 0.000113685 -5.00064e-005 -4.99785e-005 -data 8 -Cube.032 -texture "buttons2.png" -crease 30.000000 -numvert 8 --0.01 -0.2182 -0.0109 --0.01 -0.2182 0.0091 --0.007 -0.2182 0.0091 --0.007 -0.2182 -0.0109 --0.01 -0.2282 -0.0109 --0.01 -0.2282 0.0091 --0.007 -0.2282 0.0091 --0.007 -0.2282 -0.0109 -numsurf 4 -SURF 0x0 -mat 4 -refs 4 -3 0.5 0.75 -7 0.5 0.5 -4 0.5 0.5 -0 0.5 0.75 -SURF 0x0 -mat 4 -refs 4 -6 0 0.5 -2 9.31321e-008 0.75 -1 9.31321e-008 0.75 -5 0 0.5 -SURF 0x0 -mat 4 -refs 4 -7 0.5 0.5 -3 0.5 0.75 -2 9.31321e-008 0.75 -6 0 0.5 -SURF 0x0 -mat 4 -refs 4 -7 0.5 0.5 -6 0 0.5 -5 0 0.5 -4 0.5 0.5 -kids 0 -OBJECT poly name "FuelXfeedBtn1A" loc 0.000175806 0.13925 0.04185 data 8