fly/A320-family
1
0
Fork 0
Code Activity

Update properties; further corrections

Browse source
This commit is contained in:
legoboyvdlp R 2020-05-10 15:37:05 +01:00
parent 694fc8920e
commit bb897df526
7 changed files with 36 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
A320-main.xml
View file

@ -1169,6 +1169,10 @@
<ovht-2 type="double">0</ovht-2>
</precooler>
<psi>
<crossbleed-duct-left type="double">0</crossbleed-duct-left>
<crossbleed-duct-right type="double">0</crossbleed-duct-right>
<crossbleed-duct-left-src type="int">0</crossbleed-duct-left-src>
<crossbleed-duct-right-src type="int">0</crossbleed-duct-right-src>
<engine-1-psi type="double">0</engine-1-psi>
<engine-2-psi type="double">0</engine-2-psi>
<engine-1-downstream-prv type="double">0</engine-1-downstream-prv>
@ -1180,6 +1184,7 @@
</psi>
<source>
<apu-psi type="double">0</apu-psi>
<gnd-psi type="double">0</gnd-psi>
<engine-1-lp-psi type="double">0</engine-1-lp-psi>
<engine-2-lp-psi type="double">0</engine-2-lp-psi>
<engine-1-hp-psi type="double">0</engine-1-hp-psi>
@ -1188,18 +1193,24 @@
<valves>
<apu-bleed-valve type="double">0</apu-bleed-valve>
<crossbleed-valve type="double">0</crossbleed-valve>
<engine-1-lp-valve type="double">0</engine-1-lp-valve>
<engine-2-lp-valve type="double">0</engine-2-lp-valve>
<engine-1-hp-valve type="double">0</engine-1-hp-valve>
<engine-2-hp-valve type="double">0</engine-2-hp-valve>
<engine-1-opv-valve type="double">0</engine-1-opv-valve>
<engine-2-opv-valve type="double">0</engine-2-opv-valve>
<engine-1-prv-valve type="double">0</engine-1-prv-valve>
<engine-2-prv-valve type="double">0</engine-2-prv-valve>
<engine-1-prv-valve-disag type="bool">0</engine-1-prv-valve-disag>
<engine-2-prv-valve-disag type="bool">0</engine-2-prv-valve-disag>
<engine-1-opv-valve type="double">0</engine-1-opv-valve>
<engine-2-opv-valve type="double">0</engine-2-opv-valve>
<pack-1 type="double">0</pack-1>
<pack-2 type="double">0</pack-2>
<starter-valve-1 type="double">0</starter-valve-1>
<starter-valve-2 type="double">0</starter-valve-2>
</valves>
<warnings>
<apu-bleed-not-on-cmd type="bool">0</apu-bleed-not-on-cmd>
<apu-bleed-not-on type="double">0</apu-bleed-not-on>
<crossbleed-disag type="bool">0</crossbleed-disag>
<crossbleed-disag-open type="bool">0</crossbleed-disag-open>
</warnings>

14
AircraftConfig/acconfig.nas
View file

