Merge branch 'master' into MCDU

This commit is contained in:
Joshua Davidson 2018-01-01 16:00:08 -05:00
commit 0c32a977ba
3 changed files with 31 additions and 5 deletions

View file

@ -129,7 +129,7 @@
</equals> </equals>
</and> </and>
</condition> </condition>
<value>1.25</value> <value>1.0</value>
</max-rate-of-change> </max-rate-of-change>
<max-rate-of-change>5</max-rate-of-change> <max-rate-of-change>5</max-rate-of-change>
</filter> </filter>
@ -355,7 +355,7 @@
</equals> </equals>
</and> </and>
</condition> </condition>
<value>1.25</value> <value>1.0</value>
</max-rate-of-change> </max-rate-of-change>
<max-rate-of-change>5</max-rate-of-change> <max-rate-of-change>5</max-rate-of-change>
</filter> </filter>

View file

@ -129,7 +129,7 @@
<value>0</value> <value>0</value>
</reference> </reference>
<output> <output>
<property>/it-fbw/g-elevator</property> <property>/it-fbw/g-elevator-cmd</property>
</output> </output>
<config> <config>
<Kp>-1.5</Kp> <Kp>-1.5</Kp>
@ -157,6 +157,32 @@
</config> </config>
</pi-simple-controller> </pi-simple-controller>
<filter>
<name>IT-CONTROLLER: G ELEVATOR INVERT</name>
<type>gain</type>
<gain>1.0</gain>
<input>
<condition>
<and>
<less-than-equals>
<property>/orientation/roll-deg</property>
<value>90</value>
</less-than-equals>
<greater-than-equals>
<property>/orientation/roll-deg</property>
<value>-90</value>
</greater-than-equals>
</and>
</condition>
<property>/it-fbw/g-elevator-cmd</property>
</input>
<input>
<property>/it-fbw/g-elevator-cmd</property>
<scale>-1.0</scale>
</input>
<output>/it-fbw/g-elevator</output>
</filter>
<filter> <filter>
<name>IT-CONTROLLER: PITCH RATE CMD</name> <name>IT-CONTROLLER: PITCH RATE CMD</name>
<type>gain</type> <type>gain</type>

View file

@ -1 +1 @@
4218 4219