fly/A320-family
1
0
Fork 0
Code Activity

Merge branch 'dev' into 3D

Browse source
This commit is contained in:
Jonathan Redpath 2021-12-30 21:49:30 +00:00
commit 8b5355df23
12 changed files with 678 additions and 578 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

316
Models/FlightDeck/a320.flightdeck.xml
View file

@ -484,14 +484,6 @@
</emission> </emission>
</animation> </animation>
<animation>
<type>select</type>
<object-name>engine_fault_1</object-name>
<condition>
<property>systems/unused/unused-ped</property>
</condition>
</animation>
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>engine_fire_1</object-name> <object-name>engine_fire_1</object-name>
@ -512,15 +504,7 @@
<blue>1.0</blue> <blue>1.0</blue>
</emission> </emission>
</animation> </animation>
<animation>
<type>select</type>
<object-name>engine_fault_2</object-name>
<condition>
<property>systems/unused/unused-ped</property>
</condition>
</animation>
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>engine_fire_2</object-name> <object-name>engine_fire_2</object-name>
@ -1005,13 +989,14 @@
</or> </or>
</condition> </condition>
</animation> </animation>
<!-- Button lights 115 mA, 5 VAC on BRT setting -->
<!-- Sourced from 4 transformers -->
<!-- No button lights without power! -->
<!-- 31LP AC ESS SHED 801XP 5VAC transformer -->
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>abs_low_on</object-name>
<object-name>abs_med_on</object-name>
<object-name>abs_max_on</object-name>
<object-name>alt-text</object-name> <object-name>alt-text</object-name>
<object-name>alt-text-test</object-name> <object-name>alt-text-test</object-name>
<object-name>ap1_led</object-name> <object-name>ap1_led</object-name>
@ -1019,9 +1004,9 @@
<object-name>appr_led</object-name> <object-name>appr_led</object-name>
<object-name>arpt_led</object-name> <object-name>arpt_led</object-name>
<object-name>arpt_led.001</object-name> <object-name>arpt_led.001</object-name>
<object-name>a-thr_led</object-name>
<object-name>atc-code</object-name> <object-name>atc-code</object-name>
<object-name>atc-test</object-name> <object-name>atc-test</object-name>
<object-name>a-thr_led</object-name>
<object-name>audio_att_led</object-name> <object-name>audio_att_led</object-name>
<object-name>audio_att_sgn</object-name> <object-name>audio_att_sgn</object-name>
<object-name>audio_call_hf2_led</object-name> <object-name>audio_call_hf2_led</object-name>
@ -1033,19 +1018,169 @@
<object-name>audio_hf2_led</object-name> <object-name>audio_hf2_led</object-name>
<object-name>audio_mech_led</object-name> <object-name>audio_mech_led</object-name>
<object-name>audio_mech_sgn</object-name> <object-name>audio_mech_sgn</object-name>
<object-name>audio_pa_led</object-name>
<object-name>audio_voice_led</object-name> <object-name>audio_voice_led</object-name>
<object-name>audio_vhf1_led</object-name> <object-name>audio_vhf1_led</object-name>
<object-name>audio_vhf2_led</object-name> <object-name>audio_vhf2_led</object-name>
<object-name>audio_vhf3_led</object-name> <object-name>audio_vhf3_led</object-name>
<object-name>autoland_light_on</object-name>
<object-name>brk_fan_on</object-name>
<object-name>brk_hot_on</object-name>
<!-- <object-name>clock_glare</object-name>-->
<object-name>cstr_led</object-name> <object-name>cstr_led</object-name>
<object-name>cstr_led.001</object-name> <object-name>cstr_led.001</object-name>
<object-name>exped_led</object-name>
<object-name>fcu_screen</object-name>
<object-name>fd1_led</object-name>
<object-name>fd2_led</object-name>
<object-name>fpa-text</object-name>
<object-name>hdg-text</object-name>
<object-name>hdg-text-test</object-name>
<object-name>ils_led</object-name>
<object-name>ils2_led</object-name>
<object-name>loc_led</object-name>
<object-name>mach-text</object-name>
<object-name>ndb_led</object-name>
<object-name>ndb_led.001</object-name>
<object-name>qnh-hpa</object-name>
<object-name>qnh-inhg</object-name>
<object-name>qnh-std</object-name>
<object-name>qnh-test</object-name>
<object-name>radio_adf_led</object-name>
<object-name>radio_am_led</object-name>
<object-name>radio_bfo_led</object-name>
<object-name>radio_hf1_led</object-name>
<object-name>radio_hf2_led</object-name>
<object-name>radio_ls_led</object-name>
<object-name>radio_nav_led</object-name>
<object-name>radio_opt_led</object-name>
<object-name>radio_vhf1_led</object-name>
<object-name>radio_vhf2_led</object-name>
<object-name>radio_vhf3_led</object-name>
<object-name>radio_vor_led</object-name>
<object-name>spd-text</object-name>
<object-name>spd-text-test</object-name>
<object-name>vord_led</object-name>
<object-name>vord_led.001</object-name>
<object-name>vs-text</object-name>
<object-name>vs-text-last-2-digits</object-name>
<object-name>vs-text-test</object-name>
<object-name>wpt_led</object-name>
<object-name>wpt_led.001</object-name>
<object-name>prio_capt.arrow</object-name>
<object-name>prio_capt.capt</object-name>
<object-name>prio_fo.arrow</object-name>
<object-name>prio_fo_fo</object-name>
<condition>
<or>
<greater-than-equals>
<property>systems/electrical/bus/ac-si-bus</property>
<value>110</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/ac-ess-shed</property>
<value>110</value>
</greater-than-equals>
</or>
</condition>
</animation>
<!-- Special for master warning -->
<animation>
<type>select</type>
<object-name>autoland_light_on</object-name>
<object-name>master_caution_on</object-name>
<object-name>master_warning_on</object-name>
<condition>
<or>
<greater-than-equals>
<property>systems/electrical/bus/ac-si-bus</property>
<value>110</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/ac-ess-shed</property>
<value>110</value>
</greater-than-equals>
<greater-than>
<property>/systems/electrical/bus/ac-2</property>
<value>110</value>
</greater-than>
</or>
</condition>
</animation>
<!-- 35LP AC ESS SHED 801XP 5VAC transformer
BACKUP 901XP STAT INV
-->
<animation>
<type>select</type>
<object-name>engine_fire_1</object-name>
<object-name>engine_fire_2</object-name>
<object-name>gear_lever_down_arrow</object-name>
<object-name>lgear_down</object-name>
<object-name>lgear_unlk</object-name>
<object-name>ngear_down</object-name>
<object-name>ngear_unlk</object-name>
<object-name>rgear_down</object-name>
<object-name>rgear_unlk</object-name>
<condition>
<or>
<greater-than-equals>
<property>systems/electrical/bus/ac-si-bus</property>
<value>110</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/ac-ess-shed</property>
<value>110</value>
</greater-than-equals>
</or>
</condition>
</animation>
<!-- 36LP AC 2 202XP 5VAC transformer -->
<!-- ATC MSG (dual power with 37LP?) -->
<animation>
<type>select</type>
<object-name>brk_fan_on</object-name>
<object-name>brk_hot_on</object-name>
<object-name>CockpitDoorFault</object-name>
<object-name>CockpitDoorOpen</object-name>
<object-name>engine_fault_1</object-name>
<object-name>engine_fault_2</object-name>
<object-name>prio_fo.arrow</object-name>
<object-name>prio_fo_fo</object-name>
<condition>
<greater-than>
<property>/systems/electrical/bus/ac-2</property>
<value>110</value>
</greater-than>
</condition>
</animation>
<!-- 37LP AC 1 103XP 5VAC transformer -->
<!-- ATC MSG, GPWS annunciator -->
<animation>
<type>select</type>
<object-name>abs_low_on</object-name>
<object-name>abs_med_on</object-name>
<object-name>abs_max_on</object-name>
<object-name>dec_low_on</object-name> <object-name>dec_low_on</object-name>
<object-name>dec_med_on</object-name> <object-name>dec_med_on</object-name>
<object-name>dec_max_on</object-name> <object-name>dec_max_on</object-name>
<object-name>prio_capt.arrow</object-name>
<object-name>prio_capt.arrow.001</object-name>
<object-name>prio_capt.capt</object-name>
<object-name>prio_capt.capt.001</object-name>
<object-name>radio_sel_led</object-name>
<object-name>terr_on_nd_on_l</object-name>
<object-name>terr_on_nd_on_r</object-name>
<condition>
<greater-than>
<property>/systems/electrical/bus/ac-1</property>
<value>110</value>
</greater-than>
</condition>
</animation>
<!-- Direct DC power from DC2 206PP to ECP LEDs and rudder trim indicator -->
<animation>
<type>select</type>
<object-name>ecam_apu_led</object-name> <object-name>ecam_apu_led</object-name>
<object-name>ecam_bleed_led</object-name> <object-name>ecam_bleed_led</object-name>
<object-name>ecam_cond_led</object-name> <object-name>ecam_cond_led</object-name>
@ -1062,70 +1197,6 @@
<object-name>ecam_press_led</object-name> <object-name>ecam_press_led</object-name>
<object-name>ecam_sts_led</object-name> <object-name>ecam_sts_led</object-name>
<object-name>ecam_wheel_led</object-name> <object-name>ecam_wheel_led</object-name>
<object-name>exped_led</object-name>
<object-name>fcu_screen</object-name>
<object-name>fd1_led</object-name>
<object-name>fd2_led</object-name>
<object-name>fpa-text</object-name>
<object-name>hdg-text</object-name>
<object-name>hdg-text-test</object-name>
<object-name>ils_led</object-name>
<object-name>ils2_led</object-name>
<object-name>lgear_down</object-name>
<object-name>lgear_unlk</object-name>
<object-name>loc_led</object-name>
<object-name>mach-text</object-name>
<object-name>master_caution_on</object-name>
<object-name>master_warning_on</object-name>
<object-name>ndb_led</object-name>
<object-name>ndb_led.001</object-name>
<object-name>ngear_down</object-name>
<object-name>ngear_unlk</object-name>
<object-name>qnh-hpa</object-name>
<object-name>qnh-inhg</object-name>
<object-name>qnh-std</object-name>
<object-name>qnh-test</object-name>
<object-name>radio_adf_led</object-name>
<object-name>radio_am_led</object-name>
<object-name>radio_bfo_led</object-name>
<object-name>radio_hf1_led</object-name>
<object-name>radio_hf2_led</object-name>
<object-name>radio_ls_led</object-name>
<object-name>radio_nav_led</object-name>
<object-name>radio_opt_led</object-name>
<object-name>radio_sel_led</object-name>
<object-name>radio_vhf1_led</object-name>
<object-name>radio_vhf2_led</object-name>
<object-name>radio_vhf3_led</object-name>
<object-name>radio_vor_led</object-name>
<object-name>rgear_down</object-name>
<object-name>rgear_unlk</object-name>
<object-name>spd-text</object-name>
<object-name>spd-text-test</object-name>
<object-name>terr_on_nd_label</object-name>
<object-name>terr_on_nd_on_l</object-name>
<object-name>terr_on_nd_on_r</object-name>
<object-name>vord_led</object-name>
<object-name>vord_led.001</object-name>
<object-name>vs-text</object-name>
<object-name>vs-text-last-2-digits</object-name>
<object-name>vs-text-test</object-name>
<object-name>wpt_led</object-name>
<object-name>wpt_led.001</object-name>
<object-name>prio_capt.arrow</object-name>
<object-name>prio_capt.capt</object-name>
<object-name>prio_fo.arrow</object-name>
<object-name>prio_fo_fo</object-name>
<condition>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>rudder-trim-letter</object-name> <object-name>rudder-trim-letter</object-name>
<object-name>rudder-trim</object-name> <object-name>rudder-trim</object-name>
<condition> <condition>
@ -1153,7 +1224,6 @@
<!-- Remove from this animation once you simulate --> <!-- Remove from this animation once you simulate -->
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>atc-test</object-name>
<object-name>audio_att_sgn</object-name> <object-name>audio_att_sgn</object-name>
<object-name>audio_call_hf2_led</object-name> <object-name>audio_call_hf2_led</object-name>
<object-name>audio_call_hf1_led</object-name> <object-name>audio_call_hf1_led</object-name>
@ -6070,28 +6140,16 @@
<type>select</type> <type>select</type>
<object-name>gear_lever_down_arrow</object-name> <object-name>gear_lever_down_arrow</object-name>
<condition> <condition>
<and> <or>
<or> <equals>
<greater-than> <property>controls/switches/annun-test</property>
<property>systems/electrical/bus/ac-ess</property> <value>1</value>
<value>110</value> </equals>
</greater-than> <equals>
<greater-than> <property>ECAM/warnings/landing-gear-warning-light</property>
<property>systems/electrical/bus/ac-2</property> <value>1</value>
<value>110</value> </equals>
</greater-than> </or>
</or>
<or>
<equals>
<property>controls/switches/annun-test</property>
<value>1</value>
</equals>
<equals>
<property>ECAM/warnings/landing-gear-warning-light</property>
<value>1</value>
</equals>
</or>
</and>
</condition> </condition>
</animation> </animation>
@ -6099,28 +6157,16 @@
<type>material</type> <type>material</type>
<object-name>gear_lever_down_arrow</object-name> <object-name>gear_lever_down_arrow</object-name>
<condition> <condition>
<and> <or>
<or> <equals>
<greater-than> <property>controls/switches/annun-test</property>
<property>systems/electrical/bus/ac-ess</property> <value>1</value>
<value>110</value> </equals>
</greater-than> <equals>
<greater-than> <property>ECAM/warnings/landing-gear-warning-light</property>
<property>systems/electrical/bus/ac-2</property> <value>1</value>
<value>110</value> </equals>
</greater-than> </or>
</or>
<or>
<equals>
<property>controls/switches/annun-test</property>
<value>1</value>
</equals>
<equals>
<property>ECAM/warnings/landing-gear-warning-light</property>
<value>1</value>
</equals>
</or>
</and>
</condition> </condition>
<emission> <emission>
<red>1.00</red> <red>1.00</red>

6
Models/Instruments/MCDU/MCDU.nas
View file

@ -2456,9 +2456,9 @@ var canvas_MCDU_base = {
} }
me["Simple_L1"].setText(sprintf("%s", engType.getValue())); me["Simple_L1"].setText(sprintf("%s", engType.getValue()));
me["Simple_L2"].setText(sprintf("%s", " " ~ database1.getValue())); me["Simple_L2"].setText(" " ~ fmgc.navDataBase.currentDate);
me["Simple_L3"].setText(sprintf("%s", " " ~ database2.getValue())); me["Simple_L3"].setText(" " ~ fmgc.navDataBase.standbyDate);
me["Simple_R2"].setText(sprintf("%s", databaseCode.getValue() ~ " ")); me["Simple_R2"].setText(fmgc.navDataBase.currentCode);
if (fmgc.WaypointDatabase.getCount() >= 1) { if (fmgc.WaypointDatabase.getCount() >= 1) {
me["Simple_R4"].show(); me["Simple_R4"].show();

470
Models/Instruments/OHpanel/OHpanel.xml
View file

@ -8,57 +8,70 @@
<!-- ANIMATIONS --> <!-- ANIMATIONS -->
<!-- No button lights without power! --> <!-- Button lights 115 mA, 5 VAC on BRT setting -->
<!-- 31LP AC ESS SHED 801XP 5VAC transformer -->
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>ACPack1Btn1F</object-name> <object-name>AftCargoIsoBtn1F</object-name>
<object-name>ACPack1Btn2O</object-name> <object-name>AftCargoIsoBtn2O</object-name>
<object-name>ACPack2Btn1F</object-name> <object-name>APUBleedBtn1F</object-name>
<object-name>ACPack2Btn2O</object-name> <object-name>APUBleedBtn2O</object-name>
<object-name>ADR1Btn1F</object-name> <object-name>BlueElecPump1F</object-name>
<object-name>ADR1Btn2O</object-name> <object-name>BlueElecPump2O</object-name>
<object-name>ADR2Btn1F</object-name> <object-name>CargoHotAirBtn1F</object-name>
<object-name>ADR2Btn2O</object-name> <object-name>CargoHotAirBtn2O</object-name>
<object-name>ADR3Btn1F</object-name> <object-name>CrewOxyBtn2O</object-name>
<object-name>ADR3Btn2O</object-name> <object-name>ExtPwrBtn1A</object-name>
<object-name>BatteryBtn11F</object-name> <object-name>GalleyPwrBtn1F</object-name>
<object-name>BatteryBtn21F</object-name> <object-name>GalleyPwrBtn2O</object-name>
<object-name>BusTieBtn2O</object-name> <object-name>Gen1LineBtn1S</object-name>
<object-name>DitchBtn2O</object-name> <object-name>Gen1LineBtn2O</object-name>
<object-name>EmerExtLtBtn2O</object-name> <object-name>FuelXfeedBtn1O</object-name>
<object-name>Eng1AntiIceBtn1F</object-name> <object-name>FuelXfeedBtn2O</object-name>
<object-name>Eng1AntiIceBtn2O</object-name> <object-name>LFuelTank1Btn1F</object-name>
<object-name>Eng2AntiIceBtn1F</object-name> <object-name>LFuelTank1Btn2O</object-name>
<object-name>Eng2AntiIceBtn2O</object-name> <object-name>PassOxyInd1S</object-name>
<object-name>ExtPwrBtn2O</object-name>
<object-name>IR1Btn1F</object-name>
<object-name>IR1Btn2O</object-name>
<object-name>IR2Btn1F</object-name>
<object-name>IR2Btn2O</object-name>
<object-name>IR3Btn1F</object-name>
<object-name>IR3Btn2O</object-name>
<object-name>RamAirBtn2O</object-name> <object-name>RamAirBtn2O</object-name>
<object-name>RFuelTank1Btn1F</object-name>
<object-name>RFuelTank1Btn2O</object-name>
<object-name>WingAntiIceBtn1F</object-name> <object-name>WingAntiIceBtn1F</object-name>
<object-name>WingAntiIceBtn2O</object-name> <object-name>WingAntiIceBtn2O</object-name>
<object-name>VentBlowBtn1F</object-name>
<condition> <condition>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/ac-ess</property> <property>systems/electrical/bus/ac-ess-shed</property>
<value>5</value> <value>110</value>
</greater-than-equals> </greater-than-equals>
</condition> </condition>
</animation> </animation>
<!-- 35LP AC ESS SHED 801XP 5VAC transformer
BACKUP 901XP STAT INV
-->
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>ACPack1Btn1F</object-name>
<object-name>ACPack1Btn2O</object-name>
<object-name>APUFireAgtBtn1S</object-name>
<object-name>APUFireAgtBtn2D</object-name>
<object-name>APUGenBtn1F</object-name> <object-name>APUGenBtn1F</object-name>
<object-name>APUGenBtn2O</object-name> <object-name>APUGenBtn2O</object-name>
<object-name>APUMasterBtn1F</object-name> <object-name>APUMasterBtn1F</object-name>
<object-name>APUMasterBtn2O</object-name> <object-name>APUMasterBtn2O</object-name>
<object-name>APUStartBtn1A</object-name> <object-name>APUStartBtn1A</object-name>
<object-name>APUStartBtn2O</object-name> <object-name>APUStartBtn2O</object-name>
<object-name>APUFireAgtBtn1S</object-name> <object-name>BatteryBtn11F</object-name>
<object-name>APUFireAgtBtn2D</object-name> <object-name>BatteryBtn21F</object-name>
<object-name>BatteryBtn12O</object-name>
<object-name>BatteryBtn22O</object-name>
<object-name>BusTieBtn2O</object-name>
<object-name>CabinPressModeBtn1F</object-name>
<object-name>CabinPressModeBtn2M</object-name>
<object-name>DitchBtn2O</object-name>
<object-name>ELAC1Btn1F</object-name>
<object-name>ELAC1Btn2O</object-name>
<object-name>EmerCallBtn1C</object-name>
<object-name>EmerCallBtn2O</object-name>
<object-name>EmerExtLtBtn2O</object-name>
<object-name>Eng1FireAgt1Btn1S</object-name> <object-name>Eng1FireAgt1Btn1S</object-name>
<object-name>Eng1FireAgt1Btn2D</object-name> <object-name>Eng1FireAgt1Btn2D</object-name>
<object-name>Eng2FireAgt1Btn1S</object-name> <object-name>Eng2FireAgt1Btn1S</object-name>
@ -67,71 +80,100 @@
<object-name>Eng1FireAgt2Btn2D</object-name> <object-name>Eng1FireAgt2Btn2D</object-name>
<object-name>Eng2FireAgt2Btn1S</object-name> <object-name>Eng2FireAgt2Btn1S</object-name>
<object-name>Eng2FireAgt2Btn2D</object-name> <object-name>Eng2FireAgt2Btn2D</object-name>
<object-name>ELAC1Btn1F</object-name>
<object-name>ELAC1Btn2O</object-name>
<object-name>FAC1Btn1F</object-name>
<object-name>FAC1Btn2O</object-name>
<object-name>Gen1Btn1F</object-name>
<object-name>Gen1Btn2O</object-name>
<object-name>Gen2Btn1F</object-name>
<object-name>Gen2Btn2O</object-name>
<object-name>SEC1Btn1F</object-name>
<object-name>SEC1Btn2O</object-name>
<condition>
<or>
<greater-than-equals>
<property>systems/electrical/bus/ac-si-bus</property>
<value>5</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/ac-ess</property>
<value>5</value>
</greater-than-equals>
</or>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>ACESSFeedBtn1F</object-name>
<object-name>ACESSFeedBtn2A</object-name>
<object-name>AftCargoIsoBtn1F</object-name>
<object-name>AftCargoIsoBtn2O</object-name>
<object-name>AftCargoSmkBtn1S</object-name>
<object-name>AftCargoSmkBtn2D</object-name>
<object-name>BlueElecPump1F</object-name>
<object-name>BlueElecPump2O</object-name>
<object-name>CabinPressModeBtn1F</object-name>
<object-name>CabinPressModeBtn2M</object-name>
<object-name>CabinFansBtn2O</object-name>
<object-name>CargoHotAirBtn1F</object-name>
<object-name>CargoHotAirBtn2O</object-name>
<object-name>CFuelTank1Btn1F</object-name>
<object-name>CFuelTank1Btn2O</object-name>
<object-name>CFuelTank2Btn1F</object-name>
<object-name>CFuelTank2Btn2O</object-name>
<object-name>CrewOxyBtn2O</object-name>
<object-name>ELAC2Btn1F</object-name>
<object-name>ELAC2Btn2O</object-name>
<object-name>EmerCallBtn1C</object-name>
<object-name>EmerCallBtn2O</object-name>
<object-name>EmerGenInd1F</object-name>
<object-name>Eng1ManStartBtn2O</object-name> <object-name>Eng1ManStartBtn2O</object-name>
<object-name>Eng2ManStartBtn2O</object-name> <object-name>Eng2ManStartBtn2O</object-name>
<object-name>EvacCommandBtn1E</object-name> <object-name>EvacCommandBtn1E</object-name>
<object-name>EvacCommandBtn2O</object-name> <object-name>EvacCommandBtn2O</object-name>
<object-name>FAC1Btn1F</object-name>
<object-name>FAC1Btn2O</object-name>
<object-name>Gen1Btn2O</object-name>
<object-name>Gen2Btn2O</object-name>
<object-name>IDG1Btn1F</object-name>
<object-name>IDG2Btn1F</object-name>
<object-name>SEC1Btn1F</object-name>
<object-name>SEC1Btn2O</object-name>
<object-name>VentBlowBtn1F</object-name>
<object-name>VentBlowBtn2O</object-name>
<object-name>VentExtractBtn1F</object-name>
<object-name>VentExtractBtn2O</object-name>
<condition>
<or>
<greater-than-equals>
<property>systems/electrical/bus/ac-si-bus</property>
<value>110</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/ac-ess-shed</property>
<value>110</value>
</greater-than-equals>
</or>
</condition>
</animation>
<!-- 36LP AC 2 202XP 5VAC transformer -->
<animation>
<type>select</type>
<object-name>ACESSFeedBtn1F</object-name>
<object-name>ACESSFeedBtn2A</object-name>
<object-name>ACPack2Btn1F</object-name>
<object-name>ACPack2Btn2O</object-name>
<object-name>CFuelTank1Btn1F</object-name>
<object-name>CFuelTank1Btn2O</object-name>
<object-name>ELAC2Btn1F</object-name>
<object-name>ELAC2Btn2O</object-name>
<object-name>Eng2AntiIceBtn1F</object-name>
<object-name>Eng2AntiIceBtn2O</object-name>
<object-name>Eng2BleedBtn1F</object-name>
<object-name>Eng2BleedBtn2O</object-name>
<object-name>FAC2Btn1F</object-name> <object-name>FAC2Btn1F</object-name>
<object-name>FAC2Btn2O</object-name> <object-name>FAC2Btn2O</object-name>
<object-name>LFuelTank2Btn1F</object-name>
<object-name>LFuelTank2Btn2O</object-name>
<object-name>PrbWinHeatBtn2O</object-name>
<object-name>PTU1F</object-name>
<object-name>PTU2O</object-name>
<object-name>RFuelTank2Btn1F</object-name>
<object-name>RFuelTank2Btn2O</object-name>
<object-name>SEC2Btn1F</object-name>
<object-name>SEC2Btn2O</object-name>
<object-name>SEC3Btn1F</object-name>
<object-name>SEC3Btn2O</object-name>
<object-name>YellowElecPump1F</object-name>
<object-name>YellowElecPump2O</object-name>
<object-name>YellowEngPump1F</object-name>
<object-name>YellowEngPump2O</object-name>
<condition>
<greater-than>
<property>/systems/electrical/bus/ac-2</property>
<value>110</value>
</greater-than>
</condition>
</animation>
<!-- 37LP AC 1 103XP 5VAC transformer -->
<animation>
<type>select</type>
<object-name>ADR1Btn1F</object-name>
<object-name>ADR1Btn2O</object-name>
<object-name>ADR2Btn1F</object-name>
<object-name>ADR2Btn2O</object-name>
<object-name>ADR3Btn1F</object-name>
<object-name>ADR3Btn2O</object-name>
<object-name>AftCargoSmkBtn1S</object-name>
<object-name>AftCargoSmkBtn2D</object-name>
<object-name>CabinFansBtn2O</object-name>
<object-name>CFuelTank2Btn1F</object-name>
<object-name>CFuelTank2Btn2O</object-name>
<object-name>EmerGenInd1F</object-name>
<object-name>Eng1AntiIceBtn1F</object-name>
<object-name>Eng1AntiIceBtn2O</object-name>
<object-name>Eng1BleedBtn1F</object-name>
<object-name>Eng1BleedBtn2O</object-name>
<object-name>ExtPwrBtn2O</object-name>
<object-name>FuelModeBtn1F</object-name> <object-name>FuelModeBtn1F</object-name>
<object-name>FuelModeBtn2O</object-name> <object-name>FuelModeBtn2O</object-name>
<object-name>FuelXfeedBtn1O</object-name>
<object-name>FuelXfeedBtn2O</object-name>
<object-name>FwdCargoSmkBtn1S</object-name> <object-name>FwdCargoSmkBtn1S</object-name>
<object-name>FwdCargoSmkBtn2D</object-name> <object-name>FwdCargoSmkBtn2D</object-name>
<object-name>GalleyPwrBtn1F</object-name>
<object-name>GalleyPwrBtn2O</object-name>
<object-name>Gen1LineBtn1S</object-name>
<object-name>Gen1LineBtn2O</object-name>
<object-name>GPWSBtn1F</object-name> <object-name>GPWSBtn1F</object-name>
<object-name>GPWSBtn2O</object-name> <object-name>GPWSBtn2O</object-name>
<object-name>GPWSFlpBtn2O</object-name> <object-name>GPWSFlpBtn2O</object-name>
@ -143,60 +185,18 @@
<object-name>GreenEngPump2O</object-name> <object-name>GreenEngPump2O</object-name>
<object-name>HotAirBtn1F</object-name> <object-name>HotAirBtn1F</object-name>
<object-name>HotAirBtn2O</object-name> <object-name>HotAirBtn2O</object-name>
<object-name>IDG1Btn1F</object-name> <object-name>IR1Btn1F</object-name>
<object-name>IDG2Btn1F</object-name> <object-name>IR1Btn2O</object-name>
<object-name>LFuelTank1Btn1F</object-name> <object-name>IR2Btn1F</object-name>
<object-name>LFuelTank1Btn2O</object-name> <object-name>IR2Btn2O</object-name>
<object-name>LFuelTank2Btn1F</object-name> <object-name>IR3Btn1F</object-name>
<object-name>LFuelTank2Btn2O</object-name> <object-name>IR3Btn2O</object-name>
<object-name>PassOxyInd1S</object-name>
<object-name>PrbWinHeatBtn2O</object-name>
<object-name>PTU1F</object-name>
<object-name>PTU2O</object-name>
<object-name>RamAirBtn2O</object-name>
<object-name>RcdrGndCtlBtn2O</object-name> <object-name>RcdrGndCtlBtn2O</object-name>
<object-name>RFuelTank1Btn1F</object-name>
<object-name>RFuelTank1Btn2O</object-name>
<object-name>RFuelTank2Btn1F</object-name>
<object-name>RFuelTank2Btn2O</object-name>
<object-name>SEC2Btn1F</object-name>
<object-name>SEC2Btn2O</object-name>
<object-name>SEC3Btn1F</object-name>
<object-name>SEC3Btn2O</object-name>
<object-name>VentBlowBtn2O</object-name>
<object-name>VentExtractBtn1F</object-name>
<object-name>VentExtractBtn2O</object-name>
<object-name>YellowElecPump1F</object-name>
<object-name>YellowElecPump2O</object-name>
<object-name>YellowEngPump1F</object-name>
<object-name>YellowEngPump2O</object-name>
<condition> <condition>
<greater-than-equals> <greater-than>
<property>systems/electrical/bus/dc-ess</property> <property>/systems/electrical/bus/ac-1</property>
<value>25</value> <value>110</value>
</greater-than-equals> </greater-than>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>Eng1BleedBtn1F</object-name>
<object-name>Eng1BleedBtn2O</object-name>
<object-name>Eng2BleedBtn1F</object-name>
<object-name>Eng2BleedBtn2O</object-name>
<object-name>APUBleedBtn1F</object-name>
<object-name>APUBleedBtn2O</object-name>
<condition>
<or>
<greater-than-equals>
<property>systems/electrical/bus/dc-2</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess-shed</property>
<value>25</value>
</greater-than-equals>
</or>
</condition> </condition>
</animation> </animation>
@ -3048,22 +3048,16 @@
<type>select</type> <type>select</type>
<object-name>BatteryBtn12O</object-name> <object-name>BatteryBtn12O</object-name>
<condition> <condition>
<and> <or>
<or> <equals>
<equals> <property>controls/electrical/switches/bat-1</property>
<property>controls/electrical/switches/bat-1</property> <value>0</value>
<value>0</value> </equals>
</equals> <equals>
<equals> <property>controls/switches/annun-test</property>
<property>controls/switches/annun-test</property> <value>1</value>
<value>1</value> </equals>
</equals> </or>
</or>
<greater-than>
<property>systems/electrical/bus/dc-bat</property>
<value>25</value>
</greater-than>
</and>
</condition> </condition>
</animation> </animation>
@ -3115,22 +3109,16 @@
<type>select</type> <type>select</type>
<object-name>BatteryBtn22O</object-name> <object-name>BatteryBtn22O</object-name>
<condition> <condition>
<and> <or>
<or> <equals>
<equals> <property>controls/electrical/switches/bat-2</property>
<property>controls/electrical/switches/bat-2</property> <value>0</value>
<value>0</value> </equals>
</equals> <equals>
<equals> <property>controls/switches/annun-test</property>
<property>controls/switches/annun-test</property> <value>1</value>
<value>1</value> </equals>
</equals> </or>
</or>
<greater-than>
<property>systems/electrical/bus/dc-bat</property>
<value>25</value>
</greater-than>
</and>
</condition> </condition>
</animation> </animation>
@ -3276,16 +3264,19 @@
<type>select</type> <type>select</type>
<object-name>Gen1Btn1F</object-name> <object-name>Gen1Btn1F</object-name>
<condition> <condition>
<or> <and>
<equals> <or>
<property>systems/electrical/light/gen-1-fault</property> <equals>
<value>1</value> <property>systems/electrical/light/gen-1-fault</property>
</equals> <value>1</value>
<equals> </equals>
<property>controls/switches/annun-test</property> <equals>
<value>1</value> <property>controls/switches/annun-test</property>
</equals> <value>1</value>
</or> </equals>
</or>
<property>/systems/electrical/sources/idg-1/gcu-1-powered</property>
</and>
</condition> </condition>
</animation> </animation>
@ -3520,18 +3511,10 @@
<property>controls/electrical/switches/ground-cart</property> <property>controls/electrical/switches/ground-cart</property>
<value>1</value> <value>1</value>
</equals> </equals>
<and> <equals>
<equals> <property>controls/switches/annun-test</property>
<property>controls/switches/annun-test</property> <value>1</value>
<value>1</value> </equals>
</equals>
<or>
<greater-than-equals>
<property>systems/electrical/bus/ac-ess</property>
<value>110</value>
</greater-than-equals>
</or>
</and>
</or> </or>
</condition> </condition>
</animation> </animation>
@ -3586,16 +3569,19 @@
<type>select</type> <type>select</type>
<object-name>Gen2Btn1F</object-name> <object-name>Gen2Btn1F</object-name>
<condition> <condition>
<or> <and>
<equals> <or>
<property>systems/electrical/light/gen-2-fault</property> <equals>
<value>1</value> <property>systems/electrical/light/gen-2-fault</property>
</equals> <value>1</value>
<equals> </equals>
<property>controls/switches/annun-test</property> <equals>
<value>1</value> <property>controls/switches/annun-test</property>
</equals> <value>1</value>
</or> </equals>
</or>
<property>/systems/electrical/sources/idg-2/gcu-2-powered</property>
</and>
</condition> </condition>
</animation> </animation>
@ -6662,10 +6648,28 @@
<type>material</type> <type>material</type>
<object-name>Eng1FireBtn</object-name> <object-name>Eng1FireBtn</object-name>
<condition> <condition>
<or> <and>
<property>systems/fire/engine1/warning-active</property> <or>
<property>controls/switches/annun-test</property> <property>systems/fire/engine1/warning-active</property>
</or> <property>controls/switches/annun-test</property>
</or>
<or>
<!-- 35LP -->
<greater-than-equals>
<property>systems/electrical/bus/ac-si-bus</property>
<value>110</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/ac-ess-shed</property>
<value>110</value>
</greater-than-equals>
<!-- 37LP -->
<greater-than>
<property>/systems/electrical/bus/ac-1</property>
<value>110</value>
</greater-than>
</or>
</and>
</condition> </condition>
<emission> <emission>
<red>1.0</red> <red>1.0</red>
@ -7009,10 +7013,28 @@
<type>material</type> <type>material</type>
<object-name>APUFireBtn</object-name> <object-name>APUFireBtn</object-name>
<condition> <condition>
<or> <and>
<property>systems/fire/apu/warning-active</property> <or>
<property>controls/switches/annun-test</property> <property>systems/fire/apu/warning-active</property>
</or> <property>controls/switches/annun-test</property>
</or>
<or>
<!-- 35LP -->
<greater-than-equals>
<property>systems/electrical/bus/ac-si-bus</property>
<value>110</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/ac-ess-shed</property>
<value>110</value>
</greater-than-equals>
<!-- 37LP -->
<greater-than>
<property>/systems/electrical/bus/ac-1</property>
<value>110</value>
</greater-than>
</or>
</and>
</condition> </condition>
<emission> <emission>
<red>1.0</red> <red>1.0</red>
@ -7162,10 +7184,28 @@
<type>material</type> <type>material</type>
<object-name>Eng2FireBtn</object-name> <object-name>Eng2FireBtn</object-name>
<condition> <condition>
<or> <and>
<property>systems/fire/engine2/warning-active</property> <or>
<property>controls/switches/annun-test</property> <property>systems/fire/engine2/warning-active</property>
</or> <property>controls/switches/annun-test</property>
</or>
<or>
<!-- 35LP -->
<greater-than-equals>
<property>systems/electrical/bus/ac-si-bus</property>
<value>110</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/ac-ess-shed</property>
<value>110</value>
</greater-than-equals>
<!-- 37LP -->
<greater-than>
<property>/systems/electrical/bus/ac-1</property>
<value>110</value>
</greater-than>
</or>
</and>
</condition> </condition>
<emission> <emission>
<red>1.0</red> <red>1.0</red>

4
Nasal/ECAM/ECAM-logic.nas
View file

@ -3564,13 +3564,13 @@ var messages_right_memo = func {
wing_aice.active = 0; wing_aice.active = 0;
} }
if (systems.PNEU.Switch.apu.getValue() == 1 and pts.APU.rpm.getValue() >= 95) { if (systems.PNEU.Switch.apu.getValue() == 1 and systems.PNEU.Valves.apu.getValue() != 0 and systems.APUController.APU != nil and systems.APUController.APU.signals.available.getBoolValue()) {
apu_bleed.active = 1; apu_bleed.active = 1;
} else { } else {
apu_bleed.active = 0; apu_bleed.active = 0;
} }
if (apu_bleed.active == 0 and pts.APU.rpm.getValue() >= 95) { if (apu_bleed.active == 0 and systems.APUController.APU != nil and systems.APUController.APU.signals.available.getBoolValue()) {
apu_avail.active = 1; apu_avail.active = 1;
} else { } else {
apu_avail.active = 0; apu_avail.active = 0;

93
Nasal/FMGC/FMGC.nas
View file

@ -4,11 +4,6 @@
################## ##################
# Init Functions # # Init Functions #
################## ##################
var database1 = 0;
var database2 = 0;
var code1 = 0;
var code2 = 0;
var gear0 = 0; var gear0 = 0;
var state1 = 0; var state1 = 0;
var state2 = 0; var state2 = 0;
@ -71,14 +66,13 @@ var FMGCinit = func {
FMGCInternal.mngSpdCmd = 157; FMGCInternal.mngSpdCmd = 157;
FMGCInternal.mngKtsMach = 0; FMGCInternal.mngKtsMach = 0;
FMGCInternal.machSwitchover = 0; FMGCInternal.machSwitchover = 0;
setprop("/FMGC/internal/loc-source", "NAV0");
setprop("/FMGC/internal/optalt", 0); setprop("/FMGC/internal/optalt", 0);
setprop("/FMGC/internal/landing-time", -99); FMGCInternal.landingTime = -99;
FMGCInternal.blockFuelTime = -99;
FMGCInternal.fuelPredTime = -99;
FMGCAlignTime[0].setValue(-99); FMGCAlignTime[0].setValue(-99);
FMGCAlignTime[1].setValue(-99); FMGCAlignTime[1].setValue(-99);
FMGCAlignTime[2].setValue(-99); FMGCAlignTime[2].setValue(-99);
setprop("/FMGC/internal/block-fuel-time", -99);
setprop("/FMGC/internal/fuel-pred-time", -99);
masterFMGC.start(); masterFMGC.start();
radios.start(); radios.start();
} }
@ -220,6 +214,10 @@ var FMGCInternal = {
mngSpd: 0, mngSpd: 0,
mngSpdCmd: 0, mngSpdCmd: 0,
landingTime: -99,
blockFuelTime: -99,
fuelPredTime: -99,
# RADNAV # RADNAV
ADF1: { ADF1: {
freqSet: 0, freqSet: 0,
@ -913,18 +911,16 @@ var masterFMGC = maketimer(0.2, func {
############################ ############################
#handle radios, runways, v1/vr/v2 #handle radios, runways, v1/vr/v2
############################ ############################
var airportRadiosPhase = nil;
var updateAirportRadios = func { var updateAirportRadios = func {
airportRadiosPhase = FMGCInternal.phase;
departure_rwy = fmgc.flightPlanController.flightplans[2].departure_runway; departure_rwy = fmgc.flightPlanController.flightplans[2].departure_runway;
destination_rwy = fmgc.flightPlanController.flightplans[2].destination_runway; destination_rwy = fmgc.flightPlanController.flightplans[2].destination_runway;
if (airportRadiosPhase >= 2 and destination_rwy != nil) {
if (FMGCInternal.phase >= 2 and destination_rwy != nil) {
var airport = airportinfo(FMGCInternal.arrApt); var airport = airportinfo(FMGCInternal.arrApt);
setprop("/FMGC/internal/ldg-elev", airport.elevation * M2FT); # eventually should be runway elevation setprop("/FMGC/internal/ldg-elev", airport.elevation * M2FT); # eventually should be runway elevation
magnetic_hdg = geo.normdeg(destination_rwy.heading - getprop("/environment/magnetic-variation-deg")); magnetic_hdg = geo.normdeg(destination_rwy.heading - pts.Environment.magVar.getValue());
runway_ils = destination_rwy.ils_frequency_mhz; runway_ils = destination_rwy.ils_frequency_mhz;
if (runway_ils != nil and !fmgc.FMGCInternal.ILS.freqSet and !fmgc.FMGCInternal.ILS.crsSet) { if (runway_ils != nil and !fmgc.FMGCInternal.ILS.freqSet and !fmgc.FMGCInternal.ILS.crsSet) {
fmgc.FMGCInternal.ILS.freqCalculated = runway_ils; fmgc.FMGCInternal.ILS.freqCalculated = runway_ils;
pts.Instrumentation.Nav.Frequencies.selectedMhz[0].setValue(runway_ils); pts.Instrumentation.Nav.Frequencies.selectedMhz[0].setValue(runway_ils);
@ -935,9 +931,10 @@ var updateAirportRadios = func {
} elsif (!fmgc.FMGCInternal.ILS.crsSet) { } elsif (!fmgc.FMGCInternal.ILS.crsSet) {
pts.Instrumentation.Nav.Radials.selectedDeg[0].setValue(magnetic_hdg); pts.Instrumentation.Nav.Radials.selectedDeg[0].setValue(magnetic_hdg);
} }
} elsif (airportRadiosPhase <= 1 and departure_rwy != nil) { } elsif (FMGCInternal.phase <= 1 and departure_rwy != nil) {
magnetic_hdg = geo.normdeg(departure_rwy.heading - getprop("/environment/magnetic-variation-deg")); magnetic_hdg = geo.normdeg(departure_rwy.heading - pts.Environment.magVar.getValue());
runway_ils = departure_rwy.ils_frequency_mhz; runway_ils = departure_rwy.ils_frequency_mhz;
if (runway_ils != nil and !fmgc.FMGCInternal.ILS.freqSet and !fmgc.FMGCInternal.ILS.crsSet) { if (runway_ils != nil and !fmgc.FMGCInternal.ILS.freqSet and !fmgc.FMGCInternal.ILS.crsSet) {
fmgc.FMGCInternal.ILS.freqCalculated = runway_ils; fmgc.FMGCInternal.ILS.freqCalculated = runway_ils;
pts.Instrumentation.Nav.Frequencies.selectedMhz[0].setValue(runway_ils); pts.Instrumentation.Nav.Frequencies.selectedMhz[0].setValue(runway_ils);
@ -1119,27 +1116,35 @@ var ManagedSPD = maketimer(0.25, func {
} }
}); });
# Nav Database
var navDataBase = {
currentCode: "AB20170101",
currentDate: "01JAN-28JAN",
standbyCode: "AB20170102",
standbyDate: "29JAN-26FEB",
};
var tempStoreCode = nil;
var tempStoreDate = nil;
var switchDatabase = func { var switchDatabase = func {
database1 = getprop("/FMGC/internal/navdatabase"); tempStoreCode = navDataBase.currentCode;
database2 = getprop("/FMGC/internal/navdatabase2"); tempStoreDate = navDataBase.currentDate;
code1 = getprop("/FMGC/internal/navdatabasecode"); navDataBase.currentCode = navDataBase.standbyCode;
code2 = getprop("/FMGC/internal/navdatabasecode2"); navDataBase.currentDate = navDataBase.standbyDate;
setprop("/FMGC/internal/navdatabase", database2); navDataBase.standbyCode = tempStoreCode;
setprop("/FMGC/internal/navdatabase2", database1); navDataBase.standbyDate = tempStoreDate;
setprop("/FMGC/internal/navdatabasecode", code2);
setprop("/FMGC/internal/navdatabasecode2", code1);
} }
# Landing to phase 7 # Landing to phase 7
setlistener("/gear/gear[1]/wow", func() { setlistener("/gear/gear[1]/wow", func(val) {
if (getprop("/gear/gear[1]/wow") == 0 and timer30secLanding.isRunning) { if (val.getValue() == 0 and timer30secLanding.isRunning) {
timer30secLanding.stop(); timer30secLanding.stop();
setprop("/FMGC/internal/landing-time", -99); FMGCInternal.landingTime = -99;
} }
if (pts.Gear.wow[1].getValue() and getprop("/FMGC/internal/landing-time") == -99) { if (val.getValue() and FMGCInternal.landingTime == -99) {
timer30secLanding.start(); timer30secLanding.start();
setprop("/FMGC/internal/landing-time", pts.Sim.Time.elapsedSec.getValue()); FMGCInternal.landingTime = pts.Sim.Time.elapsedSec.getValue();
} }
}, 0, 0); }, 0, 0);
@ -1182,34 +1187,34 @@ setlistener("/systems/navigation/adr/operating-3", func() {
# Calculate Block Fuel # Calculate Block Fuel
setlistener("/FMGC/internal/block-calculating", func() { setlistener("/FMGC/internal/block-calculating", func() {
if (timer3blockFuel.isRunning) { if (timer3blockFuel.isRunning) {
setprop("/FMGC/internal/block-fuel-time", -99); FMGCInternal.blockFuelTime = -99;
timer3blockFuel.start(); timer3blockFuel.start();
setprop("/FMGC/internal/block-fuel-time", pts.Sim.Time.elapsedSec.getValue()); FMGCInternal.blockFuelTime = pts.Sim.Time.elapsedSec.getValue();
} }
if (getprop("/FMGC/internal/block-fuel-time") == -99) { if (FMGCInternal.blockFuelTime == -99) {
timer3blockFuel.start(); timer3blockFuel.start();
setprop("/FMGC/internal/block-fuel-time", pts.Sim.Time.elapsedSec.getValue()); FMGCInternal.blockFuelTime = pts.Sim.Time.elapsedSec.getValue();
} }
}, 0, 0); }, 0, 0);
# Calculate Fuel Prediction # Calculate Fuel Prediction
setlistener("/FMGC/internal/fuel-calculating", func() { setlistener("/FMGC/internal/fuel-calculating", func() {
if (timer5fuelPred.isRunning) { if (timer5fuelPred.isRunning) {
setprop("/FMGC/internal/fuel-pred-time", -99); FMGCInternal.fuelPredTime = -99;
timer5fuelPred.start(); timer5fuelPred.start();
setprop("/FMGC/internal/fuel-pred-time", pts.Sim.Time.elapsedSec.getValue()); FMGCInternal.fuelPredTime = pts.Sim.Time.elapsedSec.getValue();
} }
if (getprop("/FMGC/internal/fuel-pred-time") == -99) { if (FMGCInternal.fuelPredTime == -99) {
timer5fuelPred.start(); timer5fuelPred.start();
setprop("/FMGC/internal/fuel-pred-time", pts.Sim.Time.elapsedSec.getValue()); FMGCInternal.fuelPredTime = pts.Sim.Time.elapsedSec.getValue();
} }
}, 0, 0); }, 0, 0);
# Maketimers # Maketimers
var timer30secLanding = maketimer(1, func() { var timer30secLanding = maketimer(1, func() {
if (pts.Sim.Time.elapsedSec.getValue() > getprop("/FMGC/internal/landing-time") + 30) { if (pts.Sim.Time.elapsedSec.getValue() > FMGCInternal.landingTime + 30) {
FMGCInternal.phase = 7; FMGCInternal.phase = 7;
if (FMGCInternal.costIndexSet) { if (FMGCInternal.costIndexSet) {
@ -1217,7 +1222,7 @@ var timer30secLanding = maketimer(1, func() {
} else { } else {
setprop("/FMGC/internal/last-cost-index", 0); setprop("/FMGC/internal/last-cost-index", 0);
} }
setprop("/FMGC/internal/landing-time", -99); FMGCInternal.landingTime = -99;
timer30secLanding.stop(); timer30secLanding.stop();
} }
}); });
@ -1247,21 +1252,21 @@ var timer48gpsAlign3 = maketimer(1, func() {
}); });
var timer3blockFuel = maketimer(1, func() { var timer3blockFuel = maketimer(1, func() {
if (pts.Sim.Time.elapsedSec.getValue() > getprop("/FMGC/internal/block-fuel-time") + 3) { if (pts.Sim.Time.elapsedSec.getValue() > FMGCInternal.blockFuelTime + 3) {
#updateFuel(); #updateFuel();
fmgc.FMGCInternal.blockCalculating = 0; fmgc.FMGCInternal.blockCalculating = 0;
fmgc.blockCalculating.setValue(0); fmgc.blockCalculating.setValue(0);
setprop("/FMGC/internal/block-fuel-time", -99); FMGCInternal.blockFuelTime = -99;
timer3blockFuel.stop(); timer3blockFuel.stop();
} }
}); });
var timer5fuelPred = maketimer(1, func() { var timer5fuelPred = maketimer(1, func() {
if (pts.Sim.Time.elapsedSec.getValue() > getprop("/FMGC/internal/fuel-pred-time") + 5) { if (pts.Sim.Time.elapsedSec.getValue() > FMGCInternal.fuelPredTime + 5) {
#updateFuel(); #updateFuel();
fmgc.FMGCInternal.fuelCalculating = 0; fmgc.FMGCInternal.fuelCalculating = 0;
fmgc.fuelCalculating.setValue(0); fmgc.fuelCalculating.setValue(0);
setprop("/FMGC/internal/fuel-pred-time", -99); FMGCInternal.fuelPredTime = -99;
timer5fuelPred.stop(); timer5fuelPred.stop();
} }
}); });

4
Nasal/MCDU/MCDU.nas
View file

@ -25,10 +25,6 @@ var MCDU_reset = func(i) {
setprop("/FMGC/keyboard-right", 0); setprop("/FMGC/keyboard-right", 0);
#ACCONFIG #ACCONFIG
setprop("/FMGC/internal/navdatabase", "01JAN-28JAN");
setprop("/FMGC/internal/navdatabase2", "29JAN-26FEB");
setprop("/FMGC/internal/navdatabasecode", "AB20170101");
setprop("/FMGC/internal/navdatabasecode2", "AB20170102");
setprop("/FMGC/print/mcdu/page1/L1auto", 0); setprop("/FMGC/print/mcdu/page1/L1auto", 0);
setprop("/FMGC/print/mcdu/page1/L2auto", 0); setprop("/FMGC/print/mcdu/page1/L2auto", 0);
setprop("/FMGC/print/mcdu/page1/L3auto", 0); setprop("/FMGC/print/mcdu/page1/L3auto", 0);

31
Nasal/Systems/APU.nas
View file

@ -273,24 +273,6 @@ var APU = {
me.autoStop(); me.autoStop();
} }
if (systems.ELEC.Bus.dcBat.getValue() < 25) {
if (!me._powerLost) {
me._powerLost = 1;
settimer(func() {
if (me._powerLost) {
if (me.GenericControls.starter.getValue()) {
me.GenericControls.starter.setValue(0);
}
if (me.state != 0) {
me.autoStop();
}
}
}, 0.2);
}
} else {
me._powerLost = 0;
}
if (systems.ELEC.EmerElec.getValue() == 1 and (systems.ELEC.EmerElec45.getValue() != 1 and systems.ELEC.Source.EmerGen.voltsRelay.getValue() < 110)) { if (systems.ELEC.EmerElec.getValue() == 1 and (systems.ELEC.EmerElec45.getValue() != 1 and systems.ELEC.Source.EmerGen.voltsRelay.getValue() < 110)) {
me.inhibitEMERELEC = 1; me.inhibitEMERELEC = 1;
} else { } else {
@ -316,6 +298,19 @@ var APUController = {
} }
}; };
setlistener("/systems/apu/shutdown-power-loss", func(val) {
if (APUController.APU != nil) {
if (val.getBoolValue()) {
if (APUController.APU.GenericControls.starter.getValue()) {
APUController.APU.GenericControls.starter.setValue(0);
}
if (APUController.APU.state != 0) {
APUController.APU.autoStop();
}
}
}
}, 0, 0);
var _masterTime = 0; var _masterTime = 0;
setlistener("/controls/apu/master", func() { setlistener("/controls/apu/master", func() {
if (APUController.APU != nil) { if (APUController.APU != nil) {

275
Systems/a320-apu.xml
View file

@ -8,52 +8,52 @@
<channel name="APU" execrate="8"> <channel name="APU" execrate="8">
<!-- bleed 1.8 kg / sec @ 42 psig --> <!-- bleed 1.8 kg / sec @ 42 psig -->
<!-- fuel 148 kg/hr --> <!-- fuel 148 kg/hr -->
<!-- generator 24034 rpm, 10129 rpm fuel ctl, 32045 rpm starter, 51965 rpm cooling, 4137rpm oil pump --> <!-- generator 24034 rpm, 10129 rpm fuel ctl, 32045 rpm starter, 51965 rpm cooling, 4137rpm oil pump -->
<fcs_function name="/systems/apu/bleed-load-kw"> <fcs_function name="/systems/apu/bleed-load-kw">
<function> <function>
<ifthen> <ifthen>
<eq> <eq>
<property>/controls/pneumatics/switches/apu</property> <property>/controls/pneumatics/switches/apu</property>
<value>1</value> <value>1</value>
</eq> </eq>
<value>252</value> <value>252</value>
<value>0</value> <value>0</value>
</ifthen> </ifthen>
</function> </function>
</fcs_function> </fcs_function>
<fcs_function name="/systems/apu/electrical-load-kw"> <fcs_function name="/systems/apu/electrical-load-kw">
<function> <function>
<ifthen> <ifthen>
<gt> <gt>
<property>/systems/electrical/relay/apu-glc/output</property> <property>/systems/electrical/relay/apu-glc/output</property>
<value>110</value> <value>110</value>
</gt> </gt>
<value>132</value> <value>132</value>
<value>0</value> <value>0</value>
</ifthen> </ifthen>
</function> </function>
</fcs_function> </fcs_function>
<fcs_function name="/systems/apu/apu-load-cmd"> <fcs_function name="/systems/apu/apu-load-cmd">
<function> <function>
<quotient> <quotient>
<sum> <sum>
<property>/systems/apu/electrical-load-kw</property> <property>/systems/apu/electrical-load-kw</property>
<property>/systems/apu/bleed-load-kw</property> <property>/systems/apu/bleed-load-kw</property>
</sum> </sum>
<value>400</value> <value>400</value>
</quotient> </quotient>
</function> </function>
</fcs_function> </fcs_function>
<actuator name="/systems/apu/apu-load"> <actuator name="/systems/apu/apu-load">
<input>/systems/apu/apu-load-cmd</input> <input>/systems/apu/apu-load-cmd</input>
<rate_limit>0.01</rate_limit> <!-- 60 seconds cooling period for bleed which is ~ 60% --> <rate_limit>0.01</rate_limit> <!-- 60 seconds cooling period for bleed which is ~ 60% -->
</actuator> </actuator>
<washout_filter name="/systems/apu/dn-dt"> <washout_filter name="/systems/apu/dn-dt">
<input>/engines/engine[2]/n1</input> <input>/engines/engine[2]/n1</input>
<c1>1</c1> <c1>1</c1>
@ -61,60 +61,60 @@
<fcs_function name="/systems/apu/egt-degC"> <fcs_function name="/systems/apu/egt-degC">
<function> <function>
<sum> <sum>
<product> <product>
<property>/systems/apu/apu-load</property> <property>/systems/apu/apu-load</property>
<value>50</value> <value>50</value>
</product> </product>
<ifthen> <ifthen>
<or> <or>
<lt> <lt>
<property>/engines/engine[2]/n1</property> <property>/engines/engine[2]/n1</property>
<value>0.5</value> <value>0.5</value>
</lt> </lt>
<gt> <gt>
<property>/systems/apu/dn-dt</property> <property>/systems/apu/dn-dt</property>
<value>0</value> <value>0</value>
</gt> </gt>
</or> </or>
<table> <table>
<independentVar lookup="row">/engines/engine[2]/n1</independentVar> <independentVar lookup="row">/engines/engine[2]/n1</independentVar>
<tableData> <tableData>
5.0 20.0 5.0 20.0
8.0 45.0 8.0 45.0
10.0 120.0 10.0 120.0
12.0 225.0 12.0 225.0
18.0 430.0 18.0 430.0
25.0 500.0 25.0 500.0
27.0 560.0 27.0 560.0
30.0 720.0 30.0 720.0
35.0 785.0 35.0 785.0
40.0 800.0 40.0 800.0
45.0 795.0 45.0 795.0
50.0 785.0 50.0 785.0
60.0 755.0 60.0 755.0
75.0 645.0 75.0 645.0
90.0 520.0 90.0 520.0
100.0 415.0 100.0 415.0
</tableData> </tableData>
</table> </table>
<table> <table>
<independentVar lookup="row">/engines/engine[2]/n1</independentVar> <independentVar lookup="row">/engines/engine[2]/n1</independentVar>
<tableData> <tableData>
2.0 200.0 2.0 200.0
8.0 220.0 8.0 220.0
12.0 225.0 12.0 225.0
18.0 240.0 18.0 240.0
30.0 250.0 30.0 250.0
50.0 265.0 50.0 265.0
60.0 295.0 60.0 295.0
75.0 380.0 75.0 380.0
90.0 410.0 90.0 410.0
100.0 415.0 100.0 415.0
</tableData> </tableData>
</table> </table>
</ifthen> </ifthen>
</sum> </sum>
</function> </function>
</fcs_function> </fcs_function>
@ -138,31 +138,31 @@
</table> </table>
</function> </function>
</fcs_function> </fcs_function>
<fcs_function name="/systems/apu/oil/oil-temperature-degC"> <fcs_function name="/systems/apu/oil/oil-temperature-degC">
<function> <function>
<product> <product>
<sum> <sum>
<value>1.0</value> <!-- tune --> <value>1.0</value> <!-- tune -->
<product> <product>
<property>/systems/apu/apu-load</property> <property>/systems/apu/apu-load</property>
<value>0.3</value> <value>0.3</value>
</product> </product>
</sum> </sum>
<table> <table>
<independentVar lookup="row">/systems/apu/oil/oil-pressure-psi</independentVar> <independentVar lookup="row">/systems/apu/oil/oil-pressure-psi</independentVar>
<tableData> <tableData>
0 0 0 0
25 135 25 135
35 105 35 105
55 85 55 85
</tableData> </tableData>
</table> </table>
<quotient> <quotient>
<property>/engines/engine[2]/n1</property> <property>/engines/engine[2]/n1</property>
<value>100</value> <value>100</value>
</quotient> </quotient>
</product> </product>
</function> </function>
</fcs_function> </fcs_function>
@ -171,10 +171,10 @@
<sum> <sum>
<property>/systems/apu/oil/level-l</property> <property>/systems/apu/oil/level-l</property>
<product> <product>
<quotient> <quotient>
<property>/engines/engine[2]/n1</property> <property>/engines/engine[2]/n1</property>
<value>100</value> <value>100</value>
</quotient> </quotient>
<property>/systems/apu/oil/allow-oil-consumption</property> <property>/systems/apu/oil/allow-oil-consumption</property>
<value>-0.00000131437</value> <value>-0.00000131437</value>
<property>simulation/channel-dt</property> <property>simulation/channel-dt</property>
@ -183,6 +183,27 @@
</function> </function>
<output>/systems/apu/oil/level-l</output> <output>/systems/apu/oil/level-l</output>
</fcs_function> </fcs_function>
<switch name="/systems/apu/shutdown-power-loss-cmd">
<default value="0"/>
<test logic="AND" value="1">
/systems/electrical/bus/dc-bat lt 25
</test>
</switch>
<actuator name="/systems/apu/shutdown-power-loss-timer">
<input>/systems/apu/shutdown-power-loss-cmd</input>
<rate_limit sense="incr">5</rate_limit>
<rate_limit sense="decr">100</rate_limit>
</actuator>
<switch name="/systems/apu/shutdown-power-loss">
<default value="0"/>
<test logic="AND" value="1">
/systems/apu/shutdown-power-loss-timer eq 1
</test>
</switch>
</channel> </channel>

23
Systems/a320-electrical.xml
View file

@ -2153,7 +2153,7 @@
<channel name="Emergency Electric Logic" execrate="8"> <channel name="Emergency Electric Logic" execrate="8">
<switch name="/systems/electrical/some-electric-thingie/emer-elec-config"> <switch name="/systems/electrical/some-electric-thingie/emer-elec-config-cmd">
<default value="0"/> <default value="0"/>
<test logic="AND" value="1"> <test logic="AND" value="1">
/systems/electrical/bus/ac-1 lt 110 /systems/electrical/bus/ac-1 lt 110
@ -2163,20 +2163,33 @@
/systems/electrical/relay/ext-epc/contact-pos eq 0 /systems/electrical/relay/ext-epc/contact-pos eq 0
<test logic="OR"> <test logic="OR">
/controls/electrical/switches/gen-1 eq 0 /controls/electrical/switches/gen-1 eq 0
/systems/failures/electrical/gen-1 eq 1 /ECAM/warnings/logic/gen-1-inop eq 1
</test> </test>
<test logic="OR"> <test logic="OR">
/controls/electrical/switches/gen-2 eq 0 /controls/electrical/switches/gen-2 eq 0
/systems/failures/electrical/gen-2 eq 1 /ECAM/warnings/logic/gen-2-inop eq 1
</test> </test>
<test logic="OR"> <test logic="OR">
/controls/electrical/switches/apu eq 0 /controls/electrical/switches/apu eq 0
/systems/failures/electrical/apu eq 1 /ECAM/warnings/logic/apu-gen-fault eq 1
/engines/engine[2]/n1 lt 94.9 /systems/apu/available eq 0
</test> </test>
</test> </test>
</switch> </switch>
<actuator name="/systems/electrical/some-electric-thingie/emer-elec-config-timer">
<input>/systems/electrical/some-electric-thingie/emer-elec-config-cmd</input>
<rate_limit sense="incr">5</rate_limit>
<rate_limit sense="decr">100</rate_limit>
</actuator>
<switch name="/systems/electrical/some-electric-thingie/emer-elec-config">
<default value="0"/>
<test logic="OR" value="1">
/systems/electrical/some-electric-thingie/emer-elec-config-timer eq 1
</test>
</switch>
<switch name="/systems/electrical/some-electric-thingie/emer-elec-config-generator-1-bustie"> <switch name="/systems/electrical/some-electric-thingie/emer-elec-config-generator-1-bustie">
<default value="0"/> <default value="0"/>
<test logic="AND" value="1"> <test logic="AND" value="1">

8
Systems/a320-fwc.xml
View file

@ -2833,7 +2833,7 @@
</test> </test>
</switch> </switch>
<switch name="/ECAM/warnings/logic/eng/dual-failure-5-sec-input"> <switch name="/ECAM/warnings/logic/eng/dual-failure-2-sec-input">
<default value="0"/> <default value="0"/>
<test logic="AND" value="1"> <test logic="AND" value="1">
/engines/engine[0]/n2-actual lt 59.4 /engines/engine[0]/n2-actual lt 59.4
@ -2841,8 +2841,8 @@
</test> </test>
</switch> </switch>
<actuator name="/ECAM/warnings/logic/eng/dual-failure-5-sec"> <actuator name="/ECAM/warnings/logic/eng/dual-failure-2-sec">
<input>/ECAM/warnings/logic/eng/dual-failure-5-sec-input</input> <input>/ECAM/warnings/logic/eng/dual-failure-2-sec-input</input>
<rate_limit sense="incr">0.5</rate_limit> <rate_limit sense="incr">0.5</rate_limit>
<rate_limit sense="decr">100</rate_limit> <rate_limit sense="decr">100</rate_limit>
</actuator> </actuator>
@ -2870,7 +2870,7 @@
/controls/engines/engine[0]/cutoff-switch eq 1 /controls/engines/engine[0]/cutoff-switch eq 1
/controls/engines/engine[1]/cutoff-switch eq 1 /controls/engines/engine[1]/cutoff-switch eq 1
</test> </test>
/ECAM/warnings/logic/eng/dual-failure-5-sec eq 1 /ECAM/warnings/logic/eng/dual-failure-2-sec eq 1
</test> </test>
</test> </test>
</switch> </switch>

8
Systems/a320-lights-proprules.xml
View file

@ -53,12 +53,4 @@
</input> </input>
<output>/controls/lighting/overhead-panel-norm-digital</output> <output>/controls/lighting/overhead-panel-norm-digital</output>
</filter> </filter>
<filter>
<type>gain</type>
<gain>1.0</gain>
<input>/controls/lighting/annunciator-lights-tied</input>
<output>/controls/lighting/annunciator-lights</output>
</filter>
</PropertyList> </PropertyList>

18
Systems/a320-lights.xml
View file

@ -71,37 +71,29 @@
<switch name="/controls/lighting/fcu-panel-norm-tied"> <switch name="/controls/lighting/fcu-panel-norm-tied">
<default value="0" /> <default value="0" />
<test value="/controls/lighting/fcu-panel-knb"> <test value="/controls/lighting/fcu-panel-knb">
/systems/electrical/bus/ac-1 gt 25 /systems/electrical/bus/ac-1 gt 110
</test> </test>
</switch> </switch>
<switch name="/controls/lighting/fcu-digit-norm-tied"> <switch name="/controls/lighting/fcu-digit-norm-tied">
<default value="0" /> <default value="0" />
<test value="/controls/lighting/fcu-digit-knb"> <test logic="OR" value="/controls/lighting/fcu-digit-knb">
/systems/electrical/bus/ac-1 gt 25 /systems/electrical/bus/ac-si-bus ge 110
/systems/electrical/bus/ac-ess-shed ge 110
</test> </test>
</switch> </switch>
<switch name="/controls/lighting/main-panel-norm-tied"> <switch name="/controls/lighting/main-panel-norm-tied">
<default value="0" /> <default value="0" />
<test value="/controls/lighting/main-panel-knb"> <test value="/controls/lighting/main-panel-knb">
/systems/electrical/bus/ac-1 gt 25 /systems/electrical/bus/ac-1 gt 110
</test> </test>
</switch> </switch>
<switch name="/controls/lighting/overhead-panel-norm-tied"> <switch name="/controls/lighting/overhead-panel-norm-tied">
<default value="0" /> <default value="0" />
<test value="/controls/lighting/overhead-panel-knb"> <test value="/controls/lighting/overhead-panel-knb">
/systems/electrical/bus/ac-1 gt 25
</test>
</switch>
<switch name="/controls/lighting/annunciator-lights-tied">
<default value="0" />
<test logic="OR" value="1"> <!-- TODO: add static inverter as a source, also dc-2 switching -->
/systems/electrical/bus/ac-1 gt 110 /systems/electrical/bus/ac-1 gt 110
/systems/electrical/bus/ac-2 gt 110
/systems/electrical/bus/dc-2 gt 25
</test> </test>
</switch> </switch>