diff --git a/A319-100-IAE-set.xml b/A319-100-IAE-set.xml index 66b8a449..6a28b931 100644 --- a/A319-100-IAE-set.xml +++ b/A319-100-IAE-set.xml @@ -90,7 +90,7 @@ Aircraft/A320Family/Nasal/engines.nas Aircraft/A320Family/Nasal/electrical.nas Aircraft/A320Family/Nasal/pneumatics.nas - + Aircraft/A320Family/Nasal/hydraulics.nas Aircraft/A320Family/Nasal/ADIRS.nas diff --git a/A320-200-IAE-set.xml b/A320-200-IAE-set.xml index 38d65f8d..ceef65ec 100644 --- a/A320-200-IAE-set.xml +++ b/A320-200-IAE-set.xml @@ -83,7 +83,7 @@ Aircraft/A320Family/Nasal/engines.nas Aircraft/A320Family/Nasal/electrical.nas Aircraft/A320Family/Nasal/pneumatics.nas - + Aircraft/A320Family/Nasal/hydraulics.nas Aircraft/A320Family/Nasal/ADIRS.nas diff --git a/A320-main.xml b/A320-main.xml index 01a738d2..74e20d62 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -33,7 +33,10 @@ - + + Aircraft/A320Family/Systems/it-fbw-b.xml @@ -406,7 +409,7 @@ 0 0 0 - 0.8 + 0.0 0.8 0 diff --git a/A321-200-IAE-set.xml b/A321-200-IAE-set.xml index fcb19a08..33545b09 100644 --- a/A321-200-IAE-set.xml +++ b/A321-200-IAE-set.xml @@ -83,7 +83,7 @@ Aircraft/A320Family/Nasal/engines.nas Aircraft/A320Family/Nasal/electrical.nas Aircraft/A320Family/Nasal/pneumatics.nas - + Aircraft/A320Family/Nasal/hydraulics.nas Aircraft/A320Family/Nasal/ADIRS.nas diff --git a/ACJ-IAE-set.xml b/ACJ-IAE-set.xml index ca5a415f..a95003d1 100644 --- a/ACJ-IAE-set.xml +++ b/ACJ-IAE-set.xml @@ -89,7 +89,7 @@ Aircraft/A320Family/Nasal/engines.nas Aircraft/A320Family/Nasal/electrical.nas Aircraft/A320Family/Nasal/pneumatics.nas - + Aircraft/A320Family/Nasal/hydraulics.nas Aircraft/A320Family/Nasal/ADIRS.nas diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas index cb31c96f..95fe0efe 100644 --- a/AircraftConfig/acconfig.nas +++ b/AircraftConfig/acconfig.nas @@ -34,7 +34,8 @@ var colddark = func { setprop("/controls/gear/gear-down", 1); systems.elec_init(); systems.ADIRSreset(); - systems.pneumatics_init(); + systems.pneu_init(); + systems.hyd_init(); itaf.ap_init(); setprop("/it-autoflight/input/fd1", 1); setprop("/it-autoflight/input/fd2", 1); @@ -77,7 +78,8 @@ var beforestart = func { setprop("/controls/gear/gear-down", 1); systems.elec_init(); systems.ADIRSreset(); - systems.pneumatics_init(); + systems.pneu_init(); + systems.hyd_init(); itaf.ap_init(); setprop("/it-autoflight/input/fd1", 1); setprop("/it-autoflight/input/fd2", 1); @@ -109,6 +111,9 @@ var beforestart_b = func { setprop("/controls/pneumatic/switches/bleedapu", 1); setprop("/controls/pneumatic/switches/bleed1", 1); setprop("/controls/pneumatic/switches/bleed2", 1); + setprop("/controls/hydraulic/eng1-pump", 1); + setprop("/controls/hydraulic/eng2-pump", 1); + setprop("/controls/hydraulic/elec-pump-blue", 1); setprop("controls/adirs/ir[0]/knob","2"); setprop("controls/adirs/ir[1]/knob","2"); setprop("controls/adirs/ir[2]/knob","2"); @@ -138,7 +143,8 @@ var taxi = func { setprop("/controls/gear/gear-down", 1); systems.elec_init(); systems.ADIRSreset(); - systems.pneumatics_init(); + systems.pneu_init(); + systems.hyd_init(); itaf.ap_init(); setprop("/it-autoflight/input/fd1", 1); setprop("/it-autoflight/input/fd2", 1); @@ -170,6 +176,9 @@ var taxi_b = func { setprop("/controls/pneumatic/switches/bleedapu", 1); setprop("/controls/pneumatic/switches/bleed1", 1); setprop("/controls/pneumatic/switches/bleed2", 1); + setprop("/controls/hydraulic/eng1-pump", 1); + setprop("/controls/hydraulic/eng2-pump", 1); + setprop("/controls/hydraulic/elec-pump-blue", 1); setprop("controls/adirs/ir[0]/knob","2"); setprop("controls/adirs/ir[1]/knob","2"); setprop("controls/adirs/ir[2]/knob","2"); diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml index 04203dc5..ffb16474 100644 --- a/Models/Instruments/OHpanel/OHpanel.xml +++ b/Models/Instruments/OHpanel/OHpanel.xml @@ -5,69 +5,6 @@ res/ohpanel.ac - - - Dome illumination - material - ACFlowKnb - AftCabinACKnb - AftCabinCall - AftCargoHtKnb - AftCargoSmkDis - AnnunciatorLtSwtch - BeaconLtSwtch - CVRErase - CVRTest - CargoSmkTest - CockpitACKnb - DomeLtSwtch - EmerExtLtSwtch - EmerGenInd - EvacCapt-Purs - EvacHornOff - FwdCabinACKnb - FwdCabinCall - FwdCargoHtKnb - FwdCargoSmkDis - GroundCall - IR1Ind - IR1ModeKnb - IR2Ind - IR2ModeKnb - IR3Ind - IR3ModeKnb - IRDisplayDataKnb - IRDisplaySelectKnb - LandingLtLSwtch - LandingLtRSwtch - LdgElevKnb - LeftRainTest - LeftWiperKnb - NavLogoLtSwtch - NoSmokingSwtch - NoseLtSwtch - OHPMarkLtKnb - OxyMaskDeploy - Panel - PassOxyInd - PressVSCtl - RightRainTest - RightWiperKnb - SeatBeltSwtch - StbyCompassLtSwtch - StrobeLtSwtch - SwitchSockets - TurnoffLtSwtch - WingLtSwtch - XbleedKnb - Radio panel - - 0.5 - 0.5 - 0.5 - controls/lighting/dome-norm - - @@ -97,6 +34,9 @@ BatteryBtn21F BatteryBtn22O Battery-lvl + Battery-lvl-test + BlueElecPump1F + BlueElecPump2O BusTieBtn2O Eng1BleedBtn1F Eng1BleedBtn2O @@ -110,6 +50,8 @@ Gen1Btn2O Gen2Btn1F Gen2Btn2O + GreenEngPump1F + GreenEngPump2O HotAirBtn1F HotAirBtn2O IDG1Btn1F @@ -121,7 +63,13 @@ IR3Btn1F IR3Btn2A IrsOnBatLightOB + PTU1F + PTU2O RamAirBtn2O + YellowElecPump1F + YellowElecPump2O + YellowEngPump1F + YellowEngPump2O @@ -146,7 +94,7 @@ material - adirs-coords + Adirs-coords Battery-lvl 1 @@ -162,7 +110,7 @@ select - adirs-coords + Adirs-coords /systems/electrical/bus/dc1 @@ -183,9 +131,9 @@ property-cycle /controls/adirs/ir[0]/knob - 1 - 2 - 3 + 1 + 2 + 3 3 @@ -196,9 +144,9 @@ property-cycle /controls/adirs/ir[0]/knob - 3 - 2 - 1 + 3 + 2 + 1 1 @@ -268,9 +216,9 @@ property-cycle /controls/adirs/ir[1]/knob - 1 - 2 - 3 + 1 + 2 + 3 3 @@ -281,9 +229,9 @@ property-cycle /controls/adirs/ir[1]/knob - 3 - 2 - 1 + 3 + 2 + 1 1 @@ -353,9 +301,9 @@ property-cycle /controls/adirs/ir[2]/knob - 1 - 2 - 3 + 1 + 2 + 3 3 @@ -366,9 +314,9 @@ property-cycle /controls/adirs/ir[2]/knob - 3 - 2 - 1 + 3 + 2 + 1 1 @@ -438,12 +386,12 @@ property-cycle /controls/adirs/display/dataknob - 1 - 2 - 3 - 4 - 5 - 6 + 1 + 2 + 3 + 4 + 5 + 6 6 @@ -454,12 +402,12 @@ property-cycle /controls/adirs/display/dataknob - 6 - 5 - 4 - 3 - 2 - 1 + 6 + 5 + 4 + 3 + 2 + 1 1 @@ -499,10 +447,10 @@ property-cycle /controls/adirs/display/selected - 1 - 2 - 3 - 4 + 1 + 2 + 3 + 4 4 @@ -513,10 +461,10 @@ property-cycle /controls/adirs/display/selected - 4 - 3 - 2 - 1 + 4 + 3 + 2 + 1 1 @@ -757,51 +705,9 @@ controls/lighting/overhead-panel-norm - - - - - + @@ -994,282 +900,263 @@ controls/engines/engine[1]/fire-bottle-discharge - - - - Left fuel tank pump 1 pick - pick - LFuelTank1Btn1 - LFuelTank1Btn2 - - - false - - property-toggle - - controls/fuel/tank[2]/boost-pump[0] - - - - - Left fuel tank pump 1 off - textranslate - LFuelTank1Btn2 - - controls/fuel/tank[2]/boost-pump[0] - - 00.5 - 10 - - - 1 - 0 - - - - Left fuel tank pump 2 pick - pick - LFuelTank2Btn1 - LFuelTank2Btn2 - - - false - - property-toggle - - controls/fuel/tank[2]/boost-pump[1] - - - - - Left fuel tank pump 2 off - textranslate - LFuelTank2Btn2 - - controls/fuel/tank[2]/boost-pump[1] - - 00.5 - 10 - - - 1 - 0 - - - - - Center fuel tank pumps 1 pick - pick - CFuelTank1Btn1 - CFuelTank1Btn2 - - - false - - property-toggle - - controls/fuel/tank[3]/boost-pump[0] - - - - - Center fuel tank pumps 1 off - textranslate - CFuelTank1Btn2 - - controls/fuel/tank[3]/boost-pump[0] - - 00.5 - 10 - - - 1 - 0 - - - - Center fuel tank pumps 2 pick - pick - CFuelTank2Btn1 - CFuelTank2Btn2 - - - false - - property-toggle - - controls/fuel/tank[3]/boost-pump[1] - - - - - - Center fuel tank pumps 2 off - textranslate - CFuelTank2Btn2 - - controls/fuel/tank[3]/boost-pump[1] - - 00.5 - 10 - - - 1 - 0 - - - - - X-Feed Valve - pick - FuelXfeedBtn1 - FuelXfeedBtn2 - - - false - - property-toggle - controls/fuel/x-feed - - - - - - X-Feed Valve off - textranslate - FuelXfeedBtn2 - - controls/fuel/x-feed - - 0.5 - - 1 - 0 - - - - - Right fuel tank pump 1 pick - pick - RFuelTank1Btn1 - RFuelTank1Btn2 - - - false - - property-toggle - - controls/fuel/tank[4]/boost-pump[0] - - - - - - Right fuel tank pump 1 off - textranslate - RFuelTank1Btn2 - - controls/fuel/tank[4]/boost-pump[0] - - 00.5 - 10 - - - 1 - 0 - - - - Right fuel tank pump 2 pick - pick - RFuelTank2Btn1 - RFuelTank2Btn2 - - - false - - property-toggle - - controls/fuel/tank[4]/boost-pump[1] - - - - - - Right fuel tank pump 2 off - textranslate - RFuelTank2Btn2 - - controls/fuel/tank[4]/boost-pump[1] - - 00.5 - 10 - - - 1 - 0 - - - - + - Fuel Jettison Arm + Green Eng Pump pick pick - fueldumpARM1 - fueldumpARM2 + GreenEngPump1 + GreenEngPump2 + GreenEngPump1F + GreenEngPump2O false property-toggle - controls/fuel-dump/arm + /controls/hydraulic/eng1-pump - - - Fuel Jettison Arm animation - textranslate - fueldumpARM2 - controls/fuel-dump/arm - 0.5 - - 1 - 0 - - - Fuel Jettison Active + select + GreenEngPump1F + + + + /systems/unused/unused-oh + 150 + + + /controls/switches/annun-test + 1 + + + + + + + select + GreenEngPump2O + + + + /controls/hydraulic/eng1-pump + 0 + + + /controls/switches/annun-test + 1 + + + + + + + Blue Elec Pump pick pick - fueldumpACT1 - fueldumpACT2 + BlueElecPump1 + BlueElecPump2 + BlueElecPump1F + BlueElecPump2O false property-toggle - controls/fuel-dump/active + /controls/hydraulic/elec-pump-blue - + - Fuel Jettison Arm animation - textranslate - fueldumpACT2 - controls/fuel-dump/active - 0.5 - - 1 - 0 - + select + BlueElecPump1F + + + + /systems/unused/unused-oh + 150 + + + /controls/switches/annun-test + 1 + + + + + select + BlueElecPump2O + + + + /controls/hydraulic/elec-pump-blue + 0 + + + /controls/switches/annun-test + 1 + + + + + + + PTU pick + pick + PTU1 + PTU2 + PTU1F + PTU2O + + + false + + property-toggle + /controls/hydraulic/ptu + + + + + + select + PTU1F + + + + /systems/unused/unused-oh + 150 + + + /controls/switches/annun-test + 1 + + + + + + + select + PTU2O + + + + /controls/hydraulic/ptu + 0 + + + /controls/switches/annun-test + 1 + + + + + + + Yellow Eng Pump pick + pick + YellowEngPump1 + YellowEngPump2 + YellowEngPump1F + YellowEngPump2O + + + false + + property-toggle + /controls/hydraulic/eng2-pump + + + + + + select + YellowEngPump1F + + + + /systems/unused/unused-oh + 150 + + + /controls/switches/annun-test + 1 + + + + + + + select + YellowEngPump2O + + + + /controls/hydraulic/eng2-pump + 0 + + + /controls/switches/annun-test + 1 + + + + + + + Yellow Eng Pump pick + pick + YellowElecPump1 + YellowElecPump2 + YellowElecPump1F + YellowElecPump2O + + + false + + property-toggle + /controls/hydraulic/elec-pump-yellow + + + + + + select + YellowElecPump1F + + + + /systems/unused/unused-oh + 150 + + + /controls/switches/annun-test + 1 + + + + + + + select + YellowElecPump2O + + + + /controls/hydraulic/elec-pump-yellow + 1 + + + /controls/switches/annun-test + 1 + + + + + Galley pick @@ -1779,7 +1666,7 @@ - + AC pack flow pick pick @@ -2173,120 +2060,6 @@ - - - Wing anti-ice pick - pick - WingAntiIceBtn1 - WingAntiIceBtn2 - - - false - - property-toggle - controls/anti-ice/wing-heat - - - - - - Wing anti-ice on - textranslate - WingAntiIceBtn2 - controls/anti-ice/wing-heat - 0.5 - - 1 - 0 - - - - - Engine 1 anti-ice pick - pick - Eng1AntiIceBtn1 - Eng1AntiIceBtn2 - - - false - - property-toggle - controls/anti-ice/engine[0]/inlet-heat - - - - - - Engine 1 anti-ice on - textranslate - Eng1AntiIceBtn2 - controls/anti-ice/engine[0]/inlet-heat - 0.5 - - 1 - 0 - - - - - Engine 2 anti-ice pick - pick - Eng2AntiIceBtn1 - Eng2AntiIceBtn2 - - - false - - property-toggle - controls/anti-ice/engine[1]/inlet-heat - - - - - - Engine 2 anti-ice on - textranslate - Eng2AntiIceBtn2 - controls/anti-ice/engine[1]/inlet-heat - 0.5 - - 1 - 0 - - - - - Probe/window heat pick - pick - PrbWinHeatBtn1 - PrbWinHeatBtn2 - - - false - - property-toggle - controls/anti-ice/pitot-heat - - - property-assign - controls/anti-ice/window-heat - controls/anti-ice/pitot-heat - - - - - - Probe/window heat on - textranslate - PrbWinHeatBtn2 - controls/anti-ice/pitot-heat - 0.5 - - 1 - 0 - - - Strobe lights pick @@ -2403,9 +2176,9 @@ property-cycle controls/lighting/nav-lights-switch - 0 - 1 - 2 + 0 + 1 + 2 @@ -2659,7 +2432,7 @@ - + Annun lights pick @@ -2734,8 +2507,6 @@ -0.2597 - - @@ -2749,7 +2520,6 @@ property-toggle controls/switches/seatbelt-sign - @@ -2784,12 +2554,6 @@ property-toggle controls/switches/no-smoking-sign - - nasal - - @@ -2812,230 +2576,11 @@ -0.3037 - - - - Engine 1 manual starter pick - pick - Eng1ManStartBtn1 - Eng1ManStartBtn2 - - - false - - property-toggle - controls/engines/engine[0]/starter-switch - - - - - - Engine 1 manual starter on - textranslate - Eng1ManStartBtn2 - controls/engines/engine[0]/starter-switch - 0.5 - - 1 - 0 - - - - - Engine 2 manual starter pick - pick - Eng2ManStartBtn1 - Eng2ManStartBtn2 - - - false - - property-toggle - controls/engines/engine[1]/starter-switch - - - - - - Engine 2 manual starter on - textranslate - Eng2ManStartBtn2 - controls/engines/engine[1]/starter-switch - 0.5 - - 1 - 0 - - - - - - - Engine 1 Hydraulic Pump - pick - e1-pump-fault - e1-pump - - - false - - property-toggle - hydraulics/control/eng1-pump - - - - - - - Engine 2 Hydraulic Pump - pick - e2-pump-fault - e2-pump - - - false - - property-toggle - hydraulics/control/eng2-pump - - - - - - - Electric Hydraulic Pump - pick - elec-pump-fault - elec-pump - - - false - - property-toggle - hydraulics/control/elec-pump - - - - - - - Backup Electric Hydraulic Pump - pick - y-elec-pump-fault - y-elec-pump - - - false - - property-toggle - hydraulics/control/y-elec-pump - - - - - - - Unlock Ram Air Turbine - pick - rat-fault - rat - - - false - - property-cycle - hydraulics/control/rat-unlck - 1 - - - - - - - Hydraulic Power Transfer Unit (PTU) - pick - ptu - - - false - - property-toggle - hydraulics/control/ptu - - - - - - - textranslate - e1-pump - hydraulics/control/eng1-pump - 0.5 - - 1 - 0 - - - - - textranslate - e2-pump - hydraulics/control/eng2-pump - 0.5 - - 1 - 0 - - - - - textranslate - elec-pump - hydraulics/control/elec-pump - 0.5 - - 1 - 0 - - - - - textranslate - y-elec-pump - hydraulics/control/y-elec-pump - 0.5 - - 1 - 0 - - - - - textranslate - rat - hydraulics/control/rat-unlck - 0.5 - - 1 - 0 - - - - - textranslate - ptu - hydraulics/control/ptu - 0.5 - - 1 - 0 - - - adirs-coords + Adirs-coords 0.005 -0.246 @@ -3055,8 +2600,8 @@ false 0.0095 - 32 - 32 + 32 + 32 @@ -3081,8 +2626,34 @@ false 0.007 - 32 - 32 + 32 + 32 + + + + + Battery-lvl-test + + -0.008 + -0.057 + 0.0155 + 62 + 88 + 32 + + center-center + xy-plane + text-value + 88.8 + autopilot/serviceable + led.txf + true + false + false + 0.007 + + 32 + 32 @@ -3107,9 +2678,57 @@ false 0.007 - 32 - 32 + 32 + 32 + + + Battery-lvl-test + + -0.008 + 0.035 + 0.0155 + 62 + 90 + 32 + + center-center + xy-plane + text-value + 88.8 + autopilot/serviceable + led.txf + true + false + false + 0.007 + + 32 + 32 + + + + + select + Battery-lvl + + + /controls/switches/annun-test + 0 + + + + + + select + Battery-lvl-test + + + /controls/switches/annun-test + 1 + + + diff --git a/Models/Instruments/OHpanel/res/background.png b/Models/Instruments/OHpanel/res/background.png index d0f03d95..7d14754d 100644 Binary files a/Models/Instruments/OHpanel/res/background.png and b/Models/Instruments/OHpanel/res/background.png differ diff --git a/Models/Instruments/OHpanel/res/ohpanel.ac b/Models/Instruments/OHpanel/res/ohpanel.ac index de4cd103..2334a9f5 100644 --- a/Models/Instruments/OHpanel/res/ohpanel.ac +++ b/Models/Instruments/OHpanel/res/ohpanel.ac @@ -6,14 +6,761 @@ MATERIAL "Switch" rgb 0.504688 0.504688 0.504688 amb 0.5 0.5 0.5 emis 0 0 0 s MATERIAL "ac3dmat1" rgb 0.992157 0.992157 0.992157 amb 0.2 0.2 0.2 emis 1 1 1 spec 0 0 0 shi 128 trans 0 MATERIAL "OHPanelOnBat" rgb 0.8 0.8 0.8 amb 1 1 1 emis 1 1 1 spec 0.5 0.5 0.5 shi 12 trans 0 MATERIAL "Switch" rgb 0.678431 0.678431 0.678431 amb 0.678431 0.678431 0.678431 emis 0 0 0 spec 0 0 0 shi 32 trans 0.004 +MATERIAL "ac3dmat1" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 1 1 1 shi 128 trans 0 OBJECT world -kids 245 +kids 254 +OBJECT poly +name "YellowElecPump1F" +loc 0.0014462 0.17375 -0.17645 +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 "YellowElecPump2O" +loc 0.0014462 0.17375 -0.09225 +data 8 +Cube.063 +texture "buttons3.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 "PTU1F" +loc 0.0014462 0.18895 -0.09135 +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 "PTU2O" +loc 0.0014462 0.18895 -0.09135 +data 8 +Cube.062 +texture "buttons2.png" +crease 30.000000 +numvert 8 +-0.01 -0.0464 0.0314 +-0.01 -0.0464 0.0514 +-0.007 -0.0464 0.0514 +-0.007 -0.0464 0.0314 +-0.01 -0.0564 0.0314 +-0.01 -0.0564 0.0514 +-0.007 -0.0564 0.0514 +-0.007 -0.0564 0.0314 +numsurf 4 +SURF 0x0 +mat 4 +refs 4 +3 0.5 0.25 +7 0.5 0 +4 0.5 0 +0 0.5 0.25 +SURF 0x0 +mat 4 +refs 4 +6 0 1.19209e-007 +2 9.31321e-008 0.25 +1 9.31321e-008 0.25 +5 0 1.19209e-007 +SURF 0x0 +mat 4 +refs 4 +7 0.5 0 +3 0.5 0.25 +2 9.31321e-008 0.25 +6 0 1.19209e-007 +SURF 0x0 +mat 4 +refs 4 +7 0.5 0 +6 0 1.19209e-007 +5 0 1.19209e-007 +4 0.5 0 +kids 0 +OBJECT poly +name "BlueElecPump1F" +loc 0.0014462 0.17195 -0.04195 +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 "BlueElecPump2O" +loc 0.0014462 0.17195 -0.04195 +data 8 +Cube.062 +texture "buttons2.png" +crease 30.000000 +numvert 8 +-0.007 -0.0564 0.0314 +-0.007 -0.0564 0.0514 +-0.01 -0.0564 0.0514 +-0.01 -0.0564 0.0314 +-0.007 -0.0464 0.0314 +-0.007 -0.0464 0.0514 +-0.01 -0.0464 0.0514 +-0.01 -0.0464 0.0314 +numsurf 4 +SURF 0x0 +mat 4 +refs 4 +0 0.5 0 +1 0 1.19209e-007 +2 0 1.19209e-007 +3 0.5 0 +SURF 0x0 +mat 4 +refs 4 +0 0.5 0 +4 0.5 0.25 +5 9.31321e-008 0.25 +1 0 1.19209e-007 +SURF 0x0 +mat 4 +refs 4 +1 0 1.19209e-007 +5 9.31321e-008 0.25 +6 9.31321e-008 0.25 +2 0 1.19209e-007 +SURF 0x0 +mat 4 +refs 4 +4 0.5 0.25 +0 0.5 0 +3 0.5 0 +7 0.5 0.25 +kids 0 +OBJECT poly +name "YellowEngPump1F" +loc 0.0014462 0.17065 -0.14215 +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 "YellowEngPump2O" +loc 0.0014462 0.17065 -0.14215 +data 8 +Cube.062 +texture "buttons2.png" +crease 30.000000 +numvert 8 +-0.01 -0.0464 0.0314 +-0.01 -0.0464 0.0514 +-0.007 -0.0464 0.0514 +-0.007 -0.0464 0.0314 +-0.01 -0.0564 0.0314 +-0.01 -0.0564 0.0514 +-0.007 -0.0564 0.0514 +-0.007 -0.0564 0.0314 +numsurf 4 +SURF 0x0 +mat 4 +refs 4 +3 0.5 0.25 +7 0.5 0 +4 0.5 0 +0 0.5 0.25 +SURF 0x0 +mat 4 +refs 4 +6 0 1.19209e-007 +2 9.31321e-008 0.25 +1 9.31321e-008 0.25 +5 0 1.19209e-007 +SURF 0x0 +mat 4 +refs 4 +7 0.5 0 +3 0.5 0.25 +2 9.31321e-008 0.25 +6 0 1.19209e-007 +SURF 0x0 +mat 4 +refs 4 +7 0.5 0 +6 0 1.19209e-007 +5 0 1.19209e-007 +4 0.5 0 +kids 0 +OBJECT poly +name "GreenEngPump1F" +loc 0.0014462 0.17095 0.05905 +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 "GreenEngPump2O" +loc 0.0014462 0.17095 0.05905 +data 8 +Cube.062 +texture "buttons2.png" +crease 30.000000 +numvert 8 +-0.007 -0.0564 0.0314 +-0.007 -0.0564 0.0514 +-0.01 -0.0564 0.0514 +-0.01 -0.0564 0.0314 +-0.007 -0.0464 0.0314 +-0.007 -0.0464 0.0514 +-0.01 -0.0464 0.0514 +-0.01 -0.0464 0.0314 +numsurf 4 +SURF 0x0 +mat 4 +refs 4 +0 0.5 0 +1 0 1.19209e-007 +2 0 1.19209e-007 +3 0.5 0 +SURF 0x0 +mat 4 +refs 4 +0 0.5 0 +4 0.5 0.25 +5 9.31321e-008 0.25 +1 0 1.19209e-007 +SURF 0x0 +mat 4 +refs 4 +1 0 1.19209e-007 +5 9.31321e-008 0.25 +6 9.31321e-008 0.25 +2 0 1.19209e-007 +SURF 0x0 +mat 4 +refs 4 +4 0.5 0.25 +0 0.5 0 +3 0.5 0 +7 0.5 0.25 +kids 0 +OBJECT poly +name "RATMan" +loc 0.00144693 0.348484 0.0915874 +data 12 +Cylinder.061 +crease 30.000000 +numvert 37 +-0.0078 -0.221417 -0.045017 +-0.0078 -0.222484 -0.043168 +-0.0078 -0.222484 -0.041032 +-0.0078 -0.221417 -0.039183 +-0.0078 -0.219568 -0.038116 +-0.0078 -0.217432 -0.038116 +-0.0078 -0.215583 -0.039183 +-0.0078 -0.214516 -0.041032 +-0.0078 -0.214516 -0.043168 +-0.0078 -0.215583 -0.045017 +-0.0078 -0.217432 -0.046084 +-0.0078 -0.219568 -0.046084 +-0.0078 -0.2185 -0.0421 +-0.0098 -0.219568 -0.046084 +-0.0098 -0.217432 -0.046084 +-0.0098 -0.215583 -0.045017 +-0.0098 -0.214516 -0.043168 +-0.0098 -0.214516 -0.041032 +-0.0098 -0.215583 -0.039183 +-0.0098 -0.217432 -0.038116 +-0.0098 -0.219568 -0.038116 +-0.0098 -0.221417 -0.039183 +-0.0098 -0.222484 -0.041032 +-0.0098 -0.222484 -0.043168 +-0.0098 -0.221417 -0.045017 +-0.0098 -0.223803 -0.047403 +-0.0098 -0.225744 -0.044041 +-0.0098 -0.225744 -0.040159 +-0.0098 -0.223803 -0.036797 +-0.0098 -0.220441 -0.034856 +-0.0098 -0.216559 -0.034856 +-0.0098 -0.213197 -0.036797 +-0.0098 -0.211256 -0.040159 +-0.0098 -0.211256 -0.044041 +-0.0098 -0.213197 -0.047403 +-0.0098 -0.216559 -0.049344 +-0.0098 -0.220441 -0.049344 +numsurf 36 +SURF 0x20 +mat 1 +refs 3 +1 0 0 +0 0 0 +12 0 0 +SURF 0x20 +mat 1 +refs 3 +1 0 0 +12 0 0 +2 0 0 +SURF 0x20 +mat 1 +refs 3 +2 0 0 +12 0 0 +3 0 0 +SURF 0x20 +mat 1 +refs 3 +3 0 0 +12 0 0 +4 0 0 +SURF 0x20 +mat 1 +refs 3 +4 0 0 +12 0 0 +5 0 0 +SURF 0x20 +mat 1 +refs 3 +5 0 0 +12 0 0 +6 0 0 +SURF 0x20 +mat 1 +refs 3 +6 0 0 +12 0 0 +7 0 0 +SURF 0x20 +mat 1 +refs 3 +7 0 0 +12 0 0 +8 0 0 +SURF 0x20 +mat 1 +refs 3 +8 0 0 +12 0 0 +9 0 0 +SURF 0x20 +mat 1 +refs 3 +9 0 0 +12 0 0 +10 0 0 +SURF 0x20 +mat 1 +refs 3 +10 0 0 +12 0 0 +11 0 0 +SURF 0x20 +mat 1 +refs 3 +11 0 0 +12 0 0 +0 0 0 +SURF 0x20 +mat 1 +refs 4 +24 0 0 +0 0 0 +1 0 0 +23 0 0 +SURF 0x20 +mat 1 +refs 4 +23 0 0 +1 0 0 +2 0 0 +22 0 0 +SURF 0x20 +mat 1 +refs 4 +22 0 0 +2 0 0 +3 0 0 +21 0 0 +SURF 0x20 +mat 1 +refs 4 +21 0 0 +3 0 0 +4 0 0 +20 0 0 +SURF 0x20 +mat 1 +refs 4 +20 0 0 +4 0 0 +5 0 0 +19 0 0 +SURF 0x20 +mat 1 +refs 4 +19 0 0 +5 0 0 +6 0 0 +18 0 0 +SURF 0x20 +mat 1 +refs 4 +18 0 0 +6 0 0 +7 0 0 +17 0 0 +SURF 0x20 +mat 1 +refs 4 +17 0 0 +7 0 0 +8 0 0 +16 0 0 +SURF 0x20 +mat 1 +refs 4 +16 0 0 +8 0 0 +9 0 0 +15 0 0 +SURF 0x20 +mat 1 +refs 4 +15 0 0 +9 0 0 +10 0 0 +14 0 0 +SURF 0x20 +mat 1 +refs 4 +14 0 0 +10 0 0 +11 0 0 +13 0 0 +SURF 0x20 +mat 1 +refs 4 +13 0 0 +11 0 0 +0 0 0 +24 0 0 +SURF 0x20 +mat 1 +refs 4 +36 0 0 +13 0 0 +24 0 0 +25 0 0 +SURF 0x20 +mat 1 +refs 4 +13 0 0 +36 0 0 +35 0 0 +14 0 0 +SURF 0x20 +mat 1 +refs 4 +34 0 0 +15 0 0 +14 0 0 +35 0 0 +SURF 0x20 +mat 1 +refs 4 +33 0 0 +16 0 0 +15 0 0 +34 0 0 +SURF 0x20 +mat 1 +refs 4 +32 0 0 +17 0 0 +16 0 0 +33 0 0 +SURF 0x20 +mat 1 +refs 4 +31 0 0 +18 0 0 +17 0 0 +32 0 0 +SURF 0x20 +mat 1 +refs 4 +30 0 0 +19 0 0 +18 0 0 +31 0 0 +SURF 0x20 +mat 1 +refs 4 +29 0 0 +20 0 0 +19 0 0 +30 0 0 +SURF 0x20 +mat 1 +refs 4 +28 0 0 +21 0 0 +20 0 0 +29 0 0 +SURF 0x20 +mat 1 +refs 4 +27 0 0 +22 0 0 +21 0 0 +28 0 0 +SURF 0x20 +mat 1 +refs 4 +26 0 0 +23 0 0 +22 0 0 +27 0 0 +SURF 0x20 +mat 1 +refs 4 +25 0 0 +24 0 0 +23 0 0 +26 0 0 +kids 0 OBJECT poly name "RamAirBtn2O" loc 0.0014462 -0.11785 0.08895 data 8 Cube.063 -texture "buttons2.png" +texture "buttons3.png" crease 30.000000 numvert 8 -0.01 -0.0464 -0.0528 @@ -10375,52 +11122,6 @@ refs 4 10 9.31321e-008 1 kids 0 OBJECT poly -name "elec-pump" -loc 0.00138408 -5.00064e-005 -4.99785e-005 -data 8 -Cube.083 -texture "buttons.png" -crease 30.000000 -numvert 8 --0.01 0.1256 -0.0105 --0.01 0.1256 0.0095 --0.007 0.1256 0.0095 --0.007 0.1256 -0.0105 --0.01 0.1156 -0.0105 --0.01 0.1156 0.0095 --0.007 0.1156 0.0095 --0.007 0.1156 -0.0105 -numsurf 4 -SURF 0x0 -mat 4 -refs 4 -3 1 0.25 -7 1 0 -4 1 0 -0 1 0.25 -SURF 0x0 -mat 4 -refs 4 -6 0.5 0 -2 0.5 0.25 -1 0.5 0.25 -5 0.5 0 -SURF 0x0 -mat 4 -refs 4 -7 1 0 -3 1 0.25 -2 0.5 0.25 -6 0.5 0 -SURF 0x0 -mat 4 -refs 4 -7 1 0 -6 0.5 0 -5 0.5 0 -4 1 0 -kids 0 -OBJECT poly name "BusTieBtn" loc 0.00138408 -5.00064e-005 -4.99785e-005 data 8 @@ -14138,7 +14839,7 @@ refs 4 10 9.31321e-008 1 kids 0 OBJECT poly -name "e1-pump" +name "GreenEngPump2" loc 0.00138408 -5.00064e-005 -4.99785e-005 data 8 Cube.086 @@ -14798,7 +15499,7 @@ refs 4 10 9.31321e-008 1 kids 0 OBJECT poly -name "e1-pump-fault" +name "YellowEngPump1" loc 0.00138408 -5.00064e-005 -4.99785e-005 data 8 Cube.085 @@ -24627,40 +25328,40 @@ numvert 10 -0.009885 -0.235 -0.165 numsurf 6 SURF 0x0 -mat 0 +mat 7 refs 3 3 0.97 0.138461 9 0.731415 0.138462 1 0.731415 0 SURF 0x0 -mat 0 +mat 7 refs 3 8 0.238585 0.138462 5 0 0.138462 0 0.238585 0 SURF 0x0 -mat 0 +mat 7 refs 4 9 0.731415 0.138462 8 0.238585 0.138462 0 0.238585 0 1 0.731415 0 SURF 0x0 -mat 0 +mat 7 refs 4 6 0.731415 1 9 0.731415 0.138462 3 0.97 0.138461 2 0.97 1 SURF 0x0 -mat 0 +mat 7 refs 4 8 0.238585 0.138462 7 0.238585 1 4 1.7803e-007 1 5 0 0.138462 SURF 0x0 -mat 0 +mat 7 refs 4 9 0.731415 0.138462 6 0.731415 1 @@ -26243,7 +26944,7 @@ refs 4 4 0.5 0 kids 0 OBJECT poly -name "PTUBtn" +name "PTU1" loc 0.00138408 -5.00064e-005 -4.99785e-005 data 8 Cube.084 @@ -26745,98 +27446,6 @@ refs 4 26 0 0 kids 0 OBJECT poly -name "rat-fault" -loc 0.00138408 -5.00064e-005 -4.99785e-005 -data 8 -Cube.082 -texture "buttons.png" -crease 30.000000 -numvert 8 --0.01 0.1401 0.0392 --0.01 0.1401 0.0592 --0.007 0.1401 0.0592 --0.007 0.1401 0.0392 --0.01 0.1301 0.0392 --0.01 0.1301 0.0592 --0.007 0.1301 0.0592 --0.007 0.1301 0.0392 -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 "rat" -loc 0.00138408 -5.00064e-005 -4.99785e-005 -data 8 -Cube.081 -texture "buttons.png" -crease 30.000000 -numvert 8 --0.01 0.1301 0.0392 --0.01 0.1301 0.0592 --0.007 0.1301 0.0592 --0.007 0.1301 0.0392 --0.01 0.1201 0.0392 --0.01 0.1201 0.0592 --0.007 0.1201 0.0592 --0.007 0.1201 0.0392 -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 1.19209e-007 0.75 -1 1.19209e-007 0.75 -5 0 0.5 -SURF 0x0 -mat 4 -refs 4 -7 0.5 0.5 -3 0.5 0.75 -2 1.19209e-007 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 "RFuelTank1Btn1" loc 0.00138408 -5.00064e-005 -4.99785e-005 data 8 @@ -32797,7 +33406,7 @@ refs 3 142 0.695207 0.69137 kids 0 OBJECT poly -name "y-elec-pump" +name "YellowElecPump2" loc 0.00138408 -5.00064e-005 -4.99785e-005 data 8 Cube.087 @@ -33167,7 +33776,7 @@ refs 4 15 0.5 0.25 kids 0 OBJECT poly -name "e1-pump-fault" +name "GreenEngPump1" loc 0.00138408 -5.00064e-005 -4.99785e-005 data 8 Cube.086 @@ -33213,7 +33822,7 @@ refs 4 3 0.5 1 kids 0 OBJECT poly -name "elec-pump-fault" +name "BlueElecPump1" loc 0.00138408 -5.00064e-005 -4.99785e-005 data 8 Cube.083 @@ -33259,7 +33868,7 @@ refs 4 3 0.5 1 kids 0 OBJECT poly -name "ptu" +name "PTU2" loc 0.00138408 -5.00064e-005 -4.99785e-005 data 8 Cube.084 @@ -33305,7 +33914,7 @@ refs 4 7 1 0.25 kids 0 OBJECT poly -name "e2-pump" +name "YellowEngPump2" loc 0.00138408 -5.00064e-005 -4.99785e-005 data 8 Cube.085 @@ -33351,7 +33960,7 @@ refs 4 7 1 0.25 kids 0 OBJECT poly -name "y-elec-pump-fault" +name "YellowElecPump1" loc 0.00138408 -5.00064e-005 -4.99785e-005 data 8 Cube.087 @@ -33704,3 +34313,49 @@ refs 4 5 0 1.19209e-007 4 0.5 0 kids 0 +OBJECT poly +name "BlueElecPump2" +loc 0.00138408 -5.00064e-005 -4.99785e-005 +data 8 +Cube.083 +texture "buttons.png" +crease 30.000000 +numvert 8 +-0.01 0.1256 -0.0105 +-0.01 0.1256 0.0095 +-0.007 0.1256 0.0095 +-0.007 0.1256 -0.0105 +-0.01 0.1156 -0.0105 +-0.01 0.1156 0.0095 +-0.007 0.1156 0.0095 +-0.007 0.1156 -0.0105 +numsurf 4 +SURF 0x0 +mat 4 +refs 4 +3 1 0.25 +7 1 0 +4 1 0 +0 1 0.25 +SURF 0x0 +mat 4 +refs 4 +6 0.5 0 +2 0.5 0.25 +1 0.5 0.25 +5 0.5 0 +SURF 0x0 +mat 4 +refs 4 +7 1 0 +3 1 0.25 +2 0.5 0.25 +6 0.5 0 +SURF 0x0 +mat 4 +refs 4 +7 1 0 +6 0.5 0 +5 0.5 0 +4 1 0 +kids 0 diff --git a/Nasal/engines.nas b/Nasal/engines.nas index ac06f0a9..49475c29 100644 --- a/Nasal/engines.nas +++ b/Nasal/engines.nas @@ -165,13 +165,13 @@ var apu_stop = func { setlistener("/controls/engines/engine-start-switch", func { if ((getprop("/controls/engines/engine-start-switch") == 0) or (getprop("/controls/engines/engine-start-switch") == 1)) { - if (getprop("/controls/engines/engine[0]/state") == 1) { + if (getprop("/controls/engines/engine[0]/state") == 1 or getprop("/controls/engines/engine[0]/state") == 2) { setprop("/controls/engines/engine[0]/starter", 0); setprop("/controls/engines/engine[0]/cutoff", 1); setprop("/engines/engine[0]/state", 0); interpolate(engines[0].getNode("egt-actual"), 0, egt_shutdown_time); } - if (getprop("/controls/engines/engine[1]/state") == 1) { + if (getprop("/controls/engines/engine[1]/state") == 1 or getprop("/controls/engines/engine[1]/state") == 2) { setprop("/controls/engines/engine[1]/starter", 0); setprop("/controls/engines/engine[1]/cutoff", 1); setprop("/engines/engine[1]/state", 0); @@ -182,13 +182,13 @@ setlistener("/controls/engines/engine-start-switch", func { setlistener("/systems/pneumatic/start-psi", func { if (getprop("/systems/pneumatic/total-psi") < 12) { - if (getprop("/engines/engine[0]/state") == 1) { + if (getprop("/engines/engine[0]/state") == 1 or getprop("/controls/engines/engine[0]/state") == 2) { setprop("/controls/engines/engine[0]/starter", 0); setprop("/controls/engines/engine[0]/cutoff", 1); setprop("/engines/engine[0]/state", 0); interpolate(engines[0].getNode("egt-actual"), 0, egt_shutdown_time); } - if (getprop("/engines/engine[1]/state") == 1) { + if (getprop("/engines/engine[1]/state") == 1 or getprop("/controls/engines/engine[1]/state") == 2) { setprop("/controls/engines/engine[1]/starter", 0); setprop("/controls/engines/engine[1]/cutoff", 1); setprop("/engines/engine[1]/state", 0); diff --git a/Nasal/hydraulics.nas b/Nasal/hydraulics.nas index cc34c261..c289db28 100644 --- a/Nasal/hydraulics.nas +++ b/Nasal/hydraulics.nas @@ -1,79 +1,130 @@ -# A320 Hydraulics - Disabled until complete +# A320 Hydraulic System +# Joshua Davidson (it0uchpods) -# LGCIU -# Jonathan Redpath -# Note: Will be compressed +############# +# Init Vars # +############# -##################### -# Initializing Vars # -##################### -var lgciu_init = func { -#Hydraulics -setprop("controls/LGCIU/hyd/safetyvalvepos",0); #1 is closed, 0 is open. -setprop("controls/LGCIU/hyd/cutoffvalvepos",0); #1 is closed, 0 is open. -setprop("controls/LGCIU/hyd/doorselvalvepos",1); #1 is closed, 0 is open. -setprop("controls/LGCIU/hyd/gearselvalvepos",1); #1 is closed, 0 is open. -#Sensors -setprop("controls/LGCIU/sensor/ten",1); #1 is yes condition, ie on ground. Used to prohibit retraction on ground -setprop("controls/LGCIU/sensor/adr1and3flt",0); -setprop("controls/LGCIU/inhibit",1); -#Timers -safety_valve_ADR_timer.start(); -sensorten.start(); +var hyd_init = func { + setprop("/controls/hydraulic/eng1-pump", 0); + setprop("/controls/hydraulic/eng2-pump", 0); + setprop("/controls/hydraulic/elec-pump-blue", 0); + setprop("/controls/hydraulic/elec-pump-yellow", 0); + setprop("/controls/hydraulic/ptu", 1); + setprop("/controls/hydraulic/rat-man", 0); + setprop("/systems/hydraulic/ptu-active", 0); + setprop("/systems/hydraulic/blue-psi", 0); + setprop("/systems/hydraulic/green-psi", 0); + setprop("/systems/hydraulic/yellow-psi", 0); + hyd_timer.start(); } -var safety_valve_ADR = setlistener("controls/LGCIU/sensor/adr1and3flt", func { -var ADRfault = getprop("controls/LGCIU/sensor/adr1and3flt"); -if (ADRfault) { -setprop("controls/LGCIU/hyd/safetyvalvepos",1); #close valve if we have ADR 1 + 3 FAULT +####################### +# Main Hydraulic Loop # +####################### + +var master_hyd = func { + var eng1_pump_sw = getprop("/controls/hydraulic/eng1-pump"); + var eng2_pump_sw = getprop("/controls/hydraulic/eng2-pump"); + var elec_pump_blue_sw = getprop("/controls/hydraulic/elec-pump-blue"); + var elec_pump_yellow_sw = getprop("/controls/hydraulic/elec-pump-yellow"); + var ptu_sw = getprop("/controls/hydraulic/ptu"); + var rat_man_sw = getprop("/controls/hydraulic/rat-man"); + var blue_psi = getprop("/systems/hydraulic/blue-psi"); + var green_psi = getprop("/systems/hydraulic/green-psi"); + var yellow_psi = getprop("/systems/hydraulic/yellow-psi"); + var rpmapu = getprop("/systems/apu/rpm"); + var stateL = getprop("/engines/engine[0]/state"); + var stateR = getprop("/engines/engine[1]/state"); + var dc_ess = getprop("/systems/electrical/bus/dc-ess"); + var psi_diff = green_psi - yellow_psi; + + if (psi_diff > 500 or psi_diff < -500 and ptu_sw) { + setprop("/systems/hydraulic/ptu-active", 1); + } else if (psi_diff < 20 and psi_diff > -20) { + setprop("/systems/hydraulic/ptu-active", 0); + } + + var ptu_active = getprop("/systems/hydraulic/ptu-active"); + + if (elec_pump_blue_sw and dc_ess >= 25 and (stateL == 3 or stateR == 3)) { + if (blue_psi < 2900) { + setprop("/systems/hydraulic/blue-psi", blue_psi + 100); + } else { + setprop("/systems/hydraulic/blue-psi", 3000); + } + } else { + if (blue_psi > 1) { + setprop("/systems/hydraulic/blue-psi", blue_psi - 0.1); + } else { + setprop("/systems/hydraulic/blue-psi", 0); + } + } + + if (eng1_pump_sw and stateL == 3) { + if (green_psi < 2900) { + setprop("/systems/hydraulic/green-psi", green_psi + 100); + } else { + setprop("/systems/hydraulic/green-psi", 3000); + } + } else if (ptu_active and stateL != 3) { + if (green_psi < 2900) { + setprop("/systems/hydraulic/green-psi", green_psi + 100); + } else { + setprop("/systems/hydraulic/green-psi", 3000); + } + } else { + if (green_psi > 1) { + setprop("/systems/hydraulic/green-psi", green_psi - 0.1); + } else { + setprop("/systems/hydraulic/green-psi", 0); + } + } + + if (eng2_pump_sw and stateR == 3) { + if (yellow_psi < 2900) { + setprop("/systems/hydraulic/yellow-psi", yellow_psi + 100); + } else { + setprop("/systems/hydraulic/yellow-psi", 3000); + } + } else if (elec_pump_yellow_sw and dc_ess >= 25) { + if (yellow_psi < 2900) { + setprop("/systems/hydraulic/yellow-psi", yellow_psi + 100); + } else { + setprop("/systems/hydraulic/yellow-psi", 3000); + } + } else if (ptu_active and stateR != 3) { + if (yellow_psi < 2900) { + setprop("/systems/hydraulic/yellow-psi", yellow_psi + 100); + } else { + setprop("/systems/hydraulic/yellow-psi", 3000); + } + } else { + if (yellow_psi > 1) { + setprop("/systems/hydraulic/yellow-psi", yellow_psi - 0.1); + } else { + setprop("/systems/hydraulic/yellow-psi", 0); + } + } } + +####################### +# Various Other Stuff # +####################### + +setlistener("/controls/gear/gear-down", func { + var down = getprop("/controls/gear/gear-down"); + if (!down and (getprop("/gear/gear[0]/wow") or getprop("/gear/gear[1]/wow") or getprop("/gear/gear[2]/wow"))) { + setprop("/controls/gear/gear-down", 1); + } }); -var gear_retract_inhibit = setlistener("controls/LGCIU/sensor/ten", func { -var sens10 = getprop("controls/LGCIU/sensor/ten"); -var gearcmd = getprop("gear/gear-cmd-norm"); -if (sens10) { -setprop("controls/LGCIU/inhibit",1); #use this property in gear retraction logic, eg if not gearinhib -} else { -setprop("controls/LGCIU/inhibit",0); +################### +# Update Function # +################### + +var update_hydraulic = func { + master_hyd(); } -}); - -# Logic: -#On the 320 series, the LGCIU, controls the safety valve when either ADR 1 or 3 has an indicated airspeed greater than 260KIAS, the valve will close preventing extension in flight. There is also a function where when the aircraft senses it's on the ground, the valve also closes to prevent inadvertent gear retraction. -#ADR 1/3 less than 260 kts with L/G lever down ----> safety valve is open(lets hydraulic fluid pass through it) {take off condition} -#ADR 1/3 less than 260 kts with L/G lever up ----> safety valve is still open as there is a 'Self Maintained' logic. {initial climb condition} As soon as ADR 1/3 more than 260 kts the safety valve will close (stop the hydraulic supply) {cruise} -#ADR 1/3 more than 260 kts with L/G lever up ----> safety valve will remain close and when ADR 1/3 drops below 260 kts with L/G lever up it will still remain close. It will open only when L/G lever is selected down.{descent condition} - -var ADRlock = setlistener("controls/LGCIU/hyd/safetyvalvepos", func { #lock the valve if there is an ADR 1 + 3 fault -var ADRfault = getprop("controls/LGCIU/sensor/adr1and3flt"); -var valve = getprop("controls/LGCIU/hyd/safetyvalvepos"); -if (!valve and ADRfault) { -setprop("controls/LGCIU/hyd/safetyvalvepos",1); -} -}); - -var safety_valve_ADR_timer = maketimer(1, func { -var ADR1 = getprop("controls/adirs/ir[0]/fault"); -var ADR3 = getprop("controls/adirs/ir[2]/fault"); -if (ADR1 and ADR3) { -setprop("controls/LGCIU/sensor/adr1and3flt", 1); -} else { -setprop("controls/LGCIU/sensor/adr1and3flt", 0); -} -}); - -var sensorten = maketimer(0.1, func { -var gearpos = getprop("/gear/gear[0]/position-norm"); -var gearpo1 = getprop("/gear/gear[1]/position-norm"); -var gearpo2 = getprop("/gear/gear[2]/position-norm"); -var gear1comp = getprop("gear/gear[0]/compression-norm"); -var gear2comp = getprop("gear/gear[1]/compression-norm"); -var gear3comp = getprop("gear/gear[2]/compression-norm"); -if (gearpos and gearpo1 and gearpo2 and ((gear1comp > 0) and (gear2comp > 0) and (gear3comp > 0))) { -setprop("controls/LGCIU/sensor/ten",1); #1 is yes condition, ie on ground. Used to prohibit retraction on ground -} else { -setprop("controls/LGCIU/sensor/ten",0); #1 is yes condition, ie on ground. Used to prohibit retraction on ground -} -}); \ No newline at end of file +var hyd_timer = maketimer(0.2, update_hydraulic); diff --git a/Nasal/it-fbw.nas b/Nasal/it-fbw.nas index 0e511078..c177392c 100644 --- a/Nasal/it-fbw.nas +++ b/Nasal/it-fbw.nas @@ -62,24 +62,28 @@ var pitch_input = func { setlistener("/sim/signals/fdm-initialized", func { setprop("/it-fbw/override", 0); - setprop("/it-fbw/law", 2); + setprop("/it-fbw/law", 3); update_roll.start(); update_pitch.start(); }); setlistener("/systems/electrical/bus/ac-ess", func { + fbw_law(); +}); + +var fbw_law = func { if (getprop("/it-fbw/override") == 0) { if (getprop("/systems/electrical/bus/ac-ess") >= 110) { if (getprop("/it-fbw/law") != 0) { setprop("/it-fbw/law", 0); } } else { - if (getprop("/it-fbw/law") != 2) { - setprop("/it-fbw/law", 2); + if (getprop("/it-fbw/law") != 3) { + setprop("/it-fbw/law", 3); } } } -}); +} ########## # Timers # diff --git a/Nasal/pneumatics.nas b/Nasal/pneumatics.nas index 22037e36..c89fdcf4 100644 --- a/Nasal/pneumatics.nas +++ b/Nasal/pneumatics.nas @@ -5,7 +5,7 @@ # Init Vars # ############# -var pneumatics_init = func { +var pneu_init = func { setprop("/controls/pneumatic/switches/bleed1", 0); setprop("/controls/pneumatic/switches/bleed2", 0); setprop("/controls/pneumatic/switches/bleedapu", 0); @@ -39,7 +39,7 @@ var master_pneu = func { var pack2_sw = getprop("/controls/pneumatic/switches/pack2"); var hot_air_sw = getprop("/controls/pneumatic/switches/hot-air"); var ram_air_sw = getprop("/controls/pneumatic/switches/ram-air"); - var pack_flo_sw = getprop("/controls/pneumatic/switches/pack-flo", 1); + var pack_flo_sw = getprop("/controls/pneumatic/switches/pack-flo"); var xbleed_sw = getprop("/controls/pneumatic/switches/xbleed"); var rpmapu = getprop("/systems/apu/rpm"); var stateL = getprop("/engines/engine[0]/state"); @@ -75,13 +75,13 @@ var master_pneu = func { } if (pack1_sw == 1 and bleed1_sw) { - setprop("/systems/pneumatic/pack1", 9); + setprop("/systems/pneumatic/pack1", pack_flo_sw); } else { setprop("/systems/pneumatic/pack1", 0); } if (pack2_sw == 1 and bleed2_sw) { - setprop("/systems/pneumatic/pack2", 9); + setprop("/systems/pneumatic/pack2", pack_flo_sw); } else { setprop("/systems/pneumatic/pack2", 0); } diff --git a/Nasal/various.nas b/Nasal/various.nas index c215acaa..eed29668 100644 --- a/Nasal/various.nas +++ b/Nasal/various.nas @@ -84,16 +84,9 @@ setlistener("/controls/switches/no-smoking-sign", func { }, 2); }); -################## -# Gear and Doors # -################## - -setlistener("/controls/gear/gear-down", func { - var down = props.globals.getNode("/controls/gear/gear-down").getBoolValue(); - if (!down and (getprop("/gear/gear[0]/wow") or getprop("/gear/gear[1]/wow") or getprop("/gear/gear[2]/wow"))) { - props.globals.getNode("/controls/gear/gear-down").setBoolValue(1); - } -}); +######### +# Doors # +######### # Front doors var doorl1 = aircraft.door.new("/sim/model/door-positions/doorl1", 2); @@ -135,7 +128,8 @@ var triggerDoor = func(door, doorName, doorDesc) { setlistener("/sim/signals/fdm-initialized", func { systems.elec_init(); systems.adirs_init(); - systems.pneumatics_init(); + systems.pneu_init(); + systems.hyd_init(); itaf.ap_init(); var autopilot = gui.Dialog.new("sim/gui/dialogs/autopilot/dialog", "Aircraft/A320Family/Systems/autopilot-dlg.xml"); setprop("/it-autoflight/input/fd1", 1); diff --git a/Systems/hydraulics.xml b/Systems/hydraulics.xml new file mode 100644 index 00000000..58adf1ae --- /dev/null +++ b/Systems/hydraulics.xml @@ -0,0 +1,9 @@ + + + + + + + + +