This commit is contained in:
omega13a 2017-05-22 20:00:44 -07:00
commit 664621cd49
2 changed files with 58 additions and 50 deletions

View file

@ -313,7 +313,6 @@
<vorloc>-4.0</vorloc> <vorloc>-4.0</vorloc>
<vs>0.01</vs> <vs>0.01</vs>
<fpa>0.30</fpa> <fpa>0.30</fpa>
<gs>0.10</gs>
</cmd> </cmd>
<autoland> <autoland>
<kp-roll>0.10</kp-roll> <kp-roll>0.10</kp-roll>

View file

@ -290,6 +290,28 @@
<gain>1.0</gain> <gain>1.0</gain>
</filter> </filter>
<filter>
<name>NAV1 G/S FPM Calc</name>
<debug>false</debug>
<type>gain</type>
<input>/instrumentation/nav[0]/gs-rate-of-climb-fpm</input>
<output>/it-autoflight/internal/nav1-rate-of-climb-fpm</output>
<gain>1.0</gain>
<min>-1500</min>
<max>0</max>
</filter>
<filter>
<name>NAV2 G/S FPM Calc</name>
<debug>false</debug>
<type>gain</type>
<input>/instrumentation/nav[1]/gs-rate-of-climb-fpm</input>
<output>/it-autoflight/internal/nav2-rate-of-climb-fpm</output>
<gain>1.0</gain>
<min>-1500</min>
<max>0</max>
</filter>
<!-- =============================================================== --> <!-- =============================================================== -->
<!-- Lateral Modes --> <!-- Lateral Modes -->
<!-- =============================================================== --> <!-- =============================================================== -->
@ -719,55 +741,6 @@
</config> </config>
</pi-simple-controller> </pi-simple-controller>
<pid-controller>
<name>GLIDESLOPE HOLD</name>
<debug>false</debug>
<enable>
<condition>
<equals>
<property>/it-autoflight/output/vert</property>
<value>2</value>
</equals>
</condition>
</enable>
<input>
<property>/velocities/vertical-speed-fps</property>
</input>
<reference>
<condition>
<equals>
<property>/it-autoflight/settings/use-nav2-radio</property>
<value>0</value>
</equals>
</condition>
<property>/instrumentation/nav[0]/gs-rate-of-climb</property>
</reference>
<reference>
<condition>
<equals>
<property>/it-autoflight/settings/use-nav2-radio</property>
<value>1</value>
</equals>
</condition>
<property>/instrumentation/nav[1]/gs-rate-of-climb</property>
</reference>
<output>
<property>/it-autoflight/internal/target-pitch-deg</property>
</output>
<config>
<Kp>
<property>/it-autoflight/config/cmd/gs</property>
</Kp>
<beta>1.0</beta>
<alpha>0.5</alpha>
<gamma>0.0</gamma>
<Ti>10.0</Ti>
<Td>0.0001</Td>
<u_min>-5</u_min>
<u_max>7</u_max>
</config>
</pid-controller>
<pid-controller> <pid-controller>
<name>FLCH SPEED BY PITCH</name> <name>FLCH SPEED BY PITCH</name>
<debug>false</debug> <debug>false</debug>
@ -1056,6 +1029,10 @@
<property>/it-autoflight/output/vert</property> <property>/it-autoflight/output/vert</property>
<value>1</value> <value>1</value>
</equals> </equals>
<equals>
<property>/it-autoflight/output/vert</property>
<value>2</value>
</equals>
<equals> <equals>
<property>/it-autoflight/output/vert</property> <property>/it-autoflight/output/vert</property>
<value>4</value> <value>4</value>
@ -1137,6 +1114,38 @@
<property>/it-autoflight/internal/prof-fpm</property> <property>/it-autoflight/internal/prof-fpm</property>
<scale>0.16667</scale> <scale>0.16667</scale>
</reference> </reference>
<reference>
<condition>
<and>
<equals>
<property>/it-autoflight/output/vert</property>
<value>2</value>
</equals>
<equals>
<property>/it-autoflight/settings/use-nav2-radio</property>
<value>0</value>
</equals>
</and>
</condition>
<property>/it-autoflight/internal/nav1-rate-of-climb-fpm</property>
<scale>0.16667</scale>
</reference>
<reference>
<condition>
<and>
<equals>
<property>/it-autoflight/output/vert</property>
<value>2</value>
</equals>
<equals>
<property>/it-autoflight/settings/use-nav2-radio</property>
<value>1</value>
</equals>
</and>
</condition>
<property>/it-autoflight/internal/nav2-rate-of-climb-fpm</property>
<scale>0.16667</scale>
</reference>
<output> <output>
<property>/it-autoflight/internal/target-pitch-deg</property> <property>/it-autoflight/internal/target-pitch-deg</property>
</output> </output>