fly/IDG-A32X
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into Lower-ECAM

Browse source
This commit is contained in:
Joshua Davidson 2018-05-16 18:57:37 -04:00
commit 09f7c3f391
10 changed files with 163630 additions and 37205 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Models/FlightDeck/a320.flightdeck.xml
View file

@ -4256,7 +4256,7 @@
<object-name>FlapsLever</object-name>
<property>controls/flight/flap-lever</property>
<interpolation>
<entry><ind>0</ind><dep> 1</dep></entry>
<entry><ind>0</ind><dep> 0</dep></entry>
<entry><ind>1</ind><dep>17</dep></entry>
<entry><ind>2</ind><dep>32</dep></entry>
<entry><ind>3</ind><dep>47</dep></entry>
@ -4935,8 +4935,8 @@
<type>rotate</type>
<object-name>SpdBrk</object-name>
<property>controls/flight/speedbrake-lever</property>
<factor>-60</factor>
<offset-deg>28</offset-deg>
<factor>-35</factor>
<offset-deg>10</offset-deg>
<center>
<x-m>0.103496</x-m>
<y-m>-0.080651</y-m>
@ -4953,7 +4953,7 @@
<type>translate</type>
<object-name>SpdBrk</object-name>
<property>controls/flight/speedbrake-lever</property>
<factor>0.050</factor>
<factor>0.045</factor>
<axis>
<x>1</x>
<y>0</y>
@ -4965,7 +4965,7 @@
<type>translate</type>
<object-name>SpdBrk</object-name>
<property>controls/flight/speedbrake-arm</property>
<factor>-0.00125</factor>
<factor>-0.00050</factor>
<axis>
<x>1</x>
<y>0</y>

BIN
Models/FlightDeck/res/Flaps.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 MiB

BIN
Models/FlightDeck/res/SpdBrk.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 MiB

74166
Models/FlightDeck/res/fd_complete.ac
View file

File diff suppressed because it is too large Load diff

126453
Models/Services/Pushback/Douglas.ac Normal file
View file

File diff suppressed because it is too large Load diff

BIN
Models/Services/Pushback/Douglas.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 246 KiB

198
Models/Services/Pushback/Douglas.xml Normal file
View file

