Fix views, ITAF Update

This commit is contained in:
Joshua Davidson 2017-05-16 09:39:49 -04:00
parent 9898db21d6
commit 15527d603d
9 changed files with 100 additions and 28 deletions

View file

@ -31,7 +31,7 @@
<internal archive="y">true</internal>
<config>
<x-offset-m archive="y">-0.45</x-offset-m>
<y-offset-m archive="y">2.29</y-offset-m>
<y-offset-m archive="y">2.32</y-offset-m>
<z-offset-m archive="y">-12.05</z-offset-m>
<pitch-offset-deg archive="y">-12.0</pitch-offset-deg>
<default-field-of-view-deg type="double">60</default-field-of-view-deg>
@ -44,7 +44,7 @@
<config>
<from-model type="bool">true</from-model>
<x-offset-m archive="y">0.45</x-offset-m>
<y-offset-m archive="y">2.29</y-offset-m>
<y-offset-m archive="y">2.32</y-offset-m>
<z-offset-m archive="y">-12.05</z-offset-m>
<pitch-offset-deg archive="y">-12.0</pitch-offset-deg>
<default-field-of-view-deg type="double">60</default-field-of-view-deg>

View file

@ -24,7 +24,7 @@
<internal archive="y">true</internal>
<config>
<x-offset-m archive="y">-0.45</x-offset-m>
<y-offset-m archive="y">2.25</y-offset-m>
<y-offset-m archive="y">2.29</y-offset-m>
<z-offset-m archive="y">-13.75</z-offset-m>
<pitch-offset-deg archive="y">-12.0</pitch-offset-deg>
<default-field-of-view-deg type="double">60</default-field-of-view-deg>
@ -37,7 +37,7 @@
<config>
<from-model type="bool">true</from-model>
<x-offset-m archive="y">0.45</x-offset-m>
<y-offset-m archive="y">2.25</y-offset-m>
<y-offset-m archive="y">2.29</y-offset-m>
<z-offset-m archive="y">-13.75</z-offset-m>
<pitch-offset-deg archive="y">-12.0</pitch-offset-deg>
<default-field-of-view-deg type="double">60</default-field-of-view-deg>

View file

@ -321,7 +321,7 @@
<retard-enable>0</retard-enable> <!-- AGL to Thrust Retard -->
<togaspd>162</togaspd> <!-- V2 + 10kts -->
<lat-agl-ft>30</lat-agl-ft> <!-- Set to 999999 if you do not want T/O to change automatically to HDG, or LNAV -->
<reduc-agl-ft>1450</reduc-agl-ft> <!-- Set to 999999 if you do not want TOGA to change automatically to FLCH -->
<reduc-agl-ft>3000</reduc-agl-ft> <!-- Set to 999999 if you do not want TOGA to change automatically to FLCH -->
</settings>
<output>
<ap1>0</ap1>

View file

@ -24,7 +24,7 @@
<internal archive="y">true</internal>
<config>
<x-offset-m archive="y">-0.45</x-offset-m>
<y-offset-m archive="y">2.29</y-offset-m>
<y-offset-m archive="y">2.32</y-offset-m>
<z-offset-m archive="y">-17.99</z-offset-m>
<pitch-offset-deg archive="y">-12.0</pitch-offset-deg>
<default-field-of-view-deg type="double">60</default-field-of-view-deg>
@ -37,7 +37,7 @@
<config>
<from-model type="bool">true</from-model>
<x-offset-m archive="y">0.45</x-offset-m>
<y-offset-m archive="y">2.29</y-offset-m>
<y-offset-m archive="y">2.32</y-offset-m>
<z-offset-m archive="y">-17.99</z-offset-m>
<pitch-offset-deg archive="y">-12.0</pitch-offset-deg>
<default-field-of-view-deg type="double">60</default-field-of-view-deg>

View file

@ -30,8 +30,8 @@
<internal archive="y">true</internal>
<config>
<x-offset-m archive="y">-0.45</x-offset-m>
<y-offset-m archive="y">2.29</y-offset-m>
<z-offset-m archive="y">-12.10</z-offset-m>
<y-offset-m archive="y">2.32</y-offset-m>
<z-offset-m archive="y">-12.05</z-offset-m>
<pitch-offset-deg archive="y">-12.0</pitch-offset-deg>
<default-field-of-view-deg type="double">60</default-field-of-view-deg>
</config>
@ -43,8 +43,8 @@
<config>
<from-model type="bool">true</from-model>
<x-offset-m archive="y">0.45</x-offset-m>
<y-offset-m archive="y">2.29</y-offset-m>
<z-offset-m archive="y">-12.00</z-offset-m>
<y-offset-m archive="y">2.32</y-offset-m>
<z-offset-m archive="y">-12.05</z-offset-m>
<pitch-offset-deg archive="y">-12.0</pitch-offset-deg>
<default-field-of-view-deg type="double">60</default-field-of-view-deg>
</config>

View file

@ -13,7 +13,7 @@
<turbine_engine name="V2527_A5">
<milthrust> 23000 </milthrust>
<bypassratio> 5.1 </bypassratio>
<bypassratio> 8.1 </bypassratio>
<tsfc> 0.8 </tsfc>
<bleed> 0.03 </bleed>
<idlen1> 23.4 </idlen1>

View file

@ -13,7 +13,7 @@
<turbine_engine name="V2527_A5">
<milthrust> 26600 </milthrust>
<bypassratio> 5.1 </bypassratio>
<bypassratio> 8.1 </bypassratio>
<tsfc> 0.8 </tsfc>
<bleed> 0.03 </bleed>
<idlen1> 23.4 </idlen1>

View file

