1
0
Fork 0

Ground services: rename chokes to chocks, and ensure external power and air stay on if chocks are on

This commit is contained in:
legoboyvdlp R 2019-10-19 12:49:23 +01:00
parent 909d848452
commit 299e387324
6 changed files with 34 additions and 29 deletions

View file

@ -20,7 +20,7 @@
<position-norm type="double">0</position-norm>
<enabled type="int"/>
<available type="int">1</available>
<chocks alias="/services/chokes/nose"/>
<chocks alias="/services/chocks/nose"/>
<steer-cmd-norm alias="/fdm/jsbsim/hydraulics/tiller/autopush-cmd"/>
<yaw alias="/fdm/jsbsim/fcs/steer-deg"/>
<yaw-mult type="float">1.0</yaw-mult>
@ -812,11 +812,11 @@
</gear>
<services n="0">
<chokes n="0">
<chocks n="0">
<nose type="bool">0</nose>
<left type="bool">0</left>
<right type="bool">0</right>
</chokes>
</chocks>
</services>
<systems>

View file

@ -230,7 +230,7 @@
<property>/gear/gear[2]/wow</property>
</and>
</enable>
<property>/services/chokes/nose</property>
<property>/services/chocks/nose</property>
<binding>
<command>dialog-apply</command>
</binding>
@ -247,7 +247,7 @@
<property>/gear/gear[2]/wow</property>
</and>
</enable>
<property>/services/chokes/left</property>
<property>/services/chocks/left</property>
<binding>
<command>dialog-apply</command>
</binding>
@ -264,7 +264,7 @@
<property>/gear/gear[2]/wow</property>
</and>
</enable>
<property>/services/chokes/right</property>
<property>/services/chocks/right</property>
<binding>
<command>dialog-apply</command>
</binding>
@ -282,10 +282,12 @@
</binding>
<enable>
<and>
<equals>
<or>
<property>/controls/gear/brake-parking</property>
<value>1</value>
</equals>
<property>/services/chocks/nose</property>
<property>/services/chocks/left</property>
<property>/services/chocks/right</property>
</or>
<less-than>
<property>/velocities/groundspeed-kt</property>
<value>2</value>
@ -308,10 +310,12 @@
</binding>
<enable>
<and>
<equals>
<or>
<property>/controls/gear/brake-parking</property>
<value>1</value>
</equals>
<property>/services/chocks/nose</property>
<property>/services/chocks/left</property>
<property>/services/chocks/right</property>
</or>
<less-than>
<property>/velocities/groundspeed-kt</property>
<value>2</value>
@ -334,10 +338,12 @@
</binding>
<enable>
<and>
<equals>
<or>
<property>/controls/gear/brake-parking</property>
<value>1</value>
</equals>
<property>/services/chocks/nose</property>
<property>/services/chocks/left</property>
<property>/services/chocks/right</property>
</or>
<less-than>
<property>/velocities/groundspeed-kt</property>
<value>2</value>

View file

@ -132,7 +132,7 @@
<path>Aircraft/A320-family/Models/Services/Chocks/chock_nose.ac</path>
<condition>
<equals>
<property>services/chokes/nose</property>
<property>services/chocks/nose</property>
<value>1</value>
</equals>
</condition>
@ -147,7 +147,7 @@
<path>Aircraft/A320-family/Models/Services/Chocks/chock_left.ac</path>
<condition>
<equals>
<property>services/chokes/left</property>
<property>services/chocks/left</property>
<value>1</value>
</equals>
</condition>
@ -163,7 +163,7 @@
<path>Aircraft/A320-family/Models/Services/Chocks/chock_right.ac</path>
<condition>
<equals>
<property>services/chokes/right</property>
<property>services/chocks/right</property>
<value>1</value>
</equals>
</condition>

View file

@ -20,11 +20,10 @@ var ground_services = {
# Set them all to 0 if the aircraft is not stationary
if (getprop("/velocities/groundspeed-kt") >= 2) {
setprop("/services/chokes/nose", 0);
setprop("/services/chokes/left", 0);
setprop("/services/chokes/right", 0);
setprop("/services/chocks/nose", 0);
setprop("/services/chocks/left", 0);
setprop("/services/chocks/right", 0);
setprop("/services/fuel-truck/enable", 0);
setprop("/services/ext-pwr/enable", 0);
setprop("/services/deicing_truck/enable", 0);
setprop("/services/catering/enable", 0);
}

View file

@ -235,7 +235,7 @@ var systemsLoop = maketimer(0.1, func {
fadec.FADEC.loop();
rmp.rmpUpdate();
if ((getprop("/controls/pneumatic/switches/groundair") or getprop("/controls/electrical/ground-cart")) and ((getprop("/velocities/groundspeed-kt") > 2) or getprop("/controls/gear/brake-parking") == 0)) {
if ((getprop("/controls/pneumatic/switches/groundair") or getprop("/controls/electrical/ground-cart")) and ((getprop("/velocities/groundspeed-kt") > 2) or (getprop("/controls/gear/brake-parking") == 0 and getprop("/services/chocks/nose") == 0 and getprop("/services/chocks/left") == 0 and getprop("/services/chocks/right") == 0))) {
setprop("/controls/electrical/ground-cart", 0);
setprop("/controls/pneumatic/switches/groundair", 0);
}

View file

@ -2110,16 +2110,16 @@
<c1>20</c1>
</lag_filter>
<pure_gain name="/services/chokes/nose-half">
<input>/services/chokes/nose</input>
<pure_gain name="/services/chocks/nose-half">
<input>/services/chocks/nose</input>
<gain>0.5</gain>
</pure_gain>
<summer name="fcs/left-brake-summer">
<input>/controls/gear/brake-left</input>
<input>/controls/gear/brake-parking</input>
<input>/services/chokes/nose-half</input>
<input>/services/chokes/left</input>
<input>/services/chocks/nose-half</input>
<input>/services/chocks/left</input>
<clipto>
<min>0</min>
<max>1</max>
@ -2137,8 +2137,8 @@
<summer name="fcs/right-brake-summer">
<input>/controls/gear/brake-right</input>
<input>/controls/gear/brake-parking</input>
<input>/services/chokes/nose-half</input>
<input>/services/chokes/right</input>
<input>/services/chocks/nose-half</input>
<input>/services/chocks/right</input>
<clipto>
<min>0</min>
<max>1</max>