Merge branch 'master' into dev
This commit is contained in:
commit
c1aee67baf
2 changed files with 9 additions and 17 deletions
|
@ -277,15 +277,6 @@
|
||||||
<type>noise-spike</type>
|
<type>noise-spike</type>
|
||||||
<feedback-if-disabled>true</feedback-if-disabled>
|
<feedback-if-disabled>true</feedback-if-disabled>
|
||||||
<initialize-to>output</initialize-to>
|
<initialize-to>output</initialize-to>
|
||||||
<input>
|
|
||||||
<condition>
|
|
||||||
<not-equals>
|
|
||||||
<property>/it-autoflight/output/lat</property>
|
|
||||||
<value>4</value>
|
|
||||||
</not-equals>
|
|
||||||
</condition>
|
|
||||||
<value>0</value>
|
|
||||||
</input>
|
|
||||||
<input>
|
<input>
|
||||||
<condition>
|
<condition>
|
||||||
<equals>
|
<equals>
|
||||||
|
@ -295,6 +286,7 @@
|
||||||
</condition>
|
</condition>
|
||||||
<property>/it-autoflight/internal/rudder-cmd</property>
|
<property>/it-autoflight/internal/rudder-cmd</property>
|
||||||
</input>
|
</input>
|
||||||
|
<input>0</input>
|
||||||
<output>/fdm/jsbsim/fbw/fmgc/yaw-cmd</output> <!-- Inputs to the FBW Yaw -->
|
<output>/fdm/jsbsim/fbw/fmgc/yaw-cmd</output> <!-- Inputs to the FBW Yaw -->
|
||||||
<max-rate-of-change>0.6</max-rate-of-change>
|
<max-rate-of-change>0.6</max-rate-of-change>
|
||||||
</filter>
|
</filter>
|
||||||
|
|
|
@ -21,14 +21,14 @@
|
||||||
<max-rate-of-change>
|
<max-rate-of-change>
|
||||||
<condition>
|
<condition>
|
||||||
<and>
|
<and>
|
||||||
<equals>
|
|
||||||
<property>/it-autoflight/output/thr-mode</property>
|
|
||||||
<value>0</value>
|
|
||||||
</equals>
|
|
||||||
<equals>
|
<equals>
|
||||||
<property>/it-autoflight/output/athr</property>
|
<property>/it-autoflight/output/athr</property>
|
||||||
<value>1</value>
|
<value>1</value>
|
||||||
</equals>
|
</equals>
|
||||||
|
<equals>
|
||||||
|
<property>/it-autoflight/output/thr-mode</property>
|
||||||
|
<value>0</value>
|
||||||
|
</equals>
|
||||||
<equals>
|
<equals>
|
||||||
<property>/it-autoflight/input/kts-mach</property>
|
<property>/it-autoflight/input/kts-mach</property>
|
||||||
<value>0</value>
|
<value>0</value>
|
||||||
|
@ -59,14 +59,14 @@
|
||||||
<max-rate-of-change>
|
<max-rate-of-change>
|
||||||
<condition>
|
<condition>
|
||||||
<and>
|
<and>
|
||||||
<equals>
|
|
||||||
<property>/it-autoflight/output/thr-mode</property>
|
|
||||||
<value>0</value>
|
|
||||||
</equals>
|
|
||||||
<equals>
|
<equals>
|
||||||
<property>/it-autoflight/output/athr</property>
|
<property>/it-autoflight/output/athr</property>
|
||||||
<value>1</value>
|
<value>1</value>
|
||||||
</equals>
|
</equals>
|
||||||
|
<equals>
|
||||||
|
<property>/it-autoflight/output/thr-mode</property>
|
||||||
|
<value>0</value>
|
||||||
|
</equals>
|
||||||
<equals>
|
<equals>
|
||||||
<property>/it-autoflight/input/kts-mach</property>
|
<property>/it-autoflight/input/kts-mach</property>
|
||||||
<value>1</value>
|
<value>1</value>
|
||||||
|
|
Reference in a new issue