From 99d9933ea202d07039df1f4446060e56d9b22cc0 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Sat, 10 Jun 2017 09:53:57 -0400 Subject: [PATCH] A3XX: Bugfix to Overhead, Pneumatic, Electrical --- A320-main.xml | 4 +- Models/Instruments/OHpanel/OHpanel.xml | 38 ++++++++++--- Nasal/electrical.nas | 8 +-- Nasal/hydraulics.nas | 7 ++- Nasal/pneumatics.nas | 12 ++-- Systems/libraries.xml | 79 +++++++++++++------------- 6 files changed, 85 insertions(+), 63 deletions(-) diff --git a/A320-main.xml b/A320-main.xml index 4ce7b8e9..3852b321 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -443,7 +443,7 @@ 0 - true + 0 0 0 @@ -460,7 +460,7 @@ 0.0 0.8 0 - 0 + 0 diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml index 30309a75..0bc20fb7 100644 --- a/Models/Instruments/OHpanel/OHpanel.xml +++ b/Models/Instruments/OHpanel/OHpanel.xml @@ -13,10 +13,19 @@ ACPack1Btn2O ACPack2Btn1F ACPack2Btn2O + APUBleedBtn1F + APUBleedBtn2O + APUGenBtn1F + APUGenBtn2O + APUMasterBtn1F + APUMasterBtn2O + APUStartBtn1A + APUStartBtn2O BatteryBtn11F BatteryBtn12O BatteryBtn21F BatteryBtn22O + ExtPwrBtn2O Gen1Btn1F Gen1Btn2O Gen2Btn1F @@ -47,14 +56,6 @@ select ACESSFeedBtn1F ACESSFeedBtn2O - APUBleedBtn1F - APUBleedBtn2O - APUGenBtn1F - APUGenBtn2O - APUMasterBtn1F - APUMasterBtn2O - APUStartBtn1A - APUStartBtn2O ADR1Btn1F ADR1Btn2O ADR2Btn1F @@ -72,7 +73,6 @@ Eng1BleedBtn2O Eng2BleedBtn1F Eng2BleedBtn2O - ExtPwrBtn2O FuelModeBtn1F FuelModeBtn2O FuelXfeedBtn2O @@ -2354,6 +2354,16 @@ /systems/failures/pack1 1 + + + /controls/pneumatic/switches/pack1 + 1 + + + /systems/pneumatic/pack1 + 5 + + /controls/switches/annun-test 1 @@ -2628,6 +2638,16 @@ /systems/failures/pack2 1 + + + /controls/pneumatic/switches/pack2 + 1 + + + /systems/pneumatic/pack2 + 5 + + /controls/switches/annun-test 1 diff --git a/Nasal/electrical.nas b/Nasal/electrical.nas index 740bd3e7..dd7c1bfa 100644 --- a/Nasal/electrical.nas +++ b/Nasal/electrical.nas @@ -13,13 +13,13 @@ var ac_hz_std = 400; var elec_init = func { setprop("/controls/switches/annun-test", 0); - setprop("/controls/electrical/switches/galley", 0); + setprop("/controls/electrical/switches/galley", 1); setprop("/controls/electrical/switches/idg1", 0); setprop("/controls/electrical/switches/idg2", 0); - setprop("/controls/electrical/switches/gen1", 0); - setprop("/controls/electrical/switches/gen2", 0); + setprop("/controls/electrical/switches/gen1", 1); + setprop("/controls/electrical/switches/gen2", 1); setprop("/controls/electrical/switches/emer-gen", 0); - setprop("/controls/electrical/switches/gen-apu", 0); + setprop("/controls/electrical/switches/gen-apu", 1); setprop("/controls/electrical/switches/gen-ext", 0); setprop("/controls/electrical/switches/apu-ext-crosstie", 1); setprop("/controls/electrical/switches/ac-ess-feed", 1); diff --git a/Nasal/hydraulics.nas b/Nasal/hydraulics.nas index 45ad9376..5968e386 100644 --- a/Nasal/hydraulics.nas +++ b/Nasal/hydraulics.nas @@ -6,9 +6,9 @@ ############# 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/eng1-pump", 1); + setprop("/controls/hydraulic/eng2-pump", 1); + setprop("/controls/hydraulic/elec-pump-blue", 1); setprop("/controls/hydraulic/elec-pump-yellow", 0); setprop("/controls/hydraulic/ptu", 1); setprop("/controls/hydraulic/rat-man", 0); @@ -18,6 +18,7 @@ var hyd_init = func { setprop("/systems/hydraulic/blue-psi", 0); setprop("/systems/hydraulic/green-psi", 0); setprop("/systems/hydraulic/yellow-psi", 0); + setprop("/controls/gear/brake-parking", 0); hyd_timer.start(); } diff --git a/Nasal/pneumatics.nas b/Nasal/pneumatics.nas index a1e1f11a..38e1a386 100644 --- a/Nasal/pneumatics.nas +++ b/Nasal/pneumatics.nas @@ -6,13 +6,13 @@ ############# var pneu_init = func { - setprop("/controls/pneumatic/switches/bleed1", 0); - setprop("/controls/pneumatic/switches/bleed2", 0); + setprop("/controls/pneumatic/switches/bleed1", 1); + setprop("/controls/pneumatic/switches/bleed2", 1); setprop("/controls/pneumatic/switches/bleedapu", 0); setprop("/controls/pneumatic/switches/groundair", 0); - setprop("/controls/pneumatic/switches/pack1", 0); - setprop("/controls/pneumatic/switches/pack2", 0); - setprop("/controls/pneumatic/switches/hot-air", 0); + setprop("/controls/pneumatic/switches/pack1", 1); + setprop("/controls/pneumatic/switches/pack2", 1); + setprop("/controls/pneumatic/switches/hot-air", 1); setprop("/controls/pneumatic/switches/ram-air", 0); setprop("/controls/pneumatic/switches/pack-flo", 9); # LO: 7, NORM: 9, HI: 11. setprop("/controls/pneumatic/switches/xbleed", 1); # SHUT: 0, AUTO: 1, OPEN: 2. # I will simulate later, once I get the knob animated. -JD @@ -156,7 +156,7 @@ var master_pneu = func { setprop("/systems/pneumatic/pack1", 0); } - if (pack2_sw == 1 and (bleed2 >= 20 or bleedapu >= 20 or ground >= 20) and eng1_starter == 0 and eng2_starter == 0 and !pack2_fail) { + if (pack2_sw == 1 and (bleed2 >= 20 or bleedapu >= 20) and eng1_starter == 0 and eng2_starter == 0 and !pack2_fail) { setprop("/systems/pneumatic/pack2", pack_flo_sw); } else { setprop("/systems/pneumatic/pack2", 0); diff --git a/Systems/libraries.xml b/Systems/libraries.xml index da8c1509..97e2b04a 100644 --- a/Systems/libraries.xml +++ b/Systems/libraries.xml @@ -209,16 +209,16 @@ 0.1 - +
/instrumentation/altimeter/indicated-altitude-ft - 0 0 + 0 0 1000 500 - 5000 1100 - 20000 5200 - 30000 6700 - 30000 7900 - 40500 8000 -
+ 50001100 + 200005200 + 300006700 + 300007900 + 405008000 + /systems/pressurization/targetalt @@ -233,14 +233,14 @@ /systems/pressurization/cabinalt-norm - -1000 16.5 - 0 14.7 + -1000 16.5 + 0 14.7 1000 14.6 5000 14.4 - 20000 12.1 - 30000 11.4 - 30000 11.0 - 40500 10.9 + 20000 12.1 + 30000 11.4 + 30000 11.0 + 40500 10.9
 @@ -256,8 +256,8 @@ /instrumentation/altimeter/indicated-altitude-ft - -1000 16.5 - 0 14.7 + -1000 16.5 + 0 14.7 1000 14.2 2000 13.6 3000 13.2 @@ -267,29 +267,30 @@ 7000 11.3 8000 10.9 9000 10.5 - 10000 10.1 - 11000 9.7 - 12000 9.3 - 13000 9 - 14000 8.6 - 15000 8.3 - 16000 8.0 - 17000 7.6 - 18000 7.3 - 19000 7.0 - 20000 6.8 - 22000 6.2 - 24000 5.7 - 26000 5.2 - 28000 4.7 - 30000 4.4 - 32000 4.0 - 34000 3.6 - 36000 3.3 - 38000 3.0 - 39000 2.9 - 40000 2.7 - 41000 2.6 + 10000 10.1 + 11000 9.7 + 12000 9.3 + 13000 9.0 + 14000 8.6 + 15000 8.3 + 16000 8.0 + 17000 7.6 + 18000 7.3 + 19000 7.0 + 20000 6.8 + 22000 6.2 + 24000 5.7 + 26000 5.2 + 28000 4.7 + 30000 4.4 + 32000 4.0 + 34000 3.6 + 36000 3.3 + 38000 3.0 + 39000 2.9 + 40000 2.7 + 41000 2.6 + 42000 2.5