diff --git a/A320-main.xml b/A320-main.xml index 18e6b3f0..c902e9ca 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> @@ -1548,7 +1575,7 @@ <file>Aircraft/IDG-A32X/Nasal/autopush_route.nas</file> </autopush_route> <rmp> - <file>Aircraft/IDG-A32X/Models/Instruments/Radio/Radio.nas</file> + <file>Aircraft/IDG-A32X/Nasal/rmp.nas</file> </rmp> </nasal> 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/Models/Instruments/Radio/Radio.nas b/Nasal/rmp.nas similarity index 90% rename from Models/Instruments/Radio/Radio.nas rename to Nasal/rmp.nas index b406a0ff..84c5843f 100644 --- a/Models/Instruments/Radio/Radio.nas +++ b/Nasal/rmp.nas @@ -52,36 +52,36 @@ var update_active_vhf = func(vhf) { # In case that a 3rd RMP is added, uncomment the following line and expand the if statements with the sel3 comparison # var sel3 = chan_rmp3.getValue(); - if(vhf == 1) { - if(sel1 == "vhf1" or sel2 == "vhf1") { + if (vhf == 1) { + if (sel1 == "vhf1" or sel2 == "vhf1") { var act = sprintf("%3.3f", act_vhf1.getValue()); - if(sel1 == "vhf1") { + if (sel1 == "vhf1") { act_display_rmp1.setValue(act); } - if(sel2 == "vhf1") { + if (sel2 == "vhf1") { act_display_rmp2.setValue(act); } } } else if (vhf == 2) { - if(sel1 == "vhf2" or sel2 == "vhf2") { + if (sel1 == "vhf2" or sel2 == "vhf2") { var act = sprintf("%3.3f", act_vhf2.getValue()); - if(sel1 == "vhf2") { + if (sel1 == "vhf2") { act_display_rmp1.setValue(act); } - if(sel2 == "vhf2") { + if (sel2 == "vhf2") { act_display_rmp2.setValue(act); } } } else { - if(sel1 == "vhf3" or sel2 == "vhf3") { + if (sel1 == "vhf3" or sel2 == "vhf3") { var act = sprintf("%3.3f", act_vhf3.getValue()); - if(sel1 == "vhf3") { + if (sel1 == "vhf3") { act_display_rmp1.setValue(act); } - if(sel2 == "vhf3") { + if (sel2 == "vhf3") { act_display_rmp2.setValue(act); } } @@ -89,10 +89,10 @@ var update_active_vhf = func(vhf) { }; var update_stby_vhf = func(rmp_no, vhf) { - if(rmp_no == 0) { - if(vhf == 1) { + if (rmp_no == 0) { + if (vhf == 1) { var stby = sprintf("%3.3f", stby_rmp1_vhf1.getValue()); - } else if(vhf == 2) { + } else if (vhf == 2) { var stby = sprintf("%3.3f", stby_rmp1_vhf2.getValue()); } else { var stby = sprintf("%3.3f", stby_rmp1_vhf3.getValue()); @@ -100,9 +100,9 @@ var update_stby_vhf = func(rmp_no, vhf) { stby_display_rmp1.setValue(stby); } else { - if(vhf == 1) { + if (vhf == 1) { var stby = sprintf("%3.3f", stby_rmp2_vhf1.getValue()); - } else if(vhf == 2) { + } else if (vhf == 2) { var stby = sprintf("%3.3f", stby_rmp2_vhf2.getValue()); } else { var stby = sprintf("%3.3f", stby_rmp2_vhf3.getValue()); @@ -117,20 +117,20 @@ var update_chan_sel = func(rmp_no) { update_active_vhf(2); update_active_vhf(3); - if(rmp_no == 0) { + if (rmp_no == 0) { var chan = chan_rmp1.getValue(); - if(chan == "vhf1") { + if (chan == "vhf1") { update_stby_vhf(rmp_no, 1); - } else if(chan == "vhf1") { + } else if (chan == "vhf1") { update_stby_vhf(rmp_no, 2); } else { update_stby_vhf(rmp_no, 3); } - } else if(rmp_no == 1) { + } else if (rmp_no == 1) { var chan = chan_rmp2.getValue(); - if(chan == "vhf1") { + if (chan == "vhf1") { update_stby_vhf(rmp_no, 1); - } else if(chan == "vhf2") { + } else if (chan == "vhf2") { update_stby_vhf(rmp_no, 2); } else { update_stby_vhf(rmp_no, 3); @@ -138,9 +138,9 @@ var update_chan_sel = func(rmp_no) { } else { # In case that a 3rd RMP is added, uncomment this # var chan = chan_rmp3.getValue(); -# if(chan == "vhf1") { +# if (chan == "vhf1") { # update_stby_vhf(rmp_no, 1); -# } else if(chan == "vhf2") { +# } else if (chan == "vhf2") { # update_stby_vhf(rmp_no, 2); # } else { # update_stby_vhf(rmp_no, 3); @@ -153,7 +153,7 @@ var transfer = func(rmp_no) { rmp_no = rmp_no - 1; var sel_chan = getprop("/systems/radio/rmp[" ~ rmp_no ~ "]/sel_chan"); - if(string.match(sel_chan, "vhf[1-3]")) { + if (string.match(sel_chan, "vhf[1-3]")) { var mod1 = int(string.replace(sel_chan, "vhf", "")); var mod = mod1 - 1; diff --git a/Systems/instrumentation.xml b/Systems/instrumentation.xml index e0b34054..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,17 +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> @@ -108,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> @@ -149,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> 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