improve FBW, make MAN RAT button work in Hydraulic panel, make rat work properly

This commit is contained in:
Joshua Davidson 2017-05-31 14:14:08 -04:00
parent 2bb9b41156
commit 1a6fa687f4
5 changed files with 115 additions and 65 deletions

View file

@ -1010,6 +1010,24 @@
</condition> </condition>
</animation> </animation>
<animation>
<name>RAT MAN pick</name>
<type>pick</type>
<object-name>RATMan</object-name>
<action>
<button>0</button>
<repeatable>false</repeatable>
<binding>
<command>property-toggle</command>
<property>/controls/hydraulic/rat-man</property>
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
</binding>
</action>
</animation>
<animation> <animation>
<name>Blue Elec Pump pick</name> <name>Blue Elec Pump pick</name>
<type>pick</type> <type>pick</type>

View file

@ -4,7 +4,7 @@
<sim> <sim>
<model> <model>
<livery> <livery>
<name>jetBlue</name> <name>JetBlue Airways</name>
<texture>Liveries/A321/IAE/jetBlue.png</texture> <texture>Liveries/A321/IAE/jetBlue.png</texture>
</livery> </livery>
</model> </model>

View file

@ -191,18 +191,26 @@
<condition> <condition>
<and> <and>
<or> <or>
<greater-than-equals> <and>
<property>/systems/hydraulic/green-psi</property> <greater-than-equals>
<value>1500</value> <property>/systems/hydraulic/green-psi</property>
</greater-than-equals> <value>1500</value>
<greater-than-equals> </greater-than-equals>
<property>/systems/hydraulic/blue-psi</property> <greater-than-equals>
<value>1500</value> <property>/systems/hydraulic/blue-psi</property>
</greater-than-equals> <value>1500</value>
<greater-than-equals> </greater-than-equals>
<property>/systems/hydraulic/yellow-psi</property> </and>
<value>1500</value> <and>
</greater-than-equals> <greater-than-equals>
<property>/systems/hydraulic/blue-psi</property>
<value>1500</value>
</greater-than-equals>
<greater-than-equals>
<property>/systems/hydraulic/yellow-psi</property>
<value>1500</value>
</greater-than-equals>
</and>
</or> </or>
<not-equals> <not-equals>
<property>/controls/flight/speedbrake-lever</property> <property>/controls/flight/speedbrake-lever</property>
@ -243,18 +251,26 @@
<input> <input>
<condition> <condition>
<or> <or>
<greater-than-equals> <and>
<property>/systems/hydraulic/green-psi</property> <greater-than-equals>
<value>1500</value> <property>/systems/hydraulic/green-psi</property>
</greater-than-equals> <value>1500</value>
<greater-than-equals> </greater-than-equals>
<property>/systems/hydraulic/blue-psi</property> <greater-than-equals>
<value>1500</value> <property>/systems/hydraulic/blue-psi</property>
</greater-than-equals> <value>1500</value>
<greater-than-equals> </greater-than-equals>
<property>/systems/hydraulic/yellow-psi</property> </and>
<value>1500</value> <and>
</greater-than-equals> <greater-than-equals>
<property>/systems/hydraulic/blue-psi</property>
<value>1500</value>
</greater-than-equals>
<greater-than-equals>
<property>/systems/hydraulic/yellow-psi</property>
<value>1500</value>
</greater-than-equals>
</and>
</or> </or>
</condition> </condition>
<expression> <expression>
@ -275,7 +291,7 @@
<type>noise-spike</type> <type>noise-spike</type>
<input>/controls/flight/spoiler-left-cmd</input> <input>/controls/flight/spoiler-left-cmd</input>
<output>/controls/flight/spoiler-left</output> <output>/controls/flight/spoiler-left</output>
<max-rate-of-change>1.5</max-rate-of-change> <max-rate-of-change>1.0</max-rate-of-change>
</filter> </filter>
<filter> <filter>
@ -286,18 +302,26 @@
<condition> <condition>
<and> <and>
<or> <or>
<greater-than-equals> <and>
<property>/systems/hydraulic/green-psi</property> <greater-than-equals>
<value>1500</value> <property>/systems/hydraulic/green-psi</property>
</greater-than-equals> <value>1500</value>
<greater-than-equals> </greater-than-equals>
<property>/systems/hydraulic/blue-psi</property> <greater-than-equals>
<value>1500</value> <property>/systems/hydraulic/blue-psi</property>
</greater-than-equals> <value>1500</value>
<greater-than-equals> </greater-than-equals>
<property>/systems/hydraulic/yellow-psi</property> </and>
<value>1500</value> <and>
</greater-than-equals> <greater-than-equals>
<property>/systems/hydraulic/blue-psi</property>
<value>1500</value>
</greater-than-equals>
<greater-than-equals>
<property>/systems/hydraulic/yellow-psi</property>
<value>1500</value>
</greater-than-equals>
</and>
</or> </or>
<not-equals> <not-equals>
<property>/controls/flight/speedbrake-lever</property> <property>/controls/flight/speedbrake-lever</property>
@ -338,18 +362,26 @@
<input> <input>
<condition> <condition>
<or> <or>
<greater-than-equals> <and>
<property>/systems/hydraulic/green-psi</property> <greater-than-equals>
<value>1500</value> <property>/systems/hydraulic/green-psi</property>
</greater-than-equals> <value>1500</value>
<greater-than-equals> </greater-than-equals>
<property>/systems/hydraulic/blue-psi</property> <greater-than-equals>
<value>1500</value> <property>/systems/hydraulic/blue-psi</property>
</greater-than-equals> <value>1500</value>
<greater-than-equals> </greater-than-equals>
<property>/systems/hydraulic/yellow-psi</property> </and>
<value>1500</value> <and>
</greater-than-equals> <greater-than-equals>
<property>/systems/hydraulic/blue-psi</property>
<value>1500</value>
</greater-than-equals>
<greater-than-equals>
<property>/systems/hydraulic/yellow-psi</property>
<value>1500</value>
</greater-than-equals>
</and>
</or> </or>
</condition> </condition>
<expression> <expression>
@ -370,7 +402,7 @@
<type>noise-spike</type> <type>noise-spike</type>
<input>/controls/flight/spoiler-right-cmd</input> <input>/controls/flight/spoiler-right-cmd</input>
<output>/controls/flight/spoiler-right</output> <output>/controls/flight/spoiler-right</output>
<max-rate-of-change>1.5</max-rate-of-change> <max-rate-of-change>1.0</max-rate-of-change>
</filter> </filter>
<filter> <filter>

