diff --git a/Models/Instruments/ECAM/page-elec.xml b/Models/Instruments/ECAM/page-elec.xml index 3aee141a..9085bd50 100644 --- a/Models/Instruments/ECAM/page-elec.xml +++ b/Models/Instruments/ECAM/page-elec.xml @@ -712,7 +712,6 @@ - text TR1-volts @@ -830,6 +829,56 @@ + + gen1off + true + 2 + 10 + + Aircraft/A320Family/Models/Instruments/ECAM/res/elec-gen-green-line.png + + + + y-shift + -16 + + + x-shift + -100 + + + + + /controls/electrical/switches/gen1 + 1 + + + + + gen2off + true + 2 + 10 + + Aircraft/A320Family/Models/Instruments/ECAM/res/elec-gen-green-line.png + + + + y-shift + -16 + + + x-shift + 101 + + + + + /controls/electrical/switches/gen2 + 1 + + + diff --git a/Models/Instruments/ECAM/res/elec-gen-green-line.png b/Models/Instruments/ECAM/res/elec-gen-green-line.png new file mode 100644 index 00000000..72b755ef Binary files /dev/null and b/Models/Instruments/ECAM/res/elec-gen-green-line.png differ diff --git a/Models/Instruments/ECAM/res/page-elec.png b/Models/Instruments/ECAM/res/page-elec.png index 2da68802..c74e1892 100644 Binary files a/Models/Instruments/ECAM/res/page-elec.png and b/Models/Instruments/ECAM/res/page-elec.png differ diff --git a/Nasal/electrical.nas b/Nasal/electrical.nas index bb3c514b..6f1752be 100644 --- a/Nasal/electrical.nas +++ b/Nasal/electrical.nas @@ -111,6 +111,7 @@ var master_elec = func { var dc_ess = getprop("/systems/electrical/bus/dc-ess"); var gen_1_volts = getprop("/systems/electrical/extra/gen1-volts"); var gen_2_volts = getprop("/systems/electrical/extra/gen1-volts"); + var galley_shed = getprop("/systems/electrical/extra/galleyshed"); @@ -235,15 +236,22 @@ var master_elec = func { } if (ac_ess >= 100) { - if (galley_sw == 1) { + if (galley_sw == 1 and !galley_shed) { setprop("/systems/electrical/bus/galley", ac_volt_std); - } else if (galley_sw) { + } else if (galley_sw or galley_shed) { setprop("/systems/electrical/bus/galley", 0); } } else { setprop("/systems/electrical/bus/galley", 0); } + # Galley Shedding Logic + if (!gen_apu_sw and !gen_ext_sw and (!gen1_sw or !gen2_sw)) { # this is when one of the generators is not working or turned off as it reads 0 V + setprop("/systems/electrical/extra/galleyshed", 1); + } else { + setprop("/systems/electrical/extra/galleyshed", 0); + } + # Battery Amps if (battery1_sw) { setprop("/systems/electrical/battery1-amps", dc_amps_std); diff --git a/Nasal/engines.nas b/Nasal/engines.nas index 6e2e133b..81404421 100644 --- a/Nasal/engines.nas +++ b/Nasal/engines.nas @@ -21,7 +21,8 @@ var n1_wm = 0; var n2_wm = 0; var apu_max = 99.8; var apu_egt_max = 513; -var spinup_time = 15; +var spinup_time = 49; # Measured from youtube video +# For future, APU FLAP also takes 15 extra seconds to open before startup var start_time = 10; var egt_lightup_time = 2; var egt_lightdn_time = 8; @@ -157,6 +158,7 @@ setlistener("/controls/APU/start", func { } }); + ############ # Stop APU # ############