fly/A320-family
1
0
Fork 0
Code Activity

GIT: Fix conflict

Browse source
This commit is contained in:
Josh Davidson 2020-12-01 11:52:16 -05:00
parent 3c73dcb13c
commit 80ab329761
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
AircraftConfig/fbw.xml
View file

@ -198,7 +198,7 @@
<vertical>true</vertical>
<property>/fdm/jsbsim/hydraulics/elevator-l/final-deg</property>
<min>-30</min>
<max>17</max>
<max>15</max>
<step>0.003</step>
<live>true</live>
</slider>
@ -232,7 +232,7 @@
<vertical>true</vertical>
<property>/fdm/jsbsim/hydraulics/elevator-r/final-deg</property>
<min>-30</min>
<max>17</max>
<max>15</max>
<step>0.003</step>
<live>true</live>
</slider>

5
Systems/a320-fcs.xml
View file

@ -370,16 +370,11 @@
<channel name="Pitch Trim">
<<<<<<< HEAD
<switch name="hydraulics/stabilizer/rate">
<default value="0.125"/>
=======
<switch name="hydraulics/elevator-trim/rate">
<default value="0"/> <!-- only mechanical input to hyd actuator. So it does need hydraulic power -->
<test value="0">
/systems/failures/fctl/ths-jam eq 1
</test>
>>>>>>> 3D
<test logic="OR" value="0.25">
/systems/hydraulic/yellow-psi ge 1500
/systems/hydraulic/green-psi ge 1500