fly/IDG-A32X
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into ECAM-sys-develop

Browse source
This commit is contained in:
Joshua Davidson 2018-07-25 16:31:39 -04:00
commit d12b4faa0b
3 changed files with 17 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Systems/fmgc-pitch.xml
View file

@ -628,15 +628,13 @@
</not-equals> </not-equals>
</condition> </condition>
<expression> <expression>
<max>
<dif> <dif>
<table>
<property>/orientation/pitch-deg</property> <property>/orientation/pitch-deg</property>
<entry><ind>-10</ind><dep>-5</dep></entry>
<entry><ind> 0</ind><dep> 0</dep></entry>
<entry><ind> 30</ind><dep>35</dep></entry>
</table>
<value>5</value> <value>5</value>
</dif> </dif>
<value>-10</value>
</max>
</expression> </expression>
</u_min> </u_min>
<u_min> <u_min>
@ -662,15 +660,13 @@
</and> </and>
</condition> </condition>
<expression> <expression>
<min>
<sum> <sum>
<table>
<property>/orientation/pitch-deg</property> <property>/orientation/pitch-deg</property>
<entry><ind>-10</ind><dep>-15</dep></entry>
<entry><ind> 0</ind><dep> 0</dep></entry>
<entry><ind> 30</ind><dep> 25</dep></entry>
</table>
<value>5</value> <value>5</value>
</sum> </sum>
<value>30</value>
</min>
</expression> </expression>
</u_max> </u_max>
<u_max> <u_max>

18
Systems/fmgc-thrust.xml
View file

@ -133,22 +133,12 @@
<type>gain</type> <type>gain</type>
<gain>1.0</gain> <gain>1.0</gain>
<input> <input>
<condition> <expression>
<greater-than-equals> <max>
<property>/controls/engines/engine[0]/throttle-man</property> <property>/controls/engines/engine[0]/throttle-man</property>
<property>/controls/engines/engine[1]/throttle-man</property> <property>/controls/engines/engine[1]/throttle-man</property>
</greater-than-equals> </max>
</condition> </expression>
<property>/controls/engines/engine[0]/throttle-man</property>
</input>
<input>
<condition>
<less-than>
<property>/controls/engines/engine[0]/throttle-man</property>
<property>/controls/engines/engine[1]/throttle-man</property>
</less-than>
</condition>
<property>/controls/engines/engine[1]/throttle-man</property>
</input> </input>
<output>/controls/engines/throttle-pid-max</output> <output>/controls/engines/throttle-pid-max</output>
</filter> </filter>

2
revision.txt
View file

@ -1 +1 @@
4613 4614