Control: G Improvements

This commit is contained in:
Joshua Davidson 2018-07-12 17:03:28 -04:00
parent 39383623b9
commit 69e93d8a90
3 changed files with 21 additions and 60 deletions

View file

@ -713,61 +713,22 @@
</clipto> </clipto>
</fcs_function> </fcs_function>
<fcs_function name="fbw/pitch/a-n"> <pure_gain name="fbw/pitch/g-instrumented">
<function> <input>/accelerations/pilot-g</input>
<difference> <gain>1.0</gain>
<quotient> </pure_gain>
<sum>
<product>
<property>velocities/q-rad_sec</property>
<property>velocities/u-fps</property>
</product>
<product>
<value>-1</value>
<property>velocities/p-rad_sec</property>
<property>velocities/v-fps</property>
</product>
<product>
<value>32.174</value>
<cos>
<property>attitude/theta-rad</property>
</cos>
<cos>
<property>attitude/phi-rad</property>
</cos>
</product>
<product>
<value>-1</value>
<property>accelerations/wdot-ft_sec2</property>
</product>
</sum>
<value>32.174</value>
</quotient>
<value>1</value>
</difference>
</function>
</fcs_function>
<switch name="fbw/pitch/a-n-IaN">
<default value="0"/>
<test logic="AND" value="fbw/pitch/a-n">
fbw/pitch/a-n lt 30
fbw/pitch/a-n gt -30
position/wow ne 1
</test>
</switch>
<fcs_function name="fbw/pitch/g-computed"> <fcs_function name="fbw/pitch/g-computed">
<function> <function>
<sum> <sum>
<property>fbw/pitch/a-n-IaN</property> <property>fbw/pitch/g-instrumented</property>
<quotient> <quotient>
<value>-1</value> <value>-1</value>
<cos> <cos>
<property>attitude/roll-rad</property> <property>attitude/roll-rad</property>
</cos> </cos>
</quotient> </quotient>
<value>2</value> <value>1</value>
</sum> </sum>
</function> </function>
</fcs_function> </fcs_function>

View file

@ -17,8 +17,8 @@
<test logic="AND" value="9"> <test logic="AND" value="9">
/systems/fuel/only-use-ctr-tank == 0 /systems/fuel/only-use-ctr-tank == 0
/systems/fuel/tank[0]/feed == 1 /systems/fuel/tank[0]/feed == 1
propulsion/tank[0]/contents-lbs GT 0 propulsion/tank[0]/contents-lbs gt 0
propulsion/tank[3]/contents-lbs LT 9 propulsion/tank[3]/contents-lbs lt 9
</test> </test>
</switch> </switch>
@ -26,8 +26,8 @@
<default value="0"/> <default value="0"/>
<test logic="AND" value="9"> <test logic="AND" value="9">
/systems/fuel/tank[1]/feed == 1 /systems/fuel/tank[1]/feed == 1
propulsion/tank[1]/contents-lbs GT 0 propulsion/tank[1]/contents-lbs gt 0
propulsion/tank[3]/contents-lbs LT 9 propulsion/tank[3]/contents-lbs lt 9
</test> </test>
</switch> </switch>
@ -37,9 +37,9 @@
/systems/fuel/x-feed == 1 /systems/fuel/x-feed == 1
/systems/fuel/only-use-ctr-tank == 0 /systems/fuel/only-use-ctr-tank == 0
/systems/fuel/tank[2]/feed == 1 /systems/fuel/tank[2]/feed == 1
propulsion/tank[0]/contents-lbs EQ 0 propulsion/tank[0]/contents-lbs eq 0
propulsion/tank[2]/contents-lbs GT 0 propulsion/tank[2]/contents-lbs gt 0
propulsion/tank[3]/contents-lbs LT 9 propulsion/tank[3]/contents-lbs lt 9
</test> </test>
</switch> </switch>
</channel> </channel>
@ -50,8 +50,8 @@
<test logic="AND" value="9"> <test logic="AND" value="9">
/systems/fuel/only-use-ctr-tank == 0 /systems/fuel/only-use-ctr-tank == 0
/systems/fuel/tank[2]/feed == 1 /systems/fuel/tank[2]/feed == 1
propulsion/tank[2]/contents-lbs GT 0 propulsion/tank[2]/contents-lbs gt 0
propulsion/tank[4]/contents-lbs LT 9 propulsion/tank[4]/contents-lbs lt 9
</test> </test>
</switch> </switch>
@ -59,8 +59,8 @@
<default value="0"/> <default value="0"/>
<test logic="AND" value="9"> <test logic="AND" value="9">
/systems/fuel/tank[1]/feed == 1 /systems/fuel/tank[1]/feed == 1
propulsion/tank[1]/contents-lbs GT 0 propulsion/tank[1]/contents-lbs gt 0
propulsion/tank[4]/contents-lbs LT 9 propulsion/tank[4]/contents-lbs lt 9
</test> </test>
</switch> </switch>
@ -70,9 +70,9 @@
/systems/fuel/x-feed == 1 /systems/fuel/x-feed == 1
/systems/fuel/only-use-ctr-tank == 0 /systems/fuel/only-use-ctr-tank == 0
/systems/fuel/tank[0]/feed == 1 /systems/fuel/tank[0]/feed == 1
propulsion/tank[2]/contents-lbs EQ 0 propulsion/tank[2]/contents-lbs eq 0
propulsion/tank[0]/contents-lbs GT 0 propulsion/tank[0]/contents-lbs gt 0
propulsion/tank[4]/contents-lbs LT 9 propulsion/tank[4]/contents-lbs lt 9
</test> </test>
</switch> </switch>
</channel> </channel>

View file

@ -1 +1 @@
4513 4515