Merge branch 'master' into Lower-ECAM

This commit is contained in:
Joshua Davidson 2018-07-25 08:48:47 -04:00
commit bc6a76be29

View file

@ -328,7 +328,12 @@
<value>0</value> <value>0</value>
</equals> </equals>
</condition> </condition>
<value>-6000</value> <expression>
<dif>
<property>/it-autoflight/internal/vert-speed-fpm</property>
<value>2500</value>
</dif>
</expression>
</u_min> </u_min>
<u_max> <u_max>
<condition> <condition>
@ -337,7 +342,12 @@
<value>0</value> <value>0</value>
</equals> </equals>
</condition> </condition>
<value>10000</value> <expression>
<sum>
<property>/it-autoflight/internal/vert-speed-fpm</property>
<value>2500</value>
</sum>
</expression>
</u_max> </u_max>
</config> </config>
</pid-controller> </pid-controller>