@ -0,0 +1,198 @@
<?xml version="1.0"?>
<PropertyList>
<path>Douglas.ac</path>
<!-- Trucks models and artworks courtesy of XPGoodWay Team
(http://www.xpgoodwayteam.org/site_xpushback/) -->
<!-- switch to night/day textures -->
<animation>
<type>textranslate</type>
<property>/sim/time/sun-angle-rad</property>
<step>1.60</step>
<factor>0.318471338</factor>
<center>
<x-m>0</x-m>
<y-m>0</y-m>
<z-m>0</z-m>
</center>
<axis>
<x>-1</x>
<y>0</y>
<z>0</z>
</axis>
</animation>
<animation>
<type>material</type>
<condition>
<greater-than>
<property>/sim/time/sun-angle-rad</property>
<value>1.60</value>
</greater-than>
</condition>
<emission>
<red>1</red>
<green>1</green>
<blue>1</blue>
</emission>
</animation>
<animation>
<type>material</type>
<condition>
<less-than-equals>
<property>/sim/time/sun-angle-rad</property>
<value>1.60</value>
</less-than-equals>
</condition>
<emission>
<red>0</red>
<green>0</green>
<blue>0</blue>
</emission>
</animation>
<animation>
<type>select</type>
<condition>
<property>sim/model/pushback/enabled</property>
<property>gear/gear[0]/wow</property>
</condition>
</animation>
<animation>
<type>rotate</type>
<condition>
<greater-than>
<property>sim/model/pushback/position-norm</property>
<value>0.99</value>
</greater-than>
</condition>
<property>gear/gear[0]/steering-norm</property>
<factor>-70</factor>
<center>
<x-m>3</x-m>
<y-m>0</y-m>
<z-m>0</z-m>
</center>
<axis>
<x>0</x>
<y>0</y>
<z>1</z>
</axis>
</animation>
<!-- change heading of the pushback when driving the arc -->
<animation>
<type>rotate</type>
<property>sim/model/pushback/position-norm</property>
<factor>-90</factor>
<offset-deg>90</offset-deg>
<center>
<x-m>0</x-m>
<y-m>0</y-m>
<z-m>0</z-m>
</center>
<axis>
<x>0</x>
<y>0</y>
<z>1</z>
</axis>
</animation>
<!-- compensate for gear compression -->
<animation>
<type>translate</type>
<property>gear/gear[0]/compression-ft</property>
<factor>0.3048</factor>
<axis>
<x>0</x>
<y>0</y>
<z>1</z>
</axis>
</animation>
<!-- precalculated sin and asin to move the pushback on a 90deg arc, 25m radius -->
<animation>
<type>translate</type>
<property>sim/model/pushback/position-norm</property>
<interpolation>
<entry><ind>1.000000</ind><dep>0.000000</dep></entry>
<entry><ind>0.950000</ind><dep>1.961477</dep></entry>
<entry><ind>0.900000</ind><dep>3.910862</dep></entry>
<entry><ind>0.850000</ind><dep>5.836134</dep></entry>
<entry><ind>0.800000</ind><dep>7.725425</dep></entry>
<entry><ind>0.750000</ind><dep>9.567086</dep></entry>
<entry><ind>0.700000</ind><dep>11.349763</dep></entry>
<entry><ind>0.650000</ind><dep>13.062464</dep></entry>
<entry><ind>0.600000</ind><dep>14.694631</dep></entry>
<entry><ind>0.550000</ind><dep>16.236201</dep></entry>
<entry><ind>0.500000</ind><dep>17.677670</dep></entry>
<entry><ind>0.450000</ind><dep>19.010149</dep></entry>
<entry><ind>0.400000</ind><dep>20.225425</dep></entry>
<entry><ind>0.350000</ind><dep>21.316004</dep></entry>
<entry><ind>0.300000</ind><dep>22.275163</dep></entry>
<entry><ind>0.250000</ind><dep>23.096988</dep></entry>
<entry><ind>0.200000</ind><dep>23.776413</dep></entry>
<entry><ind>0.150000</ind><dep>24.309248</dep></entry>
<entry><ind>0.100000</ind><dep>24.692209</dep></entry>
<entry><ind>0.050000</ind><dep>24.922933</dep></entry>
<entry><ind>0.000000</ind><dep>25.000000</dep></entry>
</interpolation>
<axis>
<x>-1</x>
<y>0</y>
<z>0</z>
</axis>
</animation>
<animation>
<type>translate</type>
<property>sim/model/pushback/position-norm</property>
<interpolation>
<entry><ind>1.000000</ind><dep>0.000000</dep></entry>
<entry><ind>0.950000</ind><dep>0.077067</dep></entry>
<entry><ind>0.900000</ind><dep>0.307791</dep></entry>
<entry><ind>0.850000</ind><dep>0.690752</dep></entry>
<entry><ind>0.800000</ind><dep>1.223587</dep></entry>
<entry><ind>0.750000</ind><dep>1.903012</dep></entry>
<entry><ind>0.700000</ind><dep>2.724837</dep></entry>
<entry><ind>0.650000</ind><dep>3.683996</dep></entry>
<entry><ind>0.600000</ind><dep>4.774575</dep></entry>
<entry><ind>0.550000</ind><dep>5.989851</dep></entry>
<entry><ind>0.500000</ind><dep>7.322330</dep></entry>
<entry><ind>0.450000</ind><dep>8.763799</dep></entry>
<entry><ind>0.400000</ind><dep>10.305369</dep></entry>
<entry><ind>0.350000</ind><dep>11.937536</dep></entry>
<entry><ind>0.300000</ind><dep>13.650238</dep></entry>
<entry><ind>0.250000</ind><dep>15.432914</dep></entry>
<entry><ind>0.200000</ind><dep>17.274575</dep></entry>
<entry><ind>0.150000</ind><dep>19.163866</dep></entry>
<entry><ind>0.100000</ind><dep>21.089138</dep></entry>
<entry><ind>0.050000</ind><dep>23.038523</dep></entry>
<entry><ind>0.000000</ind><dep>25.000000</dep></entry>
</interpolation>
<axis>
<x>0</x>
<y>-1</y>
<z>0</z>
</axis>
</animation>
<!-- compensate for pitch of aircraft, keep pushback level -->
<animation>
<type>rotate</type>
<property>orientation/pitch-deg</property>
<factor>-1</factor>
<center>
<x-m>0</x-m>
<y-m>0</y-m>
<z-m>0</z-m>
</center>
<axis>
<x>0</x>
<y>1</y>
<z>0</z>
</axis>
</animation>
</PropertyList>

BIN
Resources/SpdBrk.xcf Normal file
View file

Binary file not shown.

6
Systems/a320-fcs.xml
View file

@ -1879,9 +1879,13 @@
<switch name="hydraulics/tiller/switch">
<default value="/controls/flight/rudder"/>
<test value="/controls/flight/aileron">
<test logic="AND" value="/controls/flight/aileron">
fbw/fmgc/enabled eq 0
/controls/flight/aileron-drives-tiller eq 1
</test>
<test value="fbw/fmgc/yaw-cmd">
fbw/fmgc/enabled eq 1
</test>
</switch>
<fcs_function name="hydraulics/tiller/function">

2
revision.txt
View file

@ -1 +1 @@
4408
4409