View file

@ -106,11 +106,11 @@
<property>/controls/flight/aileron-fbw-cmd</property> <property>/controls/flight/aileron-fbw-cmd</property>
</output> </output>
<config> <config>
<Kp>0.14</Kp> <Kp>0.12</Kp>
<beta>1</beta> <beta>1</beta>
<alpha>0.1</alpha> <alpha>0.1</alpha>
<gamma>0</gamma> <gamma>0</gamma>
<Ti>5</Ti> <Ti>10</Ti>
<Td>0.005</Td> <Td>0.005</Td>
<u_min>-1</u_min> <u_min>-1</u_min>
<u_max>1</u_max> <u_max>1</u_max>
@ -247,11 +247,11 @@
<property>/controls/flight/elevator-fbw-cmd</property> <property>/controls/flight/elevator-fbw-cmd</property>
</output> </output>
<config> <config>
<Kp>-0.25</Kp> <Kp>-0.22</Kp>
<beta>1</beta> <beta>1</beta>
<alpha>0.1</alpha> <alpha>0.1</alpha>
<gamma>0</gamma> <gamma>0</gamma>
<Ti>5</Ti> <Ti>10</Ti>
<Td>0.005</Td> <Td>0.005</Td>
<u_min>-1</u_min> <u_min>-1</u_min>
<u_max>1</u_max> <u_max>1</u_max>

View file

@ -39,17 +39,17 @@
<independentVar lookup="row">/controls/flight/aileron</independentVar> <independentVar lookup="row">/controls/flight/aileron</independentVar>
<tableData> <tableData>
-1.0 -0.1 -1.0 -0.1
-0.7 -0.05 -0.7 -0.07
-0.5 -0.02 -0.5 -0.045
-0.3 -0.011 -0.3 -0.022
-0.15 -0.004 -0.15 -0.008
-0.05 -0.0015 -0.05 -0.003
0.00 0.000 0.00 0.000
0.05 0.0015 0.05 0.003
0.15 0.004 0.15 0.008
0.3 0.011 0.3 0.022
0.5 0.02 0.5 0.045
0.7 0.05 0.7 0.07
1.0 0.1 1.0 0.1
</tableData> </tableData>
</table> </table>