Merge remote-tracking branch 'upstream/dev' into dev
This commit is contained in:
commit
cf4089d82e
2 changed files with 9 additions and 41 deletions
|
@ -452,7 +452,7 @@ controls.elevatorTrim = func(d) {
|
||||||
if (systems.HYD.Psi.green.getValue() >= 1500) {
|
if (systems.HYD.Psi.green.getValue() >= 1500) {
|
||||||
slewProp("/controls/flight/elevator-trim", d * 0.0185); # Rate in JSB normalized (0.125 / 13.5)
|
slewProp("/controls/flight/elevator-trim", d * 0.0185); # Rate in JSB normalized (0.125 / 13.5)
|
||||||
} else {
|
} else {
|
||||||
slewProp("/controls/flight/elevator-trim", d * 0.0092) # Rate in JSB normalized (0.125 / 13.5)
|
slewProp("/controls/flight/elevator-trim", d * 0.0092) # Rate in JSB normalized (0.125 / 13.5)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -75,51 +75,19 @@
|
||||||
|
|
||||||
<fcs_function name="/systems/navigation/probes/tat-1/compute-tat">
|
<fcs_function name="/systems/navigation/probes/tat-1/compute-tat">
|
||||||
<function>
|
<function>
|
||||||
<difference>
|
<product>
|
||||||
<product>
|
<value>0.995</value> <!-- empirical recovery factor -->
|
||||||
<sum>
|
<property>propulsion/tat-c</property>
|
||||||
<property>/environment/temperature-degc</property> <!-- SAT -->
|
</product>
|
||||||
<value>273.15</value>
|
|
||||||
</sum>
|
|
||||||
<sum>
|
|
||||||
<value>1</value>
|
|
||||||
<product>
|
|
||||||
<value>0.2</value> <!-- ratio of specific heats - 1 / 2 -->
|
|
||||||
<value>0.995</value> <!-- empirical recovery factor -->
|
|
||||||
<pow>
|
|
||||||
<property>velocities/mach</property> <!-- going to use the pure value of mach here and then calculate another value -->
|
|
||||||
<value>2</value>
|
|
||||||
</pow>
|
|
||||||
</product>
|
|
||||||
</sum>
|
|
||||||
</product>
|
|
||||||
<value>273.15</value>
|
|
||||||
</difference>
|
|
||||||
</function>
|
</function>
|
||||||
</fcs_function>
|
</fcs_function>
|
||||||
|
|
||||||
<fcs_function name="/systems/navigation/probes/tat-2/compute-tat">
|
<fcs_function name="/systems/navigation/probes/tat-2/compute-tat">
|
||||||
<function>
|
<function>
|
||||||
<difference>
|
<product>
|
||||||
<product>
|
<value>0.996</value> <!-- empirical recovery factor -->
|
||||||
<sum>
|
<property>propulsion/tat-c</property>
|
||||||
<property>/environment/temperature-degc</property> <!-- SAT -->
|
</product>
|
||||||
<value>273.15</value>
|
|
||||||
</sum>
|
|
||||||
<sum>
|
|
||||||
<value>1</value>
|
|
||||||
<product>
|
|
||||||
<value>0.2</value> <!-- ratio of specific heats - 1 / 2 -->
|
|
||||||
<value>0.996</value> <!-- empirical recovery factor -->
|
|
||||||
<pow>
|
|
||||||
<property>velocities/mach</property> <!-- going to use the pure value of mach here and then calculate another value -->
|
|
||||||
<value>2</value>
|
|
||||||
</pow>
|
|
||||||
</product>
|
|
||||||
</sum>
|
|
||||||
</product>
|
|
||||||
<value>273.15</value>
|
|
||||||
</difference>
|
|
||||||
</function>
|
</function>
|
||||||
</fcs_function>
|
</fcs_function>
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue