Merge branch 'master' into ECAM-sys-develop

This commit is contained in:
Joshua Davidson 2018-07-25 08:48:39 -04:00
commit 9737dff5a4

View file

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