A3XX: A/THR issues fixed

This commit is contained in:
Joshua Davidson 2017-12-02 20:40:00 -05:00
parent 457a8075b0
commit 644ec49c61
2 changed files with 157 additions and 13 deletions

View file

@ -152,14 +152,17 @@
</input>
<output>/controls/engines/throttle-pid-max</output>
</filter>
<!-- Auto throttle -->
<pid-controller>
<name>IAS THR</name>
<name>IT-CONTROLLER: IAS THRUST</name>
<debug>false</debug>
<enable>
<condition>
<and>
<equals>
<property>/it-autoflight/output/athr</property>
<value>1</value>
</equals>
<equals>
<property>/it-autoflight/input/kts-mach</property>
<value>0</value>
@ -188,6 +191,24 @@
<value>0</value>
</equals>
</or>
<or>
<equals>
<property>/systems/thrust/state1</property>
<value>MAN</value>
</equals>
<equals>
<property>/systems/thrust/state1</property>
<value>CL</value>
</equals>
<equals>
<property>/systems/thrust/state2</property>
<value>MAN</value>
</equals>
<equals>
<property>/systems/thrust/state2</property>
<value>CL</value>
</equals>
</or>
</and>
</condition>
</enable>
@ -215,14 +236,17 @@
</u_max>
</config>
</pid-controller>
<!-- Auto throttle (Mach Hold)-->
<pid-controller>
<name>MACH THR</name>
<name>IT-CONTROLLER: MACH THRUST</name>
<debug>false</debug>
<enable>
<condition>
<and>
<equals>
<property>/it-autoflight/output/athr</property>
<value>1</value>
</equals>
<equals>
<property>/it-autoflight/input/kts-mach</property>
<value>1</value>
@ -251,6 +275,24 @@
<value>0</value>
</equals>
</or>
<or>
<equals>
<property>/systems/thrust/state1</property>
<value>MAN</value>
</equals>
<equals>
<property>/systems/thrust/state1</property>
<value>CL</value>
</equals>
<equals>
<property>/systems/thrust/state2</property>
<value>MAN</value>
</equals>
<equals>
<property>/systems/thrust/state2</property>
<value>CL</value>
</equals>
</or>
</and>
</condition>
</enable>
@ -280,16 +322,19 @@
</u_max>
</config>
</pid-controller>
<!-- IDLE THR -->
<filter>
<name>IDLE</name>
<name>IT-CONTROLLER: IDLE THRUST</name>
<debug>false</debug>
<type>gain</type>
<gain>1.0</gain>
<enable>
<condition>
<and>
<equals>
<property>/it-autoflight/output/athr</property>
<value>1</value>
</equals>
<or>
<equals>
<property>/it-autoflight/output/fd1</property>
@ -312,6 +357,24 @@
<property>/it-autoflight/output/thr-mode</property>
<value>1</value>
</equals>
<or>
<equals>
<property>/systems/thrust/state1</property>
<value>MAN</value>
</equals>
<equals>
<property>/systems/thrust/state1</property>
<value>CL</value>
</equals>
<equals>
<property>/systems/thrust/state2</property>
<value>MAN</value>
</equals>
<equals>
<property>/systems/thrust/state2</property>
<value>CL</value>
</equals>
</or>
</and>
</condition>
</enable>
@ -331,16 +394,19 @@
<property>/controls/engines/throttle-cmd-pid</property>
</output>
</filter>
<!-- CLB THR -->
<filter>
<name>CLB</name>
<name>IT-CONTROLLER: LIMIT THRUST</name>
<debug>false</debug>
<type>gain</type>
<gain>1.0</gain>
<enable>
<condition>
<and>
<equals>
<property>/it-autoflight/output/athr</property>
<value>1</value>
</equals>
<or>
<equals>
<property>/it-autoflight/output/fd1</property>
@ -363,6 +429,24 @@
<property>/it-autoflight/output/thr-mode</property>
<value>2</value>
</equals>
<or>
<equals>
<property>/systems/thrust/state1</property>
<value>MAN</value>
</equals>
<equals>
<property>/systems/thrust/state1</property>
<value>CL</value>
</equals>
<equals>
<property>/systems/thrust/state2</property>
<value>MAN</value>
</equals>
<equals>
<property>/systems/thrust/state2</property>
<value>CL</value>
</equals>
</or>
</and>
</condition>
</enable>
@ -374,6 +458,66 @@
</output>
</filter>
<filter>
<name>IT-CONTROLLER: FEEDBACK IF DISABLED</name>
<debug>false</debug>
<type>gain</type>
<gain>1.0</gain>
<enable>
<condition>
<or>
<equals>
<property>/it-autoflight/output/athr</property>
<value>0</value>
</equals>
<and>
<not-equals>
<property>/systems/thrust/state1</property>
<value>MAN</value>
</not-equals>
<not-equals>
<property>/systems/thrust/state1</property>
<value>CL</value>
</not-equals>
<not-equals>
<property>/systems/thrust/state2</property>
<value>MAN</value>
</not-equals>
<not-equals>
<property>/systems/thrust/state2</property>
<value>CL</value>
</not-equals>
</and>
</or>
</condition>
</enable>
<input>
<condition>
<and>
<not-equals>
<property>/systems/thrust/state1</property>
<value>IDLE</value>
</not-equals>
<not-equals>
<property>/systems/thrust/state2</property>
<value>IDLE</value>
</not-equals>
</and>
</condition>
<value>1</value>
</input>
<input>0</input>
<output>
<property>/controls/engines/throttle-cmd-pid</property>
</output>
<min>
<property>/controls/engines/idle-limit</property>
</min>
<max>
<property>/controls/engines/throttle-pid-max</property>
</max>
</filter>
<!-- Engine 1 -->
<filter>
<name>Thrust Filter 1</name>

View file

@ -1 +1 @@
4053
4057