ITAF Update

This commit is contained in:
Joshua Davidson 2017-04-29 20:50:24 -04:00
parent 2dee2c6240
commit 8014c1f45e
2 changed files with 158 additions and 132 deletions

View file

@ -271,6 +271,7 @@
<vorloc>-4.0</vorloc> <vorloc>-4.0</vorloc>
<alt>0.025</alt> <alt>0.025</alt>
<vs>0.05</vs> <vs>0.05</vs>
<flch-vs>0.10</flch-vs>
<fpa>0.30</fpa> <fpa>0.30</fpa>
<gs>0.10</gs> <gs>0.10</gs>
</cmd> </cmd>

View file

@ -775,7 +775,7 @@
<value>0</value> <value>0</value>
</equals> </equals>
</condition> </condition>
<property>/it-autoflight/internal/lookahead-5-sec-airspeed-kt</property> <property>/it-autoflight/internal/lookahead-10-sec-airspeed-kt</property>
</input> </input>
<input> <input>
<condition> <condition>
@ -784,7 +784,7 @@
<value>1</value> <value>1</value>
</equals> </equals>
</condition> </condition>
<property>/it-autoflight/internal/lookahead-5-sec-mach</property> <property>/it-autoflight/internal/lookahead-10-sec-mach</property>
<scale>500.0</scale> <scale>500.0</scale>
</input> </input>
<reference> <reference>
@ -810,45 +810,48 @@
<property>/it-autoflight/internal/target-fps</property> <property>/it-autoflight/internal/target-fps</property>
</output> </output>
<config> <config>
<Kp>-3.8</Kp> <Kp>-4.0</Kp>
<beta>1.0</beta>
<alpha>0.1</alpha>
<gamma>0.0</gamma>
<Ti>10.0</Ti> <Ti>10.0</Ti>
<Td>0.0</Td> <Td>0.00001</Td>
<u_min> <u_min>
<condition> <condition>
<greater-than> <greater-than>
<property>/it-autoflight/internal/alt</property> <property>/it-autoflight/internal/alt</property>
<property>/instrumentation/altimeter/indicated-altitude-ft</property> <property>/instrumentation/altimeter/indicated-altitude-ft</property>
</greater-than> </greater-than>
</condition> </condition>
<value>1.6</value> <value>1.6</value>
</u_min> </u_min>
<u_min> <u_min>
<condition> <condition>
<less-than> <less-than>
<property>/it-autoflight/internal/alt</property> <property>/it-autoflight/internal/alt</property>
<property>/instrumentation/altimeter/indicated-altitude-ft</property> <property>/instrumentation/altimeter/indicated-altitude-ft</property>
</less-than> </less-than>
</condition> </condition>
<value>-100</value> <value>-100</value>
</u_min> </u_min>
<u_max> <u_max>
<condition> <condition>
<greater-than> <greater-than>
<property>/it-autoflight/internal/alt</property> <property>/it-autoflight/internal/alt</property>
<property>/instrumentation/altimeter/indicated-altitude-ft</property> <property>/instrumentation/altimeter/indicated-altitude-ft</property>
</greater-than> </greater-than>
</condition> </condition>
<value>166</value> <value>166</value>
</u_max> </u_max>
<u_max> <u_max>
<condition> <condition>
<less-than> <less-than>
<property>/it-autoflight/internal/alt</property> <property>/it-autoflight/internal/alt</property>
<property>/instrumentation/altimeter/indicated-altitude-ft</property> <property>/instrumentation/altimeter/indicated-altitude-ft</property>
</less-than> </less-than>
</condition> </condition>
<value>-1.6</value> <value>-1.6</value>
</u_max> </u_max>
</config> </config>
</pid-controller> </pid-controller>
@ -864,7 +867,7 @@
</condition> </condition>
</enable> </enable>
<input> <input>
<property>/it-autoflight/internal/lookahead-5-sec-airspeed-kt</property> <property>/it-autoflight/internal/lookahead-10-sec-airspeed-kt</property>
</input> </input>
<reference> <reference>
<condition> <condition>
@ -889,14 +892,17 @@
</output> </output>
<config> <config>
<Kp>-4.0</Kp> <Kp>-4.0</Kp>
<beta>1.0</beta>
<alpha>0.1</alpha>
<gamma>0.0</gamma>
<Ti>10.0</Ti> <Ti>10.0</Ti>
<Td>0.0</Td> <Td>0.00001</Td>
<u_min> <u_min>
<value>1.6</value> <value>1.6</value>
</u_min> </u_min>
<u_max> <u_max>
<value>166</value> <value>166</value>
</u_max> </u_max>
</config> </config>
</pid-controller> </pid-controller>
@ -918,7 +924,7 @@
<value>0</value> <value>0</value>
</equals> </equals>
</condition> </condition>
<property>/it-autoflight/internal/lookahead-5-sec-airspeed-kt</property> <property>/it-autoflight/internal/lookahead-10-sec-airspeed-kt</property>
</input> </input>
<input> <input>
<condition> <condition>
@ -927,7 +933,7 @@
<value>1</value> <value>1</value>
</equals> </equals>
</condition> </condition>
<property>/it-autoflight/internal/lookahead-5-sec-mach</property> <property>/it-autoflight/internal/lookahead-10-sec-mach</property>
<scale>500.0</scale> <scale>500.0</scale>
</input> </input>
<reference> <reference>
@ -953,50 +959,53 @@
<property>/it-autoflight/internal/target-fps</property> <property>/it-autoflight/internal/target-fps</property>
</output> </output>
<config> <config>
<Kp>-3.8</Kp> <Kp>-4.0</Kp>
<beta>1.0</beta>
<alpha>0.1</alpha>
<gamma>0.0</gamma>
<Ti>10.0</Ti> <Ti>10.0</Ti>
<Td>0.0</Td> <Td>0.00001</Td>
<u_min> <u_min>
<condition> <condition>
<greater-than> <greater-than>
<property>/it-autoflight/internal/prof-alt</property> <property>/it-autoflight/internal/prof-alt</property>
<property>/instrumentation/altimeter/indicated-altitude-ft</property> <property>/instrumentation/altimeter/indicated-altitude-ft</property>
</greater-than> </greater-than>
</condition> </condition>
<value>1.6</value> <value>1.6</value>
</u_min> </u_min>
<u_min> <u_min>
<condition> <condition>
<less-than> <less-than>
<property>/it-autoflight/internal/prof-alt</property> <property>/it-autoflight/internal/prof-alt</property>
<property>/instrumentation/altimeter/indicated-altitude-ft</property> <property>/instrumentation/altimeter/indicated-altitude-ft</property>
</less-than> </less-than>
</condition> </condition>
<value>-100</value> <value>-100</value>
</u_min> </u_min>
<u_max> <u_max>
<condition> <condition>
<greater-than> <greater-than>
<property>/it-autoflight/internal/prof-alt</property> <property>/it-autoflight/internal/prof-alt</property>
<property>/instrumentation/altimeter/indicated-altitude-ft</property> <property>/instrumentation/altimeter/indicated-altitude-ft</property>
</greater-than> </greater-than>
</condition> </condition>
<value>166</value> <value>166</value>
</u_max> </u_max>
<u_max> <u_max>
<condition> <condition>
<less-than> <less-than>
<property>/it-autoflight/internal/prof-alt</property> <property>/it-autoflight/internal/prof-alt</property>
<property>/instrumentation/altimeter/indicated-altitude-ft</property> <property>/instrumentation/altimeter/indicated-altitude-ft</property>
</less-than> </less-than>
</condition> </condition>
<value>-1.6</value> <value>-1.6</value>
</u_max> </u_max>
</config> </config>
</pid-controller> </pid-controller>
<pid-controller> <pid-controller>
<name>FPM HOLD</name> <name>V/S HOLD</name>
<debug>false</debug> <debug>false</debug>
<enable> <enable>
<condition> <condition>
@ -1005,29 +1014,15 @@
<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>4</value>
</equals>
<equals>
<property>/it-autoflight/output/vert</property>
<value>7</value>
</equals>
<and> <and>
<equals> <equals>
<property>/it-autoflight/output/vert</property> <property>/it-autoflight/output/vert</property>
<value>8</value> <value>8</value>
</equals> </equals>
<or> <equals>
<equals> <property>/it-autoflight/output/prof-vert</property>
<property>/it-autoflight/output/prof-vert</property> <value>1</value>
<value>1</value> </equals>
</equals>
<equals>
<property>/it-autoflight/output/prof-vert</property>
<value>4</value>
</equals>
</or>
</and> </and>
</or> </or>
</condition> </condition>
@ -1046,31 +1041,6 @@
<property>/it-autoflight/input/vs</property> <property>/it-autoflight/input/vs</property>
<scale>0.01666666</scale> <scale>0.01666666</scale>
</reference> </reference>
<reference>
<condition>
<or>
<equals>
<property>/it-autoflight/output/vert</property>
<value>4</value>
</equals>
<equals>
<property>/it-autoflight/output/vert</property>
<value>7</value>
</equals>
<and>
<equals>
<property>/it-autoflight/output/vert</property>
<value>8</value>
</equals>
<equals>
<property>/it-autoflight/output/prof-vert</property>
<value>4</value>
</equals>
</and>
</or>
</condition>
<property>/it-autoflight/internal/target-fps</property>
</reference>
<reference> <reference>
<condition> <condition>
<and> <and>
@ -1108,6 +1078,61 @@
</config> </config>
</pid-controller> </pid-controller>
<pid-controller>
<name>V/S HOLD</name>
<debug>false</debug>
<enable>
<condition>
<or>
<equals>
<property>/it-autoflight/output/vert</property>
<value>4</value>
</equals>
<equals>
<property>/it-autoflight/output/vert</property>
<value>7</value>
</equals>
<and>
<equals>
<property>/it-autoflight/output/vert</property>
<value>8</value>
</equals>
<equals>
<property>/it-autoflight/output/prof-vert</property>
<value>4</value>
</equals>
</and>
</or>
</condition>
</enable>
<input>
<property>/instrumentation/vertical-speed-indicator/indicated-speed-fpm</property>
<scale>0.01666666</scale>
</input>
<reference>
<property>/it-autoflight/internal/target-fps</property>
</reference>
<output>
<property>/it-autoflight/internal/target-pitch-deg</property>
</output>
<config>
<Kp>
<property>/it-autoflight/config/cmd/flch-vs</property>
</Kp>
<beta>1.0</beta>
<alpha>0.1</alpha>
<gamma>0.0</gamma>
<Ti>5.0</Ti>
<Td>0.00001</Td>
<u_min>
<value>-10</value>
</u_min>
<u_max>
<value>30</value>
</u_max>
</config>
</pid-controller>
<filter> <filter>
<name>IT-CONTROLLER: TARGET PITCH CMD</name> <name>IT-CONTROLLER: TARGET PITCH CMD</name>
<debug>false</debug> <debug>false</debug>