Merge pull request #25 from legoboyvdlp/master

updates
This commit is contained in:
Joshua Davidson 2017-05-12 10:30:42 -04:00 committed by GitHub
commit c30fc4c994
5 changed files with 77 additions and 4 deletions

View file

@ -198,7 +198,7 @@
</binding>
</button>
<checkbox>
<!--<checkbox>
<label>Enable Baggage Ramp</label>
<halign>left</halign>
<enable>
@ -209,6 +209,31 @@
<command>dialog-apply</command>
</binding>
<live>true</live>
</checkbox>-->
<checkbox>
<label>Enable External Air</label> <!-- there is no overhead indication or switch -->
<halign>left</halign>
<property>/controls/pneumatic/switches/groundair</property>
<binding>
<command>property-toggle</command>
<property>/controls/pneumatic/switches/groundair</property>
</binding>
<enable>
<and>
<equals>
<property>/controls/gear/brake-parking</property>
<value>1</value>
</equals>
<less-than>
<property>/velocities/groundspeed-kt</property>
<value>2</value>
</less-than>
</and>
</enable>
<binding>
<command>dialog-apply</command>
</binding>
<live>true</live>
</checkbox>
<checkbox>
@ -220,6 +245,18 @@
<property>/controls/electrical/switches/gen-ext</property>
<value>0</value>
</binding>
<enable>
<and>
<equals>
<property>/controls/gear/brake-parking</property>
<value>1</value>
</equals>
<less-than>
<property>/velocities/groundspeed-kt</property>
<value>2</value>
</less-than>
</and>
</enable>
<binding>
<command>dialog-apply</command>
</binding>

Binary file not shown.

After

Width:  |  Height:  |  Size: 418 KiB

View file

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8" ?>
<PropertyList>
<sim>
<model>
<livery>
<name>it0uchpods VIP aircraft</name>
<texture>Liveries/A321/WTF.png</texture>
</livery>
</model>
</sim>
</PropertyList>

View file

@ -1,5 +1,5 @@
# A320 Pneumatics System
# Joshua Davidson (it0uchpods)
# Joshua Davidson (it0uchpods) and Jonathan Redpath (legoboyvdlp)
#############
# Init Vars #
@ -9,6 +9,7 @@ var pneu_init = func {
setprop("/controls/pneumatic/switches/bleed1", 0);
setprop("/controls/pneumatic/switches/bleed2", 0);
setprop("/controls/pneumatic/switches/bleedapu", 0);
setprop("/controls/pneumatic/switches/groundair", 0);
setprop("/controls/pneumatic/switches/pack1", 0);
setprop("/controls/pneumatic/switches/pack2", 0);
setprop("/controls/pneumatic/switches/hot-air", 0);
@ -18,6 +19,7 @@ var pneu_init = func {
setprop("/systems/pneumatic/bleed1", 0);
setprop("/systems/pneumatic/bleed2", 0);
setprop("/systems/pneumatic/bleedapu", 0);
setprop("/systems/pneumatic/groundair", 0);
setprop("/systems/pneumatic/total-psi", 0);
setprop("/systems/pneumatic/start-psi", 0);
setprop("/systems/pneumatic/pack-psi", 0);
@ -45,6 +47,8 @@ var master_pneu = func {
var xbleed_sw = getprop("/controls/pneumatic/switches/xbleed");
var eng1_starter = getprop("/systems/pneumatic/eng1-starter");
var eng2_starter = getprop("/systems/pneumatic/eng2-starter");
var groundair = getprop("/systems/pneumatic/groundair");
var groundair_supp = getprop("/controls/pneumatic/switches/groundair");
var rpmapu = getprop("/systems/apu/rpm");
var stateL = getprop("/engines/engine[0]/state");
var stateR = getprop("/engines/engine[1]/state");
@ -71,6 +75,7 @@ var master_pneu = func {
var bleed1 = getprop("/systems/pneumatic/bleed1");
var bleed2 = getprop("/systems/pneumatic/bleed2");
var bleedapu = getprop("/systems/pneumatic/bleedapu");
var ground = getprop("/systems/pneumatic/groundair");
if (stateL == 1 or stateR == 1) {
setprop("/systems/pneumatic/start-psi", 18);
@ -78,13 +83,13 @@ var master_pneu = func {
setprop("/systems/pneumatic/start-psi", 0);
}
if (pack1_sw == 1 and (bleed1 >= 20 or bleedapu >= 20) and eng1_starter == 0 and eng2_starter == 0) {
if (pack1_sw == 1 and (bleed1 >= 20 or bleedapu >= 20 or ground >= 20) and eng1_starter == 0 and eng2_starter == 0) {
setprop("/systems/pneumatic/pack1", pack_flo_sw);
} else {
setprop("/systems/pneumatic/pack1", 0);
}
if (pack2_sw == 1 and (bleed2 >= 20 or bleedapu >= 20) and eng1_starter == 0 and eng2_starter == 0) {
if (pack2_sw == 1 and (bleed2 >= 20 or bleedapu >= 20 or ground >= 20) and eng1_starter == 0 and eng2_starter == 0) {
setprop("/systems/pneumatic/pack2", pack_flo_sw);
} else {
setprop("/systems/pneumatic/pack2", 0);
@ -111,6 +116,12 @@ var master_pneu = func {
setprop("/systems/pneumatic/total-psi", total_psi_calc);
}
if (groundair_supp) {
setprop("/systems/pneumatic/groundair", 39);
} else {
setprop("/systems/pneumatic/groundair", 0);
}
var total_psi = getprop("/systems/pneumatic/total-psi");
}

View file

@ -131,6 +131,7 @@ setlistener("/sim/signals/fdm-initialized", func {
systems.pneu_init();
systems.hyd_init();
itaf.ap_init();
externalconnections.start();
var autopilot = gui.Dialog.new("sim/gui/dialogs/autopilot/dialog", "Aircraft/A320Family/Systems/autopilot-dlg.xml");
setprop("/it-autoflight/input/fd1", 1);
setprop("/it-autoflight/input/fd2", 1);
@ -147,3 +148,14 @@ var aglgears = func {
}
aglgears();
var externalconnections = maketimer(0.1, func {
var groundpwr = getprop("/controls/switches/cart");
var groundair = getprop("/controls/pneumatic/switches/groundair");
var gs = getprop("/velocities/groundspeed-kt");
var parkbrake = getprop("controls/gear/brake-parking");
if ((groundair or groundpwr) and ((gs > 2) or !parkbrake)) {
setprop("/controls/switches/cart", 0);
setprop("/controls/pneumatic/switches/groundair", 0);
}
});