diff --git a/A319-100-IAE-set.xml b/A319-100-IAE-set.xml index 9fa8a4a4..ed672428 100644 --- a/A319-100-IAE-set.xml +++ b/A319-100-IAE-set.xml @@ -87,11 +87,11 @@ Aircraft/A320Family/AircraftConfig/acconfig.nas - Aircraft/A320Family/Nasal/electrical.nas Aircraft/A320Family/Nasal/engines.nas - Aircraft/A320Family/Nasal/ADIRS.nas - Aircraft/A320Family/Nasal/hydraulics.nas + Aircraft/A320Family/Nasal/electrical.nas Aircraft/A320Family/Nasal/pneumatics.nas + + Aircraft/A320Family/Nasal/ADIRS.nas Aircraft/A320Family/Nasal/it-fbw.nas diff --git a/A320-200-IAE-set.xml b/A320-200-IAE-set.xml index 6a1633fd..eab7adac 100644 --- a/A320-200-IAE-set.xml +++ b/A320-200-IAE-set.xml @@ -80,11 +80,11 @@ Aircraft/A320Family/AircraftConfig/acconfig.nas - Aircraft/A320Family/Nasal/electrical.nas Aircraft/A320Family/Nasal/engines.nas - Aircraft/A320Family/Nasal/ADIRS.nas - Aircraft/A320Family/Nasal/hydraulics.nas + Aircraft/A320Family/Nasal/electrical.nas Aircraft/A320Family/Nasal/pneumatics.nas + + Aircraft/A320Family/Nasal/ADIRS.nas Aircraft/A320Family/Nasal/it-fbw.nas diff --git a/A321-200-IAE-set.xml b/A321-200-IAE-set.xml index b7debff8..199e941a 100644 --- a/A321-200-IAE-set.xml +++ b/A321-200-IAE-set.xml @@ -80,11 +80,11 @@ Aircraft/A320Family/AircraftConfig/acconfig.nas - Aircraft/A320Family/Nasal/electrical.nas Aircraft/A320Family/Nasal/engines.nas - Aircraft/A320Family/Nasal/ADIRS.nas - Aircraft/A320Family/Nasal/hydraulics.nas + Aircraft/A320Family/Nasal/electrical.nas Aircraft/A320Family/Nasal/pneumatics.nas + + Aircraft/A320Family/Nasal/ADIRS.nas Aircraft/A320Family/Nasal/it-fbw.nas diff --git a/ACJ-IAE-set.xml b/ACJ-IAE-set.xml index 65b68976..675bca42 100644 --- a/ACJ-IAE-set.xml +++ b/ACJ-IAE-set.xml @@ -86,11 +86,11 @@ Aircraft/A320Family/AircraftConfig/acconfig.nas - Aircraft/A320Family/Nasal/electrical.nas Aircraft/A320Family/Nasal/engines.nas - Aircraft/A320Family/Nasal/ADIRS.nas - Aircraft/A320Family/Nasal/hydraulics.nas + Aircraft/A320Family/Nasal/electrical.nas Aircraft/A320Family/Nasal/pneumatics.nas + + Aircraft/A320Family/Nasal/ADIRS.nas Aircraft/A320Family/Nasal/it-fbw.nas diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas index f689af6d..55477752 100644 --- a/AircraftConfig/acconfig.nas +++ b/AircraftConfig/acconfig.nas @@ -27,8 +27,6 @@ var colddark = func { setprop("/controls/engines/engine-start-switch", 1); setprop("/controls/engines/engine[0]/cutoff-switch", 1); setprop("/controls/engines/engine[1]/cutoff-switch", 1); - setprop("/controls/electrical/switches/gen1", 0); - setprop("/controls/electrical/switches/gen2", 0); setprop("/controls/flight/slats", 0.000); setprop("/controls/flight/flaps", 0.000); setprop("/controls/flight/flap-lever", 0); @@ -36,6 +34,7 @@ var colddark = func { setprop("/controls/gear/gear-down", 1); systems.elec_init(); systems.ADIRSreset(); + systems.pneumatics_init(); itaf.ap_init(); setprop("/it-autoflight/input/fd1", 1); setprop("/it-autoflight/input/fd2", 1); @@ -71,8 +70,6 @@ var beforestart = func { setprop("/controls/engines/engine-start-switch", 1); setprop("/controls/engines/engine[0]/cutoff-switch", 1); setprop("/controls/engines/engine[1]/cutoff-switch", 1); - setprop("/controls/electrical/switches/gen1", 0); - setprop("/controls/electrical/switches/gen2", 0); setprop("/controls/flight/slats", 0.000); setprop("/controls/flight/flaps", 0.000); setprop("/controls/flight/flap-lever", 0); @@ -80,6 +77,7 @@ var beforestart = func { setprop("/controls/gear/gear-down", 1); systems.elec_init(); systems.ADIRSreset(); + systems.pneumatics_init(); itaf.ap_init(); setprop("/it-autoflight/input/fd1", 1); setprop("/it-autoflight/input/fd2", 1); @@ -96,7 +94,7 @@ var beforestart = func { setprop("/controls/APU/master", 1); setprop("/controls/APU/start", 1); var apu_rpm_chk = setlistener("/systems/apu/rpm", func { - if (getprop("/systems/apu/rpm") >= 99) { + if (getprop("/systems/apu/rpm") >= 98) { removelistener(apu_rpm_chk); beforestart_b(); } @@ -109,6 +107,8 @@ var beforestart_b = func { setprop("/controls/bleed/OHP/bleedapu", 1); setprop("/controls/electrical/switches/gen1", 1); setprop("/controls/electrical/switches/gen2", 1); + setprop("/controls/bleed/OHP/bleed1", 1); + setprop("/controls/bleed/OHP/bleed2", 1); setprop("controls/adirs/ir[0]/knob","2"); setprop("controls/adirs/ir[1]/knob","2"); setprop("controls/adirs/ir[2]/knob","2"); @@ -131,8 +131,6 @@ var taxi = func { setprop("/controls/engines/engine-start-switch", 1); setprop("/controls/engines/engine[0]/cutoff-switch", 1); setprop("/controls/engines/engine[1]/cutoff-switch", 1); - setprop("/controls/electrical/switches/gen1", 0); - setprop("/controls/electrical/switches/gen2", 0); setprop("/controls/flight/slats", 0.000); setprop("/controls/flight/flaps", 0.000); setprop("/controls/flight/flap-lever", 0); @@ -140,6 +138,7 @@ var taxi = func { setprop("/controls/gear/gear-down", 1); systems.elec_init(); systems.ADIRSreset(); + systems.pneumatics_init(); itaf.ap_init(); setprop("/it-autoflight/input/fd1", 1); setprop("/it-autoflight/input/fd2", 1); @@ -169,6 +168,8 @@ var taxi_b = func { setprop("/controls/bleed/OHP/bleedapu", 1); setprop("/controls/electrical/switches/gen1", 1); setprop("/controls/electrical/switches/gen2", 1); + setprop("/controls/bleed/OHP/bleed1", 1); + setprop("/controls/bleed/OHP/bleed2", 1); setprop("controls/adirs/ir[0]/knob","2"); setprop("controls/adirs/ir[1]/knob","2"); setprop("controls/adirs/ir[2]/knob","2"); @@ -220,7 +221,7 @@ var takeoff = func { setprop("/controls/flight/slats", 0.666); setprop("/controls/flight/flap-lever", 1); setprop("/controls/flight/flap-txt", "1+F"); - setprop("/controls/flight/elevator-trim", -0.1); + setprop("/controls/flight/elevator-trim", -0.15); } }); } diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml index af7383a9..e99f91d9 100644 --- a/Models/FlightDeck/a320.flightdeck.xml +++ b/Models/FlightDeck/a320.flightdeck.xml @@ -3806,6 +3806,43 @@ + + select + stby-ai + + + + + + /controls/electrical/switches/battery1 + 1 + + + /controls/electrical/switches/battery2 + 1 + + + + /systems/electrical/bus/dc1 + 25 + + + /systems/electrical/bus/dc2 + 25 + + + + /systems/electrical/bus/dc1 + 25 + + + /systems/electrical/bus/dc2 + 25 + + + + + texmultiple stby-ai diff --git a/Models/Instruments/ECAM/page-apu.xml b/Models/Instruments/ECAM/page-apu.xml index 8284f871..40a7cce4 100644 --- a/Models/Instruments/ECAM/page-apu.xml +++ b/Models/Instruments/ECAM/page-apu.xml @@ -110,7 +110,7 @@ /systems/apu/rpm - 98.0 + 94.9 diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml index f04ed05f..df7335b7 100644 --- a/Models/Instruments/OHpanel/OHpanel.xml +++ b/Models/Instruments/OHpanel/OHpanel.xml @@ -94,6 +94,10 @@ BatteryBtn22O Battery-lvl BusTieBtn2O + Eng1BleedBtn1F + Eng1BleedBtn2O + Eng2BleedBtn1F + Eng2BleedBtn2O ExtPwrBtn1A ExtPwrBtn2O GalleyPwrBtn1F @@ -1849,26 +1853,50 @@ pick Eng1BleedBtn1 Eng1BleedBtn2 + Eng1BleedBtn1F + Eng1BleedBtn2O false property-toggle - controls/bleed/OHP/bleed1 + /controls/bleed/OHP/bleed1 - + - Engine 1 bleed on - textranslate - Eng1BleedBtn2 - controls/bleed/OHP/bleed1 - 0.5 - - 1 - 0 - + select + Eng1BleedBtn1F + + + + /systems/unused/unused-oh + 150 + + + /controls/switches/annun-test + 1 + + + + + + + select + Eng1BleedBtn2O + + + + /controls/bleed/OHP/bleed1 + 0 + + + /controls/switches/annun-test + 1 + + + @@ -1883,7 +1911,7 @@ false property-toggle - controls/bleed/OHP/bleedapu + /controls/bleed/OHP/bleedapu @@ -1911,7 +1939,7 @@ - /controls/APU/bleed + /controls/bleed/OHP/bleedapu 1 @@ -1927,25 +1955,50 @@ pick Eng2BleedBtn1 Eng2BleedBtn2 + Eng2BleedBtn1F + Eng2BleedBtn2O false property-toggle - controls/bleed/OHP/bleed2 + /controls/bleed/OHP/bleed2 + - Engine 2 bleed on - textranslate - Eng2BleedBtn2 - controls/bleed/OHP/bleed2 - 0.5 - - 1 - 0 - + select + Eng2BleedBtn1F + + + + /systems/unused/unused-oh + 150 + + + /controls/switches/annun-test + 1 + + + + + + + select + Eng2BleedBtn2O + + + + /controls/bleed/OHP/bleed2 + 0 + + + /controls/switches/annun-test + 1 + + + @@ -2321,7 +2374,8 @@ /controls/APU/master - + + select APUMasterBtn1F @@ -2338,6 +2392,7 @@ + select APUMasterBtn2O @@ -2367,18 +2422,19 @@ false property-toggle - controls/APU/start + /controls/APU/start + select APUStartBtn1A - controls/APU/start - 99 + /systems/apu/rpm + 94.9 /controls/switches/annun-test @@ -2387,6 +2443,7 @@ + select APUStartBtn2O diff --git a/Models/Instruments/OHpanel/res/ohpanel.ac b/Models/Instruments/OHpanel/res/ohpanel.ac index e7f7f514..1ea65786 100644 --- a/Models/Instruments/OHpanel/res/ohpanel.ac +++ b/Models/Instruments/OHpanel/res/ohpanel.ac @@ -7,7 +7,717 @@ MATERIAL "ac3dmat1" rgb 0.992157 0.992157 0.992157 amb 0.2 0.2 0.2 emis 1 1 1 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 OBJECT world -kids 234 +kids 238 +OBJECT poly +name "APUFireTst" +loc 0.00144693 0.411855 0.015845 +data 12 +Cylinder.061 +crease 30.000000 +numvert 37 +-0.0098 -0.220441 -0.049344 +-0.0098 -0.216559 -0.049344 +-0.0098 -0.213197 -0.047403 +-0.0098 -0.211256 -0.044041 +-0.0098 -0.211256 -0.040159 +-0.0098 -0.213197 -0.036797 +-0.0098 -0.216559 -0.034856 +-0.0098 -0.220441 -0.034856 +-0.0098 -0.223803 -0.036797 +-0.0098 -0.225744 -0.040159 +-0.0098 -0.225744 -0.044041 +-0.0098 -0.223803 -0.047403 +-0.0098 -0.221417 -0.045017 +-0.0098 -0.222484 -0.043168 +-0.0098 -0.222484 -0.041032 +-0.0098 -0.221417 -0.039183 +-0.0098 -0.219568 -0.038116 +-0.0098 -0.217432 -0.038116 +-0.0098 -0.215583 -0.039183 +-0.0098 -0.214516 -0.041032 +-0.0098 -0.214516 -0.043168 +-0.0098 -0.215583 -0.045017 +-0.0098 -0.217432 -0.046084 +-0.0098 -0.219568 -0.046084 +-0.0078 -0.2185 -0.0421 +-0.0078 -0.219568 -0.046084 +-0.0078 -0.217432 -0.046084 +-0.0078 -0.215583 -0.045017 +-0.0078 -0.214516 -0.043168 +-0.0078 -0.214516 -0.041032 +-0.0078 -0.215583 -0.039183 +-0.0078 -0.217432 -0.038116 +-0.0078 -0.219568 -0.038116 +-0.0078 -0.221417 -0.039183 +-0.0078 -0.222484 -0.041032 +-0.0078 -0.222484 -0.043168 +-0.0078 -0.221417 -0.045017 +numsurf 36 +SURF 0x20 +mat 1 +refs 4 +11 0 0 +12 0 0 +13 0 0 +10 0 0 +SURF 0x20 +mat 1 +refs 4 +10 0 0 +13 0 0 +14 0 0 +9 0 0 +SURF 0x20 +mat 1 +refs 4 +9 0 0 +14 0 0 +15 0 0 +8 0 0 +SURF 0x20 +mat 1 +refs 4 +8 0 0 +15 0 0 +16 0 0 +7 0 0 +SURF 0x20 +mat 1 +refs 4 +7 0 0 +16 0 0 +17 0 0 +6 0 0 +SURF 0x20 +mat 1 +refs 4 +6 0 0 +17 0 0 +18 0 0 +5 0 0 +SURF 0x20 +mat 1 +refs 4 +5 0 0 +18 0 0 +19 0 0 +4 0 0 +SURF 0x20 +mat 1 +refs 4 +4 0 0 +19 0 0 +20 0 0 +3 0 0 +SURF 0x20 +mat 1 +refs 4 +3 0 0 +20 0 0 +21 0 0 +2 0 0 +SURF 0x20 +mat 1 +refs 4 +2 0 0 +21 0 0 +22 0 0 +1 0 0 +SURF 0x20 +mat 1 +refs 4 +23 0 0 +0 0 0 +1 0 0 +22 0 0 +SURF 0x20 +mat 1 +refs 4 +0 0 0 +23 0 0 +12 0 0 +11 0 0 +SURF 0x20 +mat 1 +refs 4 +23 0 0 +25 0 0 +36 0 0 +12 0 0 +SURF 0x20 +mat 1 +refs 4 +22 0 0 +26 0 0 +25 0 0 +23 0 0 +SURF 0x20 +mat 1 +refs 4 +21 0 0 +27 0 0 +26 0 0 +22 0 0 +SURF 0x20 +mat 1 +refs 4 +20 0 0 +28 0 0 +27 0 0 +21 0 0 +SURF 0x20 +mat 1 +refs 4 +19 0 0 +29 0 0 +28 0 0 +20 0 0 +SURF 0x20 +mat 1 +refs 4 +18 0 0 +30 0 0 +29 0 0 +19 0 0 +SURF 0x20 +mat 1 +refs 4 +17 0 0 +31 0 0 +30 0 0 +18 0 0 +SURF 0x20 +mat 1 +refs 4 +16 0 0 +32 0 0 +31 0 0 +17 0 0 +SURF 0x20 +mat 1 +refs 4 +15 0 0 +33 0 0 +32 0 0 +16 0 0 +SURF 0x20 +mat 1 +refs 4 +14 0 0 +34 0 0 +33 0 0 +15 0 0 +SURF 0x20 +mat 1 +refs 4 +13 0 0 +35 0 0 +34 0 0 +14 0 0 +SURF 0x20 +mat 1 +refs 4 +12 0 0 +36 0 0 +35 0 0 +13 0 0 +SURF 0x20 +mat 1 +refs 3 +25 0 0 +24 0 0 +36 0 0 +SURF 0x20 +mat 1 +refs 3 +26 0 0 +24 0 0 +25 0 0 +SURF 0x20 +mat 1 +refs 3 +27 0 0 +24 0 0 +26 0 0 +SURF 0x20 +mat 1 +refs 3 +28 0 0 +24 0 0 +27 0 0 +SURF 0x20 +mat 1 +refs 3 +29 0 0 +24 0 0 +28 0 0 +SURF 0x20 +mat 1 +refs 3 +30 0 0 +24 0 0 +29 0 0 +SURF 0x20 +mat 1 +refs 3 +31 0 0 +24 0 0 +30 0 0 +SURF 0x20 +mat 1 +refs 3 +32 0 0 +24 0 0 +31 0 0 +SURF 0x20 +mat 1 +refs 3 +33 0 0 +24 0 0 +32 0 0 +SURF 0x20 +mat 1 +refs 3 +34 0 0 +24 0 0 +33 0 0 +SURF 0x20 +mat 1 +refs 3 +35 0 0 +24 0 0 +34 0 0 +SURF 0x20 +mat 1 +refs 3 +35 0 0 +36 0 0 +24 0 0 +kids 0 +OBJECT poly +name "Eng2FireTst" +loc 0.00144693 0.411855 -0.104261 +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 "Eng1BleedBtn2O" +loc 0.0014462 -0.12015 0.05705 +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 "Eng2BleedBtn1F" +loc 0.0014462 -0.12015 -0.14035 +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 "Eng1BleedBtn1F" +loc 0.0014462 -0.12015 0.05705 +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 "IrsOnBatLightOB" loc 0.0080412 0.188693 0.282104 @@ -1295,580 +2005,8 @@ refs 3 12 0.56125 0 kids 0 OBJECT poly -name "APUFireTst" -loc 0.00144693 0.390673 0.113859 -data 12 -Cylinder.061 -crease 30.000000 -numvert 37 --0.0098 -0.220441 -0.049344 --0.0098 -0.216559 -0.049344 --0.0098 -0.213197 -0.047403 --0.0098 -0.211256 -0.044041 --0.0098 -0.211256 -0.040159 --0.0098 -0.213197 -0.036797 --0.0098 -0.216559 -0.034856 --0.0098 -0.220441 -0.034856 --0.0098 -0.223803 -0.036797 --0.0098 -0.225744 -0.040159 --0.0098 -0.225744 -0.044041 --0.0098 -0.223803 -0.047403 --0.0098 -0.221417 -0.045017 --0.0098 -0.222484 -0.043168 --0.0098 -0.222484 -0.041032 --0.0098 -0.221417 -0.039183 --0.0098 -0.219568 -0.038116 --0.0098 -0.217432 -0.038116 --0.0098 -0.215583 -0.039183 --0.0098 -0.214516 -0.041032 --0.0098 -0.214516 -0.043168 --0.0098 -0.215583 -0.045017 --0.0098 -0.217432 -0.046084 --0.0098 -0.219568 -0.046084 --0.0078 -0.2185 -0.0421 --0.0078 -0.219568 -0.046084 --0.0078 -0.217432 -0.046084 --0.0078 -0.215583 -0.045017 --0.0078 -0.214516 -0.043168 --0.0078 -0.214516 -0.041032 --0.0078 -0.215583 -0.039183 --0.0078 -0.217432 -0.038116 --0.0078 -0.219568 -0.038116 --0.0078 -0.221417 -0.039183 --0.0078 -0.222484 -0.041032 --0.0078 -0.222484 -0.043168 --0.0078 -0.221417 -0.045017 -numsurf 36 -SURF 0x20 -mat 1 -refs 4 -11 0 0 -12 0 0 -13 0 0 -10 0 0 -SURF 0x20 -mat 1 -refs 4 -10 0 0 -13 0 0 -14 0 0 -9 0 0 -SURF 0x20 -mat 1 -refs 4 -9 0 0 -14 0 0 -15 0 0 -8 0 0 -SURF 0x20 -mat 1 -refs 4 -8 0 0 -15 0 0 -16 0 0 -7 0 0 -SURF 0x20 -mat 1 -refs 4 -7 0 0 -16 0 0 -17 0 0 -6 0 0 -SURF 0x20 -mat 1 -refs 4 -6 0 0 -17 0 0 -18 0 0 -5 0 0 -SURF 0x20 -mat 1 -refs 4 -5 0 0 -18 0 0 -19 0 0 -4 0 0 -SURF 0x20 -mat 1 -refs 4 -4 0 0 -19 0 0 -20 0 0 -3 0 0 -SURF 0x20 -mat 1 -refs 4 -3 0 0 -20 0 0 -21 0 0 -2 0 0 -SURF 0x20 -mat 1 -refs 4 -2 0 0 -21 0 0 -22 0 0 -1 0 0 -SURF 0x20 -mat 1 -refs 4 -23 0 0 -0 0 0 -1 0 0 -22 0 0 -SURF 0x20 -mat 1 -refs 4 -0 0 0 -23 0 0 -12 0 0 -11 0 0 -SURF 0x20 -mat 1 -refs 4 -23 0 0 -25 0 0 -36 0 0 -12 0 0 -SURF 0x20 -mat 1 -refs 4 -22 0 0 -26 0 0 -25 0 0 -23 0 0 -SURF 0x20 -mat 1 -refs 4 -21 0 0 -27 0 0 -26 0 0 -22 0 0 -SURF 0x20 -mat 1 -refs 4 -20 0 0 -28 0 0 -27 0 0 -21 0 0 -SURF 0x20 -mat 1 -refs 4 -19 0 0 -29 0 0 -28 0 0 -20 0 0 -SURF 0x20 -mat 1 -refs 4 -18 0 0 -30 0 0 -29 0 0 -19 0 0 -SURF 0x20 -mat 1 -refs 4 -17 0 0 -31 0 0 -30 0 0 -18 0 0 -SURF 0x20 -mat 1 -refs 4 -16 0 0 -32 0 0 -31 0 0 -17 0 0 -SURF 0x20 -mat 1 -refs 4 -15 0 0 -33 0 0 -32 0 0 -16 0 0 -SURF 0x20 -mat 1 -refs 4 -14 0 0 -34 0 0 -33 0 0 -15 0 0 -SURF 0x20 -mat 1 -refs 4 -13 0 0 -35 0 0 -34 0 0 -14 0 0 -SURF 0x20 -mat 1 -refs 4 -12 0 0 -36 0 0 -35 0 0 -13 0 0 -SURF 0x20 -mat 1 -refs 3 -25 0 0 -24 0 0 -36 0 0 -SURF 0x20 -mat 1 -refs 3 -26 0 0 -24 0 0 -25 0 0 -SURF 0x20 -mat 1 -refs 3 -27 0 0 -24 0 0 -26 0 0 -SURF 0x20 -mat 1 -refs 3 -28 0 0 -24 0 0 -27 0 0 -SURF 0x20 -mat 1 -refs 3 -29 0 0 -24 0 0 -28 0 0 -SURF 0x20 -mat 1 -refs 3 -30 0 0 -24 0 0 -29 0 0 -SURF 0x20 -mat 1 -refs 3 -31 0 0 -24 0 0 -30 0 0 -SURF 0x20 -mat 1 -refs 3 -32 0 0 -24 0 0 -31 0 0 -SURF 0x20 -mat 1 -refs 3 -33 0 0 -24 0 0 -32 0 0 -SURF 0x20 -mat 1 -refs 3 -34 0 0 -24 0 0 -33 0 0 -SURF 0x20 -mat 1 -refs 3 -35 0 0 -24 0 0 -34 0 0 -SURF 0x20 -mat 1 -refs 3 -35 0 0 -36 0 0 -24 0 0 -kids 0 -OBJECT poly -name "Eng2FireTst" -loc 0.00144693 0.390673 -0.00583978 -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 "Eng1FireTst" -loc 0.00144693 0.390673 0.285996 +loc 0.00144693 0.411855 0.187666 data 12 Cylinder.061 crease 30.000000 @@ -33198,3 +33336,49 @@ refs 4 9 0 0.5 8 0.5 0.5 kids 0 +OBJECT poly +name "Eng2BleedBtn2O" +loc 0.0014462 -0.12015 -0.14035 +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 diff --git a/Models/Instruments/OHpanel/res/ohpanel.ac.bak b/Models/Instruments/OHpanel/res/ohpanel.ac.bak index 87e29d99..6016a2d6 100644 --- a/Models/Instruments/OHpanel/res/ohpanel.ac.bak +++ b/Models/Instruments/OHpanel/res/ohpanel.ac.bak @@ -1,13 +1,151 @@ AC3Db MATERIAL "DefaultWhite.001" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0 0 0 shi 64 trans 0 MATERIAL "Metal" rgb 0.071878 0.071878 0.071878 amb 0 0 0 emis 0 0 0 spec 0 0 0.0156863 shi 32 trans 0 -MATERIAL "OHPRedButton" rgb 1 0 0 amb 1 0 0 emis 0 0 0 spec 1 1 1 shi 32 trans 0 +MATERIAL "OHPRedButton" rgb 1 0 0 amb 1 0 0 emis 1 0 0 spec 1 1 1 shi 32 trans 0 MATERIAL "Switch" rgb 0.504688 0.504688 0.504688 amb 0.5 0.5 0.5 emis 0 0 0 spec 0 0 0.0235294 shi 32 trans 0.004 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 OBJECT world -kids 234 +kids 238 +OBJECT poly +name "Eng1BleedBtn2O" +loc 0.0014462 -0.12015 0.05705 +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 "Eng2BleedBtn1F" +loc 0.0014462 -0.12015 -0.14035 +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 "Eng1BleedBtn1F" +loc 0.0014462 -0.12015 0.05705 +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 "IrsOnBatLightOB" loc 0.0080412 0.188693 0.282104 @@ -1214,81 +1352,81 @@ numvert 14 -0.01 0.1833 0.101359 numsurf 12 SURF 0x0 -mat 0 +mat 4 refs 4 0 1 1 3 1 1 2 4.43487e-008 1 1 4.43487e-008 1 SURF 0x0 -mat 0 +mat 4 refs 4 5 0 0.195122 1 4.43487e-008 1 2 4.43487e-008 1 6 0 0.195122 SURF 0x0 -mat 0 +mat 4 refs 4 0 1 1 4 1 0.195122 7 1 0.195122 3 1 1 SURF 0x0 -mat 0 +mat 4 refs 3 5 0 0.195122 9 0.325 0.195122 1 4.43487e-008 1 SURF 0x0 -mat 0 +mat 4 refs 3 4 1 0.195122 0 1 1 8 0.675 0.195122 SURF 0x0 -mat 0 +mat 4 refs 4 4 1 0.195122 8 0.675 0.195122 11 0.675 0.195122 7 1 0.195122 SURF 0x0 -mat 0 +mat 4 refs 4 9 0.325 0.195122 5 0 0.195122 6 0 0.195122 10 0.325 0.195122 SURF 0x0 -mat 0 +mat 4 refs 4 0 1 1 1 4.43487e-008 1 9 0.325 0.195122 8 0.675 0.195122 SURF 0x0 -mat 0 +mat 4 refs 4 10 0.325 0.195122 11 0.675 0.195122 12 0.56125 0 13 0.43875 0 SURF 0x0 -mat 0 +mat 4 refs 4 8 0.675 0.195122 9 0.325 0.195122 13 0.43875 0 12 0.56125 0 SURF 0x0 -mat 0 +mat 4 refs 3 9 0.325 0.195122 10 0.325 0.195122 13 0.43875 0 SURF 0x0 -mat 0 +mat 4 refs 3 11 0.675 0.195122 8 0.675 0.195122 @@ -13271,80 +13409,80 @@ numvert 14 -0.007 0.2243 0.066 numsurf 12 SURF 0x0 -mat 0 +mat 4 refs 3 2 0.675 0.195122 5 0.675 0.195122 1 0.56125 0 SURF 0x0 -mat 0 +mat 4 refs 3 4 0.325 0.195122 3 0.325 0.195122 0 0.43875 0 SURF 0x0 -mat 0 +mat 4 refs 4 5 0.675 0.195122 4 0.325 0.195122 0 0.43875 0 1 0.56125 0 SURF 0x0 -mat 0 +mat 4 refs 4 3 0.325 0.195122 2 0.675 0.195122 1 0.56125 0 0 0.43875 0 SURF 0x0 -mat 0 +mat 4 refs 4 13 1 1 12 4.43487e-008 1 4 0.325 0.195122 5 0.675 0.195122 SURF 0x0 -mat 0 +mat 4 refs 4 4 0.325 0.195122 8 0 0.195122 7 0 0.195122 3 0.325 0.195122 SURF 0x0 -mat 0 +mat 4 refs 4 9 1 0.195122 5 0.675 0.195122 2 0.675 0.195122 6 1 0.195122 SURF 0x0 -mat 0 +mat 4 refs 3 9 1 0.195122 13 1 1 5 0.675 0.195122 SURF 0x0 -mat 0 +mat 4 refs 3 8 0 0.195122 4 0.325 0.195122 12 4.43487e-008 1 SURF 0x0 -mat 0 +mat 4 refs 4 13 1 1 9 1 0.195122 6 1 0.195122 10 1 1 SURF 0x0 -mat 0 +mat 4 refs 4 8 0 0.195122 12 4.43487e-008 1 11 4.43487e-008 1 7 0 0.195122 SURF 0x0 -mat 0 +mat 4 refs 4 13 1 1 10 1 1 @@ -13931,80 +14069,80 @@ numvert 14 -0.007 0.2243 -0.13 numsurf 12 SURF 0x0 -mat 0 +mat 4 refs 3 2 0.675 0.195122 5 0.675 0.195122 1 0.56125 0 SURF 0x0 -mat 0 +mat 4 refs 3 4 0.325 0.195122 3 0.325 0.195122 0 0.43875 0 SURF 0x0 -mat 0 +mat 4 refs 4 5 0.675 0.195122 4 0.325 0.195122 0 0.43875 0 1 0.56125 0 SURF 0x0 -mat 0 +mat 4 refs 4 3 0.325 0.195122 2 0.675 0.195122 1 0.56125 0 0 0.43875 0 SURF 0x0 -mat 0 +mat 4 refs 4 13 1 1 12 4.43487e-008 1 4 0.325 0.195122 5 0.675 0.195122 SURF 0x0 -mat 0 +mat 4 refs 4 4 0.325 0.195122 8 0 0.195122 7 0 0.195122 3 0.325 0.195122 SURF 0x0 -mat 0 +mat 4 refs 4 9 1 0.195122 5 0.675 0.195122 2 0.675 0.195122 6 1 0.195122 SURF 0x0 -mat 0 +mat 4 refs 3 9 1 0.195122 13 1 1 5 0.675 0.195122 SURF 0x0 -mat 0 +mat 4 refs 3 8 0 0.195122 4 0.325 0.195122 12 4.43487e-008 1 SURF 0x0 -mat 0 +mat 4 refs 4 13 1 1 9 1 0.195122 6 1 0.195122 10 1 1 SURF 0x0 -mat 0 +mat 4 refs 4 8 0 0.195122 12 4.43487e-008 1 11 4.43487e-008 1 7 0 0.195122 SURF 0x0 -mat 0 +mat 4 refs 4 13 1 1 10 1 1 @@ -33198,3 +33336,49 @@ refs 4 9 0 0.5 8 0.5 0.5 kids 0 +OBJECT poly +name "Eng2BleedBtn2O" +loc 0.0014462 -0.12015 -0.14035 +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 diff --git a/Nasal/ADIRS.nas b/Nasal/ADIRS.nas index d851a858..cfdf381c 100644 --- a/Nasal/ADIRS.nas +++ b/Nasal/ADIRS.nas @@ -52,7 +52,7 @@ var ADIRSreset = func { setprop("controls/adirs/ir[2]/fault",0); setprop("controls/adirs/onbat",0); setprop("controls/adirs/skip",0); - ADIRSinit(); + adirs_init(); } var ir_align_loop = func(i) { diff --git a/Nasal/efis.nas b/Nasal/efis.nas index fe270cfc..9b50b0e5 100644 --- a/Nasal/efis.nas +++ b/Nasal/efis.nas @@ -4,7 +4,6 @@ setlistener("sim/signals/fdm-initialized", func { setprop("instrumentation/efis/mfd/pnl_mode-num", 3); setprop("/controls/lighting/ndl-norm", "1"); setprop("/controls/lighting/ndr-norm", "1"); - print("EFIS ... Done!"); }); # Captain diff --git a/Nasal/electrical.nas b/Nasal/electrical.nas index 08e0ebd2..d51736fd 100644 --- a/Nasal/electrical.nas +++ b/Nasal/electrical.nas @@ -1,14 +1,14 @@ # Electrical system for A320 by Joshua Davidson (it0uchpods/411). -var ELEC_UPDATE_PERIOD = 0.5; # A periodic update in secs -var STD_VOLTS_AC = 115; # Typical volts for a power source -var MIN_VOLTS_AC = 110; # Typical minimum voltage level for generic equipment -var STD_VOLTS_DC = 28; # Typical volts for a power source -var MIN_VOLTS_DC = 25; # Typical minimum voltage level for generic equipment -var STD_AMPS = 0; # Not used yet -var NUM_ENGINES = 2; +############# +# Init Vars # +############# + +var ac_volt_std = 115; +var ac_volt_min = 110; +var dc_volt_std = 28; +var dc_volt_min = 25; -# Set all the stuff I need var elec_init = func { setprop("/controls/switches/annun-test", 0); setprop("/controls/electrical/switches/galley", 0); @@ -63,9 +63,13 @@ var elec_init = func { setprop("/systems/electrical/outputs/taxi-lights", 0); setprop("/systems/electrical/outputs/transponder", 0); setprop("/systems/electrical/outputs/turn-coordinator", 0); + elec_timer.start(); } -# Define all the stuff I need for the main elec loop +###################### +# Main Electric Loop # +###################### + var master_elec = func { var gallery_sw = getprop("/controls/electrical/switches/galley"); var idg1_sw = getprop("/controls/electrical/switches/idg1"); @@ -95,7 +99,7 @@ var master_elec = func { # Left cross tie yes? if (extpwr_on and gen_ext_sw) { setprop("/controls/electrical/xtie/xtieR", 1); - } else if (rpmapu >= 99 and gen_apu_sw) { + } else if (rpmapu >= 94.9 and gen_apu_sw) { setprop("/controls/electrical/xtie/xtieR", 1); } else if (stateL == 3 and gen1_sw) { setprop("/controls/electrical/xtie/xtieR", 1); @@ -106,7 +110,7 @@ var master_elec = func { # Right cross tie yes? if (extpwr_on and gen_ext_sw) { setprop("/controls/electrical/xtie/xtieL", 1); - } else if (rpmapu >= 99 and gen_apu_sw) { + } else if (rpmapu >= 94.9 and gen_apu_sw) { setprop("/controls/electrical/xtie/xtieL", 1); } else if (stateR == 3 and gen2_sw) { setprop("/controls/electrical/xtie/xtieL", 1); @@ -116,25 +120,25 @@ var master_elec = func { # Left AC/DC bus yes? if (extpwr_on and gen_ext_sw) { - setprop("/systems/electrical/bus/ac1", 115); - setprop("/systems/electrical/bus/ac-ess", 115); - setprop("/systems/electrical/bus/dc1", 28); - setprop("/systems/electrical/bus/dc-ess", 28); - } else if (rpmapu >= 99 and gen_apu_sw) { - setprop("/systems/electrical/bus/ac1", 115); - setprop("/systems/electrical/bus/ac-ess", 115); - setprop("/systems/electrical/bus/dc1", 28); - setprop("/systems/electrical/bus/dc-ess", 28); + setprop("/systems/electrical/bus/ac1", ac_volt_std); + setprop("/systems/electrical/bus/ac-ess", ac_volt_std); + setprop("/systems/electrical/bus/dc1", dc_volt_std); + setprop("/systems/electrical/bus/dc-ess", dc_volt_std); + } else if (rpmapu >= 94.9 and gen_apu_sw) { + setprop("/systems/electrical/bus/ac1", ac_volt_std); + setprop("/systems/electrical/bus/ac-ess", ac_volt_std); + setprop("/systems/electrical/bus/dc1", dc_volt_std); + setprop("/systems/electrical/bus/dc-ess", dc_volt_std); } else if (stateL == 3 and gen1_sw) { - setprop("/systems/electrical/bus/ac1", 115); - setprop("/systems/electrical/bus/ac-ess", 115); - setprop("/systems/electrical/bus/dc1", 28); - setprop("/systems/electrical/bus/dc-ess", 28); + setprop("/systems/electrical/bus/ac1", ac_volt_std); + setprop("/systems/electrical/bus/ac-ess", ac_volt_std); + setprop("/systems/electrical/bus/dc1", dc_volt_std); + setprop("/systems/electrical/bus/dc-ess", dc_volt_std); } else if (apu_ext_crosstie_sw == 1 and xtieL) { - setprop("/systems/electrical/bus/ac1", 115); - setprop("/systems/electrical/bus/ac-ess", 115); - setprop("/systems/electrical/bus/dc1", 28); - setprop("/systems/electrical/bus/dc-ess", 28); + setprop("/systems/electrical/bus/ac1", ac_volt_std); + setprop("/systems/electrical/bus/ac-ess", ac_volt_std); + setprop("/systems/electrical/bus/dc1", dc_volt_std); + setprop("/systems/electrical/bus/dc-ess", dc_volt_std); } else { setprop("/systems/electrical/bus/ac1", 0); if (getprop("/systems/electrical/bus/ac2") == 0) { @@ -148,25 +152,25 @@ var master_elec = func { # Right AC/DC bus yes? if (extpwr_on and gen_ext_sw) { - setprop("/systems/electrical/bus/ac2", 115); - setprop("/systems/electrical/bus/ac-ess", 115); - setprop("/systems/electrical/bus/dc2", 28); - setprop("/systems/electrical/bus/dc-ess", 28); - } else if (rpmapu >= 99 and gen_apu_sw) { - setprop("/systems/electrical/bus/ac2", 115); - setprop("/systems/electrical/bus/ac-ess", 115); - setprop("/systems/electrical/bus/dc2", 28); - setprop("/systems/electrical/bus/dc-ess", 28); + setprop("/systems/electrical/bus/ac2", ac_volt_std); + setprop("/systems/electrical/bus/ac-ess", ac_volt_std); + setprop("/systems/electrical/bus/dc2", dc_volt_std); + setprop("/systems/electrical/bus/dc-ess", dc_volt_std); + } else if (rpmapu >= 94.9 and gen_apu_sw) { + setprop("/systems/electrical/bus/ac2", ac_volt_std); + setprop("/systems/electrical/bus/ac-ess", ac_volt_std); + setprop("/systems/electrical/bus/dc2", dc_volt_std); + setprop("/systems/electrical/bus/dc-ess", dc_volt_std); } else if (stateR == 3 and gen2_sw) { - setprop("/systems/electrical/bus/ac2", 115); - setprop("/systems/electrical/bus/ac-ess", 115); - setprop("/systems/electrical/bus/dc2", 28); - setprop("/systems/electrical/bus/dc-ess", 28); + setprop("/systems/electrical/bus/ac2", ac_volt_std); + setprop("/systems/electrical/bus/ac-ess", ac_volt_std); + setprop("/systems/electrical/bus/dc2", dc_volt_std); + setprop("/systems/electrical/bus/dc-ess", dc_volt_std); } else if (apu_ext_crosstie_sw == 1 and xtieR) { - setprop("/systems/electrical/bus/ac2", 115); - setprop("/systems/electrical/bus/ac-ess", 115); - setprop("/systems/electrical/bus/dc2", 28); - setprop("/systems/electrical/bus/dc-ess", 28); + setprop("/systems/electrical/bus/ac2", ac_volt_std); + setprop("/systems/electrical/bus/ac-ess", ac_volt_std); + setprop("/systems/electrical/bus/dc2", dc_volt_std); + setprop("/systems/electrical/bus/dc-ess", dc_volt_std); } else { setprop("/systems/electrical/bus/ac2", 0); if (getprop("/systems/electrical/bus/ac1") == 0) { @@ -180,7 +184,7 @@ var master_elec = func { if (ac_ess >= 100) { if (gallery_sw == 1) { - setprop("/systems/electrical/bus/galley", 115); + setprop("/systems/electrical/bus/galley", ac_volt_std); } else if (gallery_sw == 0) { setprop("/systems/electrical/bus/galley", 0); } @@ -188,22 +192,6 @@ var master_elec = func { setprop("/systems/electrical/bus/galley", 0); } - - - - - - - - - - - - -} - - -setlistener("/systems/electrical/bus/ac-ess", func { if (getprop("/systems/electrical/bus/ac-ess") == 0) { setprop("systems/electrical/on", 0); # ai_spin.setValue(0.2); @@ -240,41 +228,44 @@ setlistener("/systems/electrical/bus/ac-ess", func { } else { setprop("systems/electrical/on", 1); # aispin.start(); - setprop("systems/electrical/outputs/adf", 28); - setprop("systems/electrical/outputs/audio-panel", 28); - setprop("systems/electrical/outputs/audio-panel[1]", 28); - setprop("systems/electrical/outputs/autopilot", 28); - setprop("systems/electrical/outputs/avionics-fan", 28); - setprop("systems/electrical/outputs/beacon", 28); - setprop("systems/electrical/outputs/bus", 28); - setprop("systems/electrical/outputs/cabin-lights", 28); - setprop("systems/electrical/outputs/dme", 28); - setprop("systems/electrical/outputs/efis", 28); - setprop("systems/electrical/outputs/flaps", 28); - setprop("systems/electrical/outputs/fuel-pump", 28); - setprop("systems/electrical/outputs/fuel-pump[1]", 28); - setprop("systems/electrical/outputs/gps", 28); - setprop("systems/electrical/outputs/gps-mfd", 28); - setprop("systems/electrical/outputs/hsi", 28); - setprop("systems/electrical/outputs/instr-ignition-switch", 28); - setprop("systems/electrical/outputs/instrument-lights", 28); - setprop("systems/electrical/outputs/landing-lights", 28); - setprop("systems/electrical/outputs/map-lights", 28); - setprop("systems/electrical/outputs/mk-viii", 28); - setprop("systems/electrical/outputs/nav", 28); - setprop("systems/electrical/outputs/nav[1]", 28); - setprop("systems/electrical/outputs/pitot-head", 28); - setprop("systems/electrical/outputs/stobe-lights", 28); - setprop("systems/electrical/outputs/tacan", 28); - setprop("systems/electrical/outputs/taxi-lights", 28); - setprop("systems/electrical/outputs/transponder", 28); - setprop("systems/electrical/outputs/turn-coordinator", 28); + setprop("systems/electrical/outputs/adf", dc_volt_std); + setprop("systems/electrical/outputs/audio-panel", dc_volt_std); + setprop("systems/electrical/outputs/audio-panel[1]", dc_volt_std); + setprop("systems/electrical/outputs/autopilot", dc_volt_std); + setprop("systems/electrical/outputs/avionics-fan", dc_volt_std); + setprop("systems/electrical/outputs/beacon", dc_volt_std); + setprop("systems/electrical/outputs/bus", dc_volt_std); + setprop("systems/electrical/outputs/cabin-lights", dc_volt_std); + setprop("systems/electrical/outputs/dme", dc_volt_std); + setprop("systems/electrical/outputs/efis", dc_volt_std); + setprop("systems/electrical/outputs/flaps", dc_volt_std); + setprop("systems/electrical/outputs/fuel-pump", dc_volt_std); + setprop("systems/electrical/outputs/fuel-pump[1]", dc_volt_std); + setprop("systems/electrical/outputs/gps", dc_volt_std); + setprop("systems/electrical/outputs/gps-mfd", dc_volt_std); + setprop("systems/electrical/outputs/hsi", dc_volt_std); + setprop("systems/electrical/outputs/instr-ignition-switch", dc_volt_std); + setprop("systems/electrical/outputs/instrument-lights", dc_volt_std); + setprop("systems/electrical/outputs/landing-lights", dc_volt_std); + setprop("systems/electrical/outputs/map-lights", dc_volt_std); + setprop("systems/electrical/outputs/mk-viii", dc_volt_std); + setprop("systems/electrical/outputs/nav", dc_volt_std); + setprop("systems/electrical/outputs/nav[1]", dc_volt_std); + setprop("systems/electrical/outputs/pitot-head", dc_volt_std); + setprop("systems/electrical/outputs/stobe-lights", dc_volt_std); + setprop("systems/electrical/outputs/tacan", dc_volt_std); + setprop("systems/electrical/outputs/taxi-lights", dc_volt_std); + setprop("systems/electrical/outputs/transponder", dc_volt_std); + setprop("systems/electrical/outputs/turn-coordinator", dc_volt_std); } -}); - -var update_electrical = func { - master_elec(); - settimer(update_electrical, ELEC_UPDATE_PERIOD); } -settimer(update_electrical, 2); +################### +# Update Function # +################### + +var update_electrical = func { + master_elec(); +} + +var elec_timer = maketimer(0.5, update_electrical); diff --git a/Nasal/hydraulics.nas b/Nasal/hydraulics.nas index 08c20c7a..cc34c261 100644 --- a/Nasal/hydraulics.nas +++ b/Nasal/hydraulics.nas @@ -1,5 +1,8 @@ -# A320Family LGCIU +# A320 Hydraulics - Disabled until complete + +# LGCIU # Jonathan Redpath +# Note: Will be compressed ##################### # Initializing Vars # diff --git a/Nasal/pneumatics.nas b/Nasal/pneumatics.nas index 730ac626..76ef6ede 100644 --- a/Nasal/pneumatics.nas +++ b/Nasal/pneumatics.nas @@ -1,104 +1,106 @@ +# A320 Pneumatics System +# Jonathan Redpath (legoboyvdlp) and Joshua Davidson (it0uchpods) + +############# +# Init Vars # +############# + +# 7th stage of HP compressor is where the bleed is normally extracted at 44 PSI +- 4 but at low N2 10th stage is selected to provide 36 +- 4 psi var pneumatics_init = func { -#Temps and Pressures. Controls ECAM indications -setprop("/controls/bleed/BMC1/tempspsi/eng1/bleedvalvepsi",0); #eng 1 bleed pressure -setprop("/controls/bleed/BMC1/tempspsi/eng1/bleedvalvetemp",0); #eng 2 bleed temp -setprop("/controls/bleed/BMC1/tempspsi/eng2/bleedvalvepsi",0); #eng 1 bleed pressure -setprop("/controls/bleed/BMC1/tempspsi/eng2/bleedvalvetemp",0); #eng 2 bleed temp -setprop("/controls/bleed/BMC1/tempspsi/eng1/downstreamfavtemp",0); #eng 1 bleed temp upstream of precooler -setprop("/controls/bleed/BMC1/tempspsi/eng2/downstreamfavtemp",0); #eng 2 bleed temp upstream of precooler -#valves -setprop("/controls/bleed/BMC1/valves/xbleed",0); #controls xbleed valve pos -setprop("/controls/bleed/BMC1/valves/eng1/bleedvalvepos",0); #eng 1 bleed off on startup -setprop("/controls/bleed/BMC1/valves/eng1/OPRESSvalve",0); #at 75 PSI the valve moves to 50 percent closed and at 85 psi moves to 100 percent -setprop("/controls/bleed/BMC1/valves/eng1/bleedengsrc","7"); -setprop("/controls/bleed/BMC1/valves/eng1/fav",0); #limits temp upstream of bleed valve to 200C. closes as needed to maintain temp. closed on startup as engine n1 is 0 -setprop("/controls/bleed/BMC1/valves/eng2/fav",0); #limits temp upstream of bleed valve to 200C. closes as needed to maintain temp. closed on startup as engine n1 is 0 -setprop("/controls/bleed/BMC1/valves/eng2/bleedvalvepos",0); #eng 1 bleed off on startup -setprop("/controls/bleed/BMC1/valves/eng2/OPRESSvalve",0); -setprop("/controls/bleed/BMC1/valves/eng2/bleedengsrc","7"); -setprop("/controls/bleed/BMC1/valves/eng2/fav",0); -setprop("/controls/bleed/BMC1/valves/apubleed",0); #apu bleed off on startup -setprop("/controls/bleed/BMC1/valves/eng1/startvalve",0); #must be open for engine start. Opens automatically. Can get stuck (note for v.1.0) -setprop("/controls/bleed/BMC1/valves/eng2/startvalve",0); -setprop("/controls/bleed/ground",0); #ground air disco on startup. Remember that packs must be off for this, maybe make copilot screen message like 777 autopilot messages -#7th stage of HP compressor is where the bleed is normally extracted at 44 PSI +- 4 but at low N2 10th stage is selected to provide 36 +- 4 psi -#Overhead -setprop("/controls/bleed/OHP/pack1",0); -setprop("/controls/bleed/OHP/pack2",0); -setprop("/controls/bleed/OHP/bleed1",0); -setprop("/controls/bleed/OHP/bleed2",0); -setprop("/controls/bleed/OHP/xbleed",0); #controls xbleed valve MODE -setprop("/controls/bleed/OHP/bleedapu",0); -setprop("/controls/bleed/OHP/ramair",0); + setprop("/systems/pneumatic/tempspsi/eng1/bleedvalvepsi", 0); + setprop("/systems/pneumatic/tempspsi/eng1/bleedvalvetemp", 0); + setprop("/systems/pneumatic/tempspsi/eng2/bleedvalvepsi", 0); + setprop("/systems/pneumatic/tempspsi/eng2/bleedvalvetemp", 0); + setprop("/systems/pneumatic/tempspsi/eng1/downstreamfavtemp", 0); + setprop("/systems/pneumatic/tempspsi/eng2/downstreamfavtemp", 0); + setprop("/systems/pneumatic/valves/xbleed", 0); + setprop("/systems/pneumatic/valves/eng1/bleedvalvepos", 0); + setprop("/systems/pneumatic/valves/eng1/OPRESSvalve", 0); + setprop("/systems/pneumatic/valves/eng1/bleedengsrc", "7"); + setprop("/systems/pneumatic/valves/eng1/fav", 0); + setprop("/systems/pneumatic/valves/eng2/fav", 0); + setprop("/systems/pneumatic/valves/eng2/bleedvalvepos", 0); + setprop("/systems/pneumatic/valves/eng2/OPRESSvalve", 0); + setprop("/systems/pneumatic/valves/eng2/bleedengsrc", "7"); + setprop("/systems/pneumatic/valves/eng2/fav", 0); + setprop("/systems/pneumatic/valves/apubleed", 0); + setprop("/systems/pneumatic/valves/eng1/startvalve", 0); + setprop("/systems/pneumatic/valves/eng2/startvalve", 0); + setprop("/controls/bleed/ground", 0); + setprop("/controls/bleed/OHP/pack1", 0); + setprop("/controls/bleed/OHP/pack2", 0); + setprop("/controls/bleed/OHP/bleed1", 0); + setprop("/controls/bleed/OHP/bleed2", 0); + setprop("/controls/bleed/OHP/xbleed", 0); + setprop("/controls/bleed/OHP/bleedapu", 0); + setprop("/controls/bleed/OHP/ramair", 0); + pneu_timer.start(); } +####################### +# Main Pneumatic Loop # +####################### - -##################### -# Bleed Valve Logic # -##################### -setlistener("/controls/bleed/OHP/bleed1", func { -var bleed1 = getprop("/controls/bleed/OHP/bleed1"); -if (bleed1) { - setprop("/controls/bleed/BMC1/valves/eng1/bleedvalvepos",1); -} else { - setprop("/controls/bleed/BMC1/valves/eng1/bleedvalvepos",0); -} -}); - -setlistener("/controls/bleed/OHP/bleed2", func { -var bleed2 = getprop("/controls/bleed/OHP/bleed2"); -if (bleed2) { - setprop("/controls/bleed/BMC1/valves/eng2/bleedvalvepos",1); -} else { - setprop("/controls/bleed/BMC1/valves/eng2/bleedvalvepos",0); -} -}); - -var bleed_valve_eng1 = func { #logic that closes the bleed valve - var opress1 = getprop("/controls/bleed/BMC1/valves/eng1/OPRESSvalve"); - var apubleed = getprop("/controls/bleed/BMC1/valves/apubleed"); +var master_pneu = func { + var bleed1 = getprop("/controls/bleed/OHP/bleed1"); + var bleed2 = getprop("/controls/bleed/OHP/bleed2"); + var apubleedsw = getprop("/controls/bleed/OHP/bleedapu"); + var apubleed = getprop("/systems/pneumatic/valves/apubleed"); + var opress1 = getprop("/systems/pneumatic/valves/eng1/OPRESSvalve"); var bleedohp1 = getprop("/controls/bleed/OHP/bleed1"); - var eng1valveopen = getprop("/controls/bleed/BMC1/valves/eng1/startvalve"); - #if (opress1 or firepb or leak or ovht or apubleed or eng1valveopen or !bleedohp1) - if (opress1 or apubleed or !bleedoph1 or eng1valveopen) { - var bleedvalve1 = getprop("/controls/bleed/BMC1/valves/eng1/bleedvalvepos"); - setprop(bleedvalve1,0); - } -} - -var bleed_valve_eng2 = func { #logic that closes the bleed valve - var opress2 = getprop("/controls/bleed/BMC1/valves/eng2/OPRESSvalve"); - var apubleed = getprop("/controls/bleed/BMC1/valves/apubleed"); + var eng1valveopen = getprop("/systems/pneumatic/valves/eng1/startvalve"); + var opress2 = getprop("/systems/pneumatic/valves/eng2/OPRESSvalve"); var bleedohp2 = getprop("/controls/bleed/OHP/bleed2"); - var eng2valveopen = getprop("/controls/bleed/BMC1/valves/eng2/startvalve"); - #if (opress2 or firepb or leak or ovht or apubleed or eng1valveopen or !bleedohp2) - if (opress2 or apubleed or !bleedoph2 or eng2valveopen) { - var bleedvalve2 = getprop("/controls/bleed/BMC1/valves/eng2/bleedvalvepos"); - setprop(bleedvalve2,0); + var eng2valveopen = getprop("/systems/pneumatic/valves/eng2/startvalve"); + + if (bleed1) { + setprop("/systems/pneumatic/valves/eng1/bleedvalvepos", 1); + } else { + setprop("/systems/pneumatic/valves/eng1/bleedvalvepos", 0); + } + + if (bleed2) { + setprop("/systems/pneumatic/valves/eng2/bleedvalvepos", 1); + } else { + setprop("/systems/pneumatic/valves/eng2/bleedvalvepos", 0); + } + + if (opress1 or apubleed or !bleedohp1 or eng1valveopen) { + setprop("/systems/pneumatic/valves/eng1/bleedvalvepos", 0); + } + + if (opress2 or apubleed or !bleedohp2 or eng2valveopen) { + setprop("/systems/pneumatic/valves/eng2/bleedvalvepos", 0); + } + + if (apubleedsw) { + apubleedtimer.start(); + } else { + apubleedtimer.stop(); + setprop("/systems/pneumatic/valves/xbleed", 0); + setprop("/systems/pneumatic/valves/apubleed", 0); } } -setlistener("/controls/bleed/OHP/bleedapu", func { -var bleedAPU = getprop("/controls/bleed/OHP/bleedapu"); -if (bleedAPU) { -apubleedtimer.start(); -} else { -apubleedtimer.stop(); -setprop("/controls/bleed/BMC1/valves/xbleed",0); #close xbleed -setprop("/controls/bleed/BMC1/valves/apubleed",0); #close apu bleed -} +var apubleedtimer = maketimer(0.5, func { + var APU = getprop("/systems/apu/rpm"); + if (APU > 94.9) { + apubleedtimer.stop(); + setprop("/systems/pneumatic/valves/xbleed", 1); + setprop("/systems/pneumatic/valves/eng1/bleedvalvepos", 0); + setprop("/systems/pneumatic/valves/eng2/bleedvalvepos", 0); + setprop("/controls/bleed/OHP/bleed1", 0); + setprop("/controls/bleed/OHP/bleed2", 0); + setprop("/systems/pneumatic/valves/apubleed", 1); + } }); -var apubleedtimer = maketimer(0.1, func { -var APU = getprop("/systems/apu/rpm"); -if (APU > 94.9) { -setprop("/controls/bleed/BMC1/valves/xbleed",1); #open xbleed so apu can supply both packs -setprop("/controls/bleed/BMC1/valves/eng1/bleedvalvepos",0); #close eng bleeds -setprop("/controls/bleed/BMC1/valves/eng2/bleedvalvepos",0); -setprop("/controls/bleed/OHP/bleed1",0); #close eng bleeds on OHP -setprop("/controls/bleed/OHP/bleed2",0); -setprop("/controls/bleed/BMC1/valves/apubleed",1); #open apu bleed -apubleedtimer.stop(); +################### +# Update Function # +################### + +var update_pneumatic = func { + master_pneu(); } -}); \ No newline at end of file + +var pneu_timer = maketimer(0.5, update_pneumatic); diff --git a/Nasal/systems.nas b/Nasal/systems.nas index 3f2625dc..709a1857 100644 --- a/Nasal/systems.nas +++ b/Nasal/systems.nas @@ -148,13 +148,9 @@ var triggerDoor = func(door, doorName, doorDesc) setlistener("/sim/signals/fdm-initialized", func { systems.elec_init(); systems.adirs_init(); - systems.lgciu_init(); systems.pneumatics_init(); itaf.ap_init(); var autopilot = gui.Dialog.new("sim/gui/dialogs/autopilot/dialog", "Aircraft/A320Family/Systems/autopilot-dlg.xml"); - setprop("/controls/engines/thrust-limit", "TOGA"); - setprop("/controls/engines/epr-limit", 1.301); - setprop("/controls/engines/n1-limit", 97.8); setprop("/it-autoflight/input/fd1", 1); setprop("/it-autoflight/input/fd2", 1); }); diff --git a/Nasal/thrust.nas b/Nasal/thrust.nas index 11cf0a4f..c8751079 100644 --- a/Nasal/thrust.nas +++ b/Nasal/thrust.nas @@ -4,6 +4,9 @@ # V1.9.1 setlistener("/sim/signals/fdm-initialized", func { + setprop("/controls/engines/thrust-limit", "TOGA"); + setprop("/controls/engines/epr-limit", 1.301); + setprop("/controls/engines/n1-limit", 97.8); setprop("/systems/thrust/state1", "IDLE"); setprop("/systems/thrust/state2", "IDLE"); setprop("/systems/thrust/lvrclb", "0");