@ -372,9 +372,9 @@ var beforestart_b = func {
setprop("/controls/electrical/switches/galley", 1);
setprop("/controls/electrical/switches/gen-1", 1);
setprop("/controls/electrical/switches/gen-2", 1);
setprop("/controls/pneumatic/switches/bleedapu", 1);
setprop("/controls/pneumatic/switches/bleed1", 1);
setprop("/controls/pneumatic/switches/bleed2", 1);
setprop("/controls/pneumatics/switches/apu", 1);
setprop("/controls/pneumatics/switches/bleed-1", 1);
setprop("/controls/pneumatics/switches/bleed-2", 1);
setprop("/controls/pneumatics/switches/pack-1", 1);
setprop("/controls/pneumatics/switches/pack-2", 1);
setprop("/controls/adirs/ir[0]/knob","1");
@ -464,9 +464,9 @@ var taxi_b = func {
setprop("/controls/electrical/switches/galley", 1);
setprop("/controls/electrical/switches/gen-1", 1);
setprop("/controls/electrical/switches/gen-2", 1);
setprop("/controls/pneumatic/switches/bleedapu", 1);
setprop("/controls/pneumatic/switches/bleed1", 1);
setprop("/controls/pneumatic/switches/bleed2", 1);
setprop("/controls/pneumatics/switches/apu", 1);
setprop("/controls/pneumatics/switches/bleed-1", 1);
setprop("/controls/pneumatics/switches/bleed-2", 1);
setprop("/controls/pneumatics/switches/pack-1", 1);
setprop("/controls/pneumatics/switches/pack-2", 1);
setprop("/controls/adirs/ir[0]/knob","1");
@ -514,7 +514,7 @@ var taxi_d = func {
# After Start items.
setprop("/controls/engines/engine-start-switch", 1);
setprop("/controls/apu/master", 0);
setprop("/controls/pneumatic/switches/bleedapu", 0);
setprop("/controls/pneumatics/switches/apu", 0);
setprop("/controls/gear/brake-left", 0);
setprop("/controls/gear/brake-right", 0);
setprop("/systems/acconfig/autoconfig-running", 0);

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

@ -17,7 +17,7 @@ var wowNode = props.globals.getNode("fdm/jsbsim/position/wow", 1);
var apu_rpm = props.globals.getNode("engines/engine[2]/n1", 1);
var wing_pb = props.globals.getNode("controls/switches/wing", 1);
var apumaster = props.globals.getNode("controls/apu/master", 1);
var apu_bleedSw = props.globals.getNode("controls/pneumatic/switches/bleedapu", 1);
var apu_bleedSw = props.globals.getNode("controls/pneumatics/switches/apu", 1);
var gear = props.globals.getNode("gear/gear-pos-norm", 1);
var cutoff1 = props.globals.getNode("controls/engines/engine[0]/cutoff-switch", 1);
var cutoff2 = props.globals.getNode("controls/engines/engine[1]/cutoff-switch", 1);
@ -1834,7 +1834,7 @@ var messages_right_memo = func {
ignition.active = 0;
}
if (getprop("controls/pneumatic/switches/bleedapu") == 1 and getprop("engines/engine[2]/n1") >= 95) {
if (getprop("controls/pneumatics/switches/apu") == 1 and getprop("engines/engine[2]/n1") >= 95) {
apu_bleed.active = 1;
} else {
apu_bleed.active = 0;

2
Nasal/Systems/APU.nas
View file

@ -304,7 +304,7 @@ setlistener("controls/apu/master", func() {
}
}, 0, 0);
setlistener("controls/pneumatic/switches/bleedapu", func() {
setlistener("controls/pneumatics/switches/apu", func() {
if (APUController.APU != nil) {
if (APUNodes.Controls.bleed.getValue()) {
APUController.APU.signals.bleedWasUsed = 1;

12
Nasal/Systems/pneumaticsx.nas
View file

@ -74,9 +74,9 @@ var guard = 0;
var PNEU = {
init: func() {
setprop("controls/pneumatic/switches/bleed1", 1);
setprop("controls/pneumatic/switches/bleed2", 1);
setprop("controls/pneumatic/switches/bleedapu", 0);
setprop("controls/pneumatics/switches/bleed-1", 1);
setprop("controls/pneumatics/switches/bleed-2", 1);
setprop("controls/pneumatics/switches/apu", 0);
setprop("controls/pneumatic/switches/groundair", 0);
setprop("controls/pneumatics/switches/pack-1", 1);
setprop("controls/pneumatics/switches/pack-2", 1);
@ -165,9 +165,9 @@ var PNEU = {
setprop("systems/pneumatic/precooler-2-ovht", 0);
},
loop: func() {
bleed1_sw = getprop("controls/pneumatic/switches/bleed1");
bleed2_sw = getprop("controls/pneumatic/switches/bleed2");
bleedapu_sw = getprop("controls/pneumatic/switches/bleedapu");
bleed1_sw = getprop("controls/pneumatics/switches/bleed-1");
bleed2_sw = getprop("controls/pneumatics/switches/bleed-2");
bleedapu_sw = getprop("controls/pneumatics/switches/apu");
pack1_sw = getprop("controls/pneumatics/switches/pack-1");
pack2_sw = getprop("controls/pneumatics/switches/pack-2");
hot_air_sw = getprop("controls/pneumatic/switches/hot-air");

2
Systems/a320-apu.xml
View file

@ -13,7 +13,7 @@
<function>
<ifthen>
<eq>
<property>/controls/pneumatic/switches/bleedapu</property>
<property>/controls/pneumatics/switches/apu</property>
<value>1</value>
</eq>
<value>252</value>

12
Systems/a320-pneumatic.xml
View file

@ -560,7 +560,7 @@
/systems/pneumatics/source/apu-psi ne 0
</test>
<test logic="AND" value="3"> <!-- left prv -->
/systems/pneumatics/psi/engine-1-downstream-opv lt /systems/pneumatics/psi/crossbleed-duct-right
/systems/pneumatics/psi/engine-1-downstream-opv gt /systems/pneumatics/psi/crossbleed-duct-right
</test>
<test logic="AND" value="4"> <!-- right crossbleed -->
/systems/pneumatics/valves/crossbleed-valve ne 0
@ -580,7 +580,7 @@
/systems/pneumatics/valves/apu-bleed-valve ne 0
</test>
<test logic="AND" value="3"> <!-- right prv -->
/systems/pneumatics/psi/engine-2-downstream-opv lt /systems/pneumatics/psi/crossbleed-duct-left
/systems/pneumatics/psi/engine-2-downstream-opv gt /systems/pneumatics/psi/crossbleed-duct-left
</test>
<test logic="AND" value="4"> <!-- left crossbleed -->
/systems/pneumatics/valves/crossbleed-valve ne 0
@ -598,10 +598,10 @@
</product>
<property>/systems/pneumatics/psi/engine-1-downstream-opv</property>
<ifthen>
<eq>
<nq>
<property>/systems/pneumatics/psi/crossbleed-duct-right-src</property>
<value>4</value>
</eq>
</nq>
<v>-9999</v> <!-- ignore -->
<product>
<property>/systems/pneumatics/psi/crossbleed-duct-right</property>
@ -626,10 +626,10 @@
</product>
<property>/systems/pneumatics/psi/engine-2-downstream-opv</property>
<ifthen>
<eq>
<nq>
<property>/systems/pneumatics/psi/crossbleed-duct-left-src</property>
<value>4</value>
</eq>
</nq>
<v>-9999</v> <!-- ignore -->
<product>
<property>/systems/pneumatics/psi/crossbleed-duct-left</property>