@ -13,7 +13,7 @@
<turbine_engine name="V2527_A5">
<milthrust> 32000 </milthrust>
<bypassratio> 5.1 </bypassratio>
<bypassratio> 8.1 </bypassratio>
<tsfc> 0.8 </tsfc>
<bleed> 0.03 </bleed>
<idlen1> 23.4 </idlen1>

View file

@ -43,6 +43,15 @@
<filter-gain>0.0</filter-gain>
</predict-simple>
<predict-simple>
<name>IAS 15 SECOND PREDICTOR</name>
<debug>false</debug>
<input>/instrumentation/airspeed-indicator/indicated-speed-kt</input>
<output>/it-autoflight/internal/lookahead-15-sec-airspeed-kt</output>
<seconds>15.0</seconds>
<filter-gain>0.0</filter-gain>
</predict-simple>
<predict-simple>
<name>MACH 5 SECOND PREDICTOR</name>
<debug>false</debug>
@ -61,6 +70,15 @@
<filter-gain>0.0</filter-gain>
</predict-simple>
<predict-simple>
<name>MACH 15 SECOND PREDICTOR</name>
<debug>false</debug>
<input>/instrumentation/airspeed-indicator/indicated-mach</input>
<output>/it-autoflight/internal/lookahead-15-sec-mach</output>
<seconds>15.0</seconds>
<filter-gain>0.0</filter-gain>
</predict-simple>
<!-- =============================================================== -->
<!-- Autopilot Helpers -->
<!-- =============================================================== -->
@ -768,7 +786,7 @@
<value>0</value>
</equals>
</condition>
<property>/it-autoflight/internal/lookahead-10-sec-airspeed-kt</property>
<property>/it-autoflight/internal/lookahead-15-sec-airspeed-kt</property>
</input>
<input>
<condition>
@ -777,7 +795,7 @@
<value>1</value>
</equals>
</condition>
<property>/it-autoflight/internal/lookahead-10-sec-mach</property>
<property>/it-autoflight/internal/lookahead-15-sec-mach</property>
<scale>350.0</scale>
</input>
<reference>
@ -803,7 +821,7 @@
<property>/it-autoflight/internal/target-fpm-b</property>
</output>
<config>
<Kp>-70</Kp>
<Kp>-40</Kp>
<beta>1.0</beta>
<alpha>0.1</alpha>
<gamma>0.0</gamma>
@ -816,7 +834,7 @@
<property>/instrumentation/altimeter/indicated-altitude-ft</property>
</greater-than>
</condition>
<value>100</value>
<value>200</value>
</u_min>
<u_min>
<condition>
@ -843,7 +861,7 @@
<property>/instrumentation/altimeter/indicated-altitude-ft</property>
</less-than>
</condition>
<value>-100</value>
<value>-150</value>
</u_max>
</config>
</pid-controller>
@ -860,7 +878,7 @@
</condition>
</enable>
<input>
<property>/it-autoflight/internal/lookahead-5-sec-airspeed-kt</property>
<property>/it-autoflight/internal/lookahead-10-sec-airspeed-kt</property>
</input>
<reference>
<condition>
@ -884,17 +902,44 @@
<property>/it-autoflight/internal/target-fpm-b</property>
</output>
<config>
<Kp>-70</Kp>
<Kp>-55</Kp>
<beta>1.0</beta>
<alpha>0.1</alpha>
<gamma>0.0</gamma>
<Ti>2.5</Ti>
<Td>0.001</Td>
<u_min>
<value>100</value>
<value>150</value>
</u_min>
<u_max>
<value>10000</value>
<condition>
<and>
<equals>
<property>/gear/gear[1]/wow</property>
<value>0</value>
</equals>
<equals>
<property>/gear/gear[2]/wow</property>
<value>0</value>
</equals>
</and>
</condition>
<value>8000</value>
</u_max>
<u_max>
<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>1000</value>
</u_max>
</config>
</pid-controller>
@ -917,7 +962,7 @@
<value>0</value>
</equals>
</condition>
<property>/it-autoflight/internal/lookahead-10-sec-airspeed-kt</property>
<property>/it-autoflight/internal/lookahead-15-sec-airspeed-kt</property>
</input>
<input>
<condition>
@ -926,7 +971,7 @@
<value>1</value>
</equals>
</condition>
<property>/it-autoflight/internal/lookahead-10-sec-mach</property>
<property>/it-autoflight/internal/lookahead-15-sec-mach</property>
<scale>350.0</scale>
</input>
<reference>
@ -952,7 +997,7 @@
<property>/it-autoflight/internal/target-fpm-b</property>
</output>
<config>
<Kp>-70</Kp>
<Kp>-40</Kp>
<beta>1.0</beta>
<alpha>0.1</alpha>
<gamma>0.0</gamma>
@ -965,7 +1010,7 @@
<property>/instrumentation/altimeter/indicated-altitude-ft</property>
</greater-than>
</condition>
<value>100</value>
<value>200</value>
</u_min>
<u_min>
<condition>
@ -992,7 +1037,7 @@
<property>/instrumentation/altimeter/indicated-altitude-ft</property>
</less-than>
</condition>
<value>-100</value>
<value>-150</value>
</u_max>
</config>
</pid-controller>
@ -1105,8 +1150,35 @@
<value>-10</value>
</u_min>
<u_max>
<condition>
<and>
<equals>
<property>/gear/gear[1]/wow</property>
<value>0</value>
</equals>
<equals>
<property>/gear/gear[2]/wow</property>
<value>0</value>
</equals>
</and>
</condition>
<value>30</value>
</u_max>
<u_max>
<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>10</value>
</u_max>
</config>
</pid-controller>