Merge branch 'master' into dev

This commit is contained in:
Joshua Davidson 2018-10-20 13:03:48 -04:00
commit 670b2233c4
2 changed files with 18 additions and 20 deletions

View file

@ -250,21 +250,7 @@
</condition> </condition>
<value>-0.05</value> <value>-0.05</value>
</Kp> </Kp>
<Kp> <Kp>-0.02</Kp>
<condition>
<or>
<equals>
<property>/gear/gear[1]/wow</property>
<value>1</value>
</equals>
<equals>
<property>/gear/gear[2]/wow</property>
<value>1</value>
</equals>
</or>
</condition>
<value>-0.02</value>
</Kp>
<Ki>0</Ki> <Ki>0</Ki>
</config> </config>
<min>-0.15</min> <min>-0.15</min>
@ -279,10 +265,22 @@
<initialize-to>output</initialize-to> <initialize-to>output</initialize-to>
<input> <input>
<condition> <condition>
<equals> <and>
<property>/it-autoflight/output/lat</property> <or>
<value>4</value> <equals>
</equals> <property>/it-autoflight/output/ap1</property>
<value>1</value>
</equals>
<equals>
<property>/it-autoflight/output/ap2</property>
<value>1</value>
</equals>
</or>
<equals>
<property>/it-autoflight/output/lat</property>
<value>4</value>
</equals>
</and>
</condition> </condition>
<property>/it-autoflight/internal/rudder-cmd</property> <property>/it-autoflight/internal/rudder-cmd</property>
</input> </input>

View file

@ -1 +1 @@
4680 4681