From 20354e95c4dd9a9318b8f1dd6dbf5f4041078f54 Mon Sep 17 00:00:00 2001 From: Joshua Davidson <joshuadavidson2000@gmail.com> Date: Tue, 25 Sep 2018 09:52:11 -0400 Subject: [PATCH 1/2] DU: Fix bug in UECAM due to duplicate prop node spec --- Models/Instruments/Upper-ECAM/Upper-ECAM.nas | 2 -- revision.txt | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas index 814fdf53..b7dc1d6a 100644 --- a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas +++ b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas @@ -61,8 +61,6 @@ var eng1_n2 = props.globals.getNode("/engines/engine[0]/n2-actual", 1); var eng2_n2 = props.globals.getNode("/engines/engine[1]/n2-actual", 1); var eng1_epr = props.globals.getNode("/engines/engine[0]/epr-actual", 1); var eng2_epr = props.globals.getNode("/engines/engine[1]/epr-actual", 1); -var eng1_n2mode = props.globals.getNode("/systems/fadec/eng1/egt", 1); -var eng2_n2mode = props.globals.getNode("/systems/fadec/eng2/egt", 1); var eng1_egt = props.globals.getNode("/engines/engine[0]/egt-actual", 1); var eng2_egt = props.globals.getNode("/engines/engine[1]/egt-actual", 1); var eng1_egtmode = props.globals.getNode("/systems/fadec/eng1/egt", 1); diff --git a/revision.txt b/revision.txt index b744f319..7dd297b9 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4651 \ No newline at end of file +4652 \ No newline at end of file From 16b7853f74ea388886209f6c49e31d2b98466054 Mon Sep 17 00:00:00 2001 From: Joshua Davidson <joshuadavidson2000@gmail.com> Date: Thu, 27 Sep 2018 13:44:25 -0400 Subject: [PATCH 2/2] Sim: Add support for VHF3 --- A320-main.xml | 29 ++++++++++++++++++++- Systems/instrumentation.xml | 50 +++++++++++++++++++++---------------- 2 files changed, 56 insertions(+), 23 deletions(-) diff --git a/A320-main.xml b/A320-main.xml index 1c6f4db3..a0197605 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -760,7 +760,34 @@ </options> <instrumentation n="0"> - + + <comm n="0"> + <frequencies> + <selected-mhz type="double">118.7</selected-mhz> + <standby-mhz type="double">121.4</standby-mhz> + </frequencies> + <serviceable type="bool">true</serviceable> + <volume type="double">0.6</volume> + </comm> + + <comm n="1"> + <frequencies> + <selected-mhz type="double">119.4</selected-mhz> + <standby-mhz type="double">122.6</standby-mhz> + </frequencies> + <serviceable type="bool">true</serviceable> + <volume type="double">0.6</volume> + </comm> + + <comm n="2"> + <frequencies> + <selected-mhz type="double">120.1</selected-mhz> + <standby-mhz type="double">123.2</standby-mhz> + </frequencies> + <serviceable type="bool">true</serviceable> + <volume type="double">0.6</volume> + </comm> + <dme n="0"> <frequencies> <selected-mhz type="double">111.15</selected-mhz> diff --git a/Systems/instrumentation.xml b/Systems/instrumentation.xml index afb049ac..7f415277 100644 --- a/Systems/instrumentation.xml +++ b/Systems/instrumentation.xml @@ -30,23 +30,24 @@ file, these values will be used (they are hardcoded). --> <PropertyList> - + <adf> <name>adf</name> <number>0</number> </adf> + <adf> <name>adf</name> <number>1</number> </adf> - + <airspeed-indicator> <name>airspeed-indicator</name> <number>0</number> <total-pressure>/systems/pitot/total-pressure-inhg</total-pressure> <static-pressure>/systems/static/pressure-inhg</static-pressure> </airspeed-indicator> - + <altimeter> <name>altimeter</name> <number>0</number> @@ -54,13 +55,13 @@ file, these values will be used (they are hardcoded). <quantum>0</quantum> <tau>0</tau> </altimeter> - + <attitude-indicator> <name>attitude-indicator</name> <number>0</number> <suction>/systems/vacuum/suction-inhg</suction> </attitude-indicator> - + <clock> <name>clock</name> <number>0</number> @@ -70,12 +71,17 @@ file, these values will be used (they are hardcoded). <name>comm</name> <number>0</number> </comm-radio> - + <comm-radio> <name>comm</name> <number>1</number> </comm-radio> - + + <comm-radio> + <name>comm</name> + <number>2</number> + </comm-radio> + <dme> <name>dme</name> <number>0</number> @@ -103,33 +109,33 @@ file, these values will be used (they are hardcoded). <quantum>10</quantum> <tau>0.1</tau> </altimeter> - + <marker-beacon> <name>marker-beacon</name> <number>0</number> </marker-beacon> - + <heading-indicator> <name>heading-indicator</name> <number>0</number> <suction>/systems/vacuum/suction-inhg</suction> </heading-indicator> - + <KT-70> <name>kt-70</name> <number>0</number> </KT-70> - + <magnetic-compass> <name>magnetic-compass</name> <number>0</number> </magnetic-compass> - + <nav-radio> <name>nav</name> <number>0</number> </nav-radio> - + <nav-radio> <name>nav</name> <number>1</number> @@ -144,49 +150,49 @@ file, these values will be used (they are hardcoded). <name>nav</name> <number>3</number> </nav-radio> - + <slip-skid-ball> <name>slip-skid-ball</name> <number>0</number> </slip-skid-ball> - + <transponder> <name>transponder</name> <number>0</number> <mode-c-altitude>/instrumentation/encoder/mode-c-alt-ft</mode-c-altitude> </transponder> - + <turn-indicator> <name>turn-indicator</name> <number>0</number> </turn-indicator> - + <vertical-speed-indicator> <name>vertical-speed-indicator</name> <number>0</number> <static-pressure>/systems/static/pressure-inhg</static-pressure> </vertical-speed-indicator> - + <gps> <name>gps</name> <number>0</number> </gps> - + <tcas> <name>tcas</name> <number>0</number> </tcas> - + <radar> <name>wxradar</name> <number>0</number> </radar> - + <tacan> <name>tacan</name> <number>0</number> </tacan> - + <mk-viii> <name>mk-viii</name> <number>0</number>