A3XX: Fix PFD Conditions

This commit is contained in:
Joshua Davidson 2017-06-23 12:49:20 -04:00
parent 3a3a25956d
commit f5029de068
4 changed files with 102 additions and 43 deletions

View file

@ -26,7 +26,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<z> -25.2091 </z> <z> -25.2091 </z>
</location --> </location -->
<location name="AERORP" unit="IN"> <location name="AERORP" unit="IN">
<x> 700.00 </x> <x> 680.00 </x>
<y> 0 </y> <y> 0 </y>
<z> 0.00 </z> <z> 0.00 </z>
</location> </location>
@ -81,7 +81,7 @@ YAW MOI_________3950000______23089847_______24848934
<z> -41.7398 </z> <z> -41.7398 </z>
</location --> </location -->
<location name="CG" unit="IN"> <location name="CG" unit="IN">
<x> 652.00 </x> <x> 620.00 </x>
<y> 0 </y> <y> 0 </y>
<z> 0.00 </z> <z> 0.00 </z>
</location> </location>
@ -89,7 +89,7 @@ YAW MOI_________3950000______23089847_______24848934
<pointmass name="Cockpit Crew"> <pointmass name="Cockpit Crew">
<weight unit="LBS">400</weight> <!-- MAX: 400lbs, two pilots--> <weight unit="LBS">400</weight> <!-- MAX: 400lbs, two pilots-->
<location name="POINTMASS" unit="IN"> <location name="POINTMASS" unit="IN">
<x>200</x> <x>150</x>
<y>0</y> <y>0</y>
<z>0</z> <z>0</z>
</location> </location>
@ -97,7 +97,7 @@ YAW MOI_________3950000______23089847_______24848934
<pointmass name="Cabin Crew"> <pointmass name="Cabin Crew">
<weight unit="LBS">600</weight> <!-- MAX: 1320lbs, up to six flight-attendants--> <weight unit="LBS">600</weight> <!-- MAX: 1320lbs, up to six flight-attendants-->
<location name="POINTMASS" unit="IN"> <location name="POINTMASS" unit="IN">
<x>696</x> <x>666</x>
<y>0</y> <y>0</y>
<z>0</z> <z>0</z>
</location> </location>
@ -105,7 +105,7 @@ YAW MOI_________3950000______23089847_______24848934
<pointmass name="PAX 0A (60 seats)"> <pointmass name="PAX 0A (60 seats)">
<weight unit="LBS">6600</weight> <!-- MAX: 13200lbs, 60 seats --> <weight unit="LBS">6600</weight> <!-- MAX: 13200lbs, 60 seats -->
<location name="POINTMASS" unit="IN"> <location name="POINTMASS" unit="IN">
<x>470.1711</x> <x>460.1711</x>
<y>0</y> <y>0</y>
<z>0</z> <z>0</z>
</location> </location>
@ -113,7 +113,7 @@ YAW MOI_________3950000______23089847_______24848934
<pointmass name="PAX 0B (60 seats)"> <pointmass name="PAX 0B (60 seats)">
<weight unit="LBS">6600</weight> <!-- MAX: 13200lbs, 60 seats --> <weight unit="LBS">6600</weight> <!-- MAX: 13200lbs, 60 seats -->
<location name="POINTMASS" unit="IN"> <location name="POINTMASS" unit="IN">
<x>809.5669</x> <x>789.5669</x>
<y>0</y> <y>0</y>
<z>0</z> <z>0</z>
</location> </location>
@ -121,7 +121,7 @@ YAW MOI_________3950000______23089847_______24848934
<pointmass name="PAX 0C (54 seats)"> <pointmass name="PAX 0C (54 seats)">
<weight unit="LBS">5940</weight> <!-- MAX: 11880lbs, 54 seats --> <weight unit="LBS">5940</weight> <!-- MAX: 11880lbs, 54 seats -->
<location name="POINTMASS" unit="IN"> <location name="POINTMASS" unit="IN">
<x>1163.2729</x> <x>1123.2729</x>
<y>0</y> <y>0</y>
<z>0</z> <z>0</z>
</location> </location>
@ -129,7 +129,7 @@ YAW MOI_________3950000______23089847_______24848934
<pointmass name="Cargo Hold 1"> <pointmass name="Cargo Hold 1">
<weight unit="LBS">2000</weight> <!-- MAX: 7500.126lbs --> <weight unit="LBS">2000</weight> <!-- MAX: 7500.126lbs -->
<location name="POINTMASS" unit="IN"> <location name="POINTMASS" unit="IN">
<x>383.4792</x> <x>363.4792</x>
<y>0</y> <y>0</y>
<z>-29.5</z> <!-- 1.5m and now half of it for the center point of the load --> <z>-29.5</z> <!-- 1.5m and now half of it for the center point of the load -->
</location> </location>
@ -138,7 +138,7 @@ YAW MOI_________3950000______23089847_______24848934
<pointmass name="Cargo Hold 3"> <pointmass name="Cargo Hold 3">
<weight unit="LBS">2000</weight> <!-- MAX: 5384.414lbs --> <weight unit="LBS">2000</weight> <!-- MAX: 5384.414lbs -->
<location name="POINTMASS" unit="IN"> <location name="POINTMASS" unit="IN">
<x>849.1324</x> <x>821.1324</x>
<y>0</y> <y>0</y>
<z>-29.5</z> <z>-29.5</z>
</location> </location>
@ -146,7 +146,7 @@ YAW MOI_________3950000______23089847_______24848934
<pointmass name="Cargo Hold 4"> <pointmass name="Cargo Hold 4">
<weight unit="LBS">1500</weight> <!-- MAX: 4651.754lbs --> <weight unit="LBS">1500</weight> <!-- MAX: 4651.754lbs -->
<location name="POINTMASS" unit="IN"> <location name="POINTMASS" unit="IN">
<x>931.0653</x> <x>911.0653</x>
<y>0</y> <y>0</y>
<z>-29.5</z> <z>-29.5</z>
</location> </location>
@ -167,7 +167,7 @@ YAW MOI_________3950000______23089847_______24848934
<!-- REF-1 page 165 + 271 --> <!-- REF-1 page 165 + 271 -->
<contact type="BOGEY" name="NOSE_LG"> <contact type="BOGEY" name="NOSE_LG">
<location unit="IN"> <location unit="IN">
<x> 197.6772 </x> <x> 275.6772 </x>
<y> 0 </y> <y> 0 </y>
<z> -137.9617 </z> <z> -137.9617 </z>
</location> </location>

View file

@ -33,31 +33,59 @@
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>sidestick-max</object-name> <object-name>sidestick-max</object-name>
<object-name>sidestick-pos</object-name> <object-name>sidestick-pos</object-name>
<condition> <condition>
<and> <and>
<property>/options/pfd/sidestick-pos</property> <or>
<equals> <property>/gear/gear[1]/wow</property>
<property>/it-autoflight/output/ap1</property> <property>/gear/gear[2]/wow</property>
<value>0</value> <and>
</equals> <property>/options/pfd/sidestick-pos</property>
<equals> <equals>
<property>/it-autoflight/output/ap1</property> <property>/it-autoflight/output/ap1</property>
<value>0</value> <value>0</value>
</equals> </equals>
<or> <equals>
<property>/it-autoflight/output/ap1</property>
<value>0</value>
</equals>
</and>
</or>
<or>
<and>
<or>
<equals>
<property>/FMGC/status/phase</property>
<value>0</value>
</equals>
<equals>
<property>/FMGC/status/phase</property>
<value>1</value>
</equals>
</or>
<equals> <equals>
<property>/engines/engine[0]/state</property> <property>/engines/engine[0]/state</property>
<value>3</value> <value>3</value>
</equals> </equals>
</and>
<and>
<or>
<equals>
<property>/FMGC/status/phase</property>
<value>0</value>
</equals>
<equals>
<property>/FMGC/status/phase</property>
<value>1</value>
</equals>
</or>
<equals> <equals>
<property>/engines/engine[1]/state</property> <property>/engines/engine[1]/state</property>
<value>3</value> <value>3</value>
</equals> </equals>
<not><property>/gear/gear[1]/wow</property></not> </and>
<not><property>/gear/gear[2]/wow</property></not> </or>
</or> </and>
</and>
</condition> </condition>
</animation> </animation>
@ -667,6 +695,7 @@
<animation> <animation>
<type>textranslate</type> <type>textranslate</type>
<object-name>alt-tape-2</object-name> <object-name>alt-tape-2</object-name>
<property>octal</property>
<property>instrumentation/altimeter/indicated-altitude-ft</property> <property>instrumentation/altimeter/indicated-altitude-ft</property>
<factor>0.009999725</factor> <factor>0.009999725</factor>
<axis> <axis>

View file

@ -33,31 +33,59 @@
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>sidestick-max</object-name> <object-name>sidestick-max</object-name>
<object-name>sidestick-pos</object-name> <object-name>sidestick-pos</object-name>
<condition> <condition>
<and> <and>
<property>/options/pfd/sidestick-pos</property> <or>
<equals> <property>/gear/gear[1]/wow</property>
<property>/it-autoflight/output/ap1</property> <property>/gear/gear[2]/wow</property>
<value>0</value> <and>
</equals> <property>/options/pfd/sidestick-pos</property>
<equals> <equals>
<property>/it-autoflight/output/ap1</property> <property>/it-autoflight/output/ap1</property>
<value>0</value> <value>0</value>
</equals> </equals>
<or> <equals>
<property>/it-autoflight/output/ap1</property>
<value>0</value>
</equals>
</and>
</or>
<or>
<and>
<or>
<equals>
<property>/FMGC/status/phase</property>
<value>0</value>
</equals>
<equals>
<property>/FMGC/status/phase</property>
<value>1</value>
</equals>
</or>
<equals> <equals>
<property>/engines/engine[0]/state</property> <property>/engines/engine[0]/state</property>
<value>3</value> <value>3</value>
</equals> </equals>
</and>
<and>
<or>
<equals>
<property>/FMGC/status/phase</property>
<value>0</value>
</equals>
<equals>
<property>/FMGC/status/phase</property>
<value>1</value>
</equals>
</or>
<equals> <equals>
<property>/engines/engine[1]/state</property> <property>/engines/engine[1]/state</property>
<value>3</value> <value>3</value>
</equals> </equals>
<not><property>/gear/gear[1]/wow</property></not> </and>
<not><property>/gear/gear[2]/wow</property></not> </or>
</or> </and>
</and>
</condition> </condition>
</animation> </animation>
@ -667,6 +695,7 @@
<animation> <animation>
<type>textranslate</type> <type>textranslate</type>
<object-name>alt-tape-2</object-name> <object-name>alt-tape-2</object-name>
<property>octal</property>
<property>instrumentation/altimeter/indicated-altitude-ft</property> <property>instrumentation/altimeter/indicated-altitude-ft</property>
<factor>0.009999725</factor> <factor>0.009999725</factor>
<axis> <axis>

View file

@ -320,6 +320,7 @@
<independentVar lookup="row">velocities/mach</independentVar> <independentVar lookup="row">velocities/mach</independentVar>
<tableData> <tableData>
0.0 -1.900 0.0 -1.900
0.2 -1.800
2.0 -0.900 2.0 -0.900
</tableData> </tableData>
</table> </table>