Commit dab98bba authored by Михаил Данилов's avatar Михаил Данилов 💬

СУИТ1-2Б: исправлено неотключение струйных насосов автоматом перекачки.

parent 5ad69199
......@@ -14,8 +14,6 @@
# @param tanks2 Fuel in tanks 2 (fine front trim), kg.
# @param tank8 Fuel in tank 8 (tail trim), kg.
SetFuel = func(main, tanks1, tanks2, tank8) {
# FIXME Remove when autoselect is unbugged.
Autoselect(0);
# FIXME This fueling panel logic belongs to JSBSim.
var maxmain = 80000.0;
var maxfeed = 2300.0;
......@@ -60,10 +58,6 @@ SetFuel = func(main, tanks1, tanks2, tank8) {
setprop("/consumables/fuel/tank[" ~ i ~ "]/level-kg", tanks2 / 2);
}
setprop("/consumables/fuel/tank[15]/level-kg", tank8);
# FIXME Remove when autoselect is unbugged.
settimer(func {
Autoselect(1);
}, 1.0);
}
......@@ -746,6 +740,7 @@ PreTaxi = func {
APDSelect(-1);
APUBleed(0);
CanardPower(1);
ConePower(1);
settimer(func {
APUStartStop(0);
APUPower(0);
......
......@@ -26,14 +26,14 @@
]>
<system name="Tu-144 fuel system"><!-- See also: propulsion.xml -->
<!-- Control system: SUIT1-2B -->
<!-- Система управления и индикации топлива СУИТ1-2Б -->
<!-- Consumption system: [Bliznyuk p. 132] -->
<!-- Boost pumps: ECN-321M (ATsM-64), 2 per engine. One backup jet pump [Bliznyuk, p. 133]. Also one ECN in tank 6 and 8. -->
<!-- Boost pumps: ЭЦН-321М (АЦМ-64), 2 per and one backup jet pump per engine [Bliznyuk, p. 133]. Also one ЭЦН in tank 6 and 8. -->
<!--
Pump performance [Pumps]
ATsMS 64 64 m^3/h = 14.2 kg/s
SN 4 1.7 m^3/h = 0.377 kg/s
SN 8 8 m^3/h = 1.77 kg/s
АЦМ 64 64 m^3/h = 14.2 kg/s
СН 4 1.7 m^3/h = 0.377 kg/s
СН 8 8 m^3/h = 1.77 kg/s
-->
<!-- Last fuel (~300 kg) is picked up by smaller jet pump. -->
......@@ -446,11 +446,11 @@
<function>
<product>
<max>
<product><!-- SN-3F -->
<product><!-- СН-3Ф -->
<p>&E1;/fuel-flow-rate-pps</p>
<v>1.25</v>
</product>
<product><!-- ATsMS 64 -->
<product><!-- АЦМС 64 -->
<min><p>&TF1;/boost-pump</p><v>1.0</v></min>
<v>31.306</v><!-- = 64 m^3/h = 14.2 kg/s [Pumps] -->
</product>
......@@ -648,11 +648,11 @@
<function>
<product>
<max>
<product><!-- SN-3F -->
<product><!-- СН-3Ф -->
<p>&E2;/fuel-flow-rate-pps</p>
<v>1.25</v>
</product>
<product><!-- ATsMS 64 -->
<product><!-- АЦМС 64 -->
<min><p>&TF2;/boost-pump</p><v>1.0</v></min>
<v>31.306</v><!-- = 64 m^3/h = 14.2 kg/s [Pumps] -->
</product>
......@@ -848,11 +848,11 @@
<function>
<product>
<max>
<product><!-- SN-3F -->
<product><!-- СН-3Ф -->
<p>&E3;/fuel-flow-rate-pps</p>
<v>1.25</v>
</product>
<product><!-- ATsMS 64 -->
<product><!-- АЦМС 64 -->
<min><p>&TF3;/boost-pump</p><v>1.0</v></min>
<v>31.306</v><!-- = 64 m^3/h = 14.2 kg/s [Pumps] -->
</product>
......@@ -1048,11 +1048,11 @@
<function>
<product>
<max>
<product><!-- SN-3F -->
<product><!-- СН-3Ф -->
<p>&E4;/fuel-flow-rate-pps</p>
<v>1.25</v>
</product>
<product><!-- ATsMS 64 -->
<product><!-- АЦМС 64 -->
<min><p>&TF4;/boost-pump</p><v>1.0</v></min>
<v>31.306</v><!-- = 64 m^3/h = 14.2 kg/s [Pumps] -->
</product>
......@@ -1310,14 +1310,13 @@
</fcs_function>
<switch name="&T6;/out-valve[0]">
<default value="&T6;/out-valve[0]"/>
<default value="&U;/panel/switch/select-6[0]"/>
<test value="&T6;/out-valve[0]">
&U;/status/standby EQ 0
</test>
<test value="1">
&U;/autoselect/program[0] EQ 6
</test>
<test value="&U;/panel/switch/select-6[0]">
&U;/panel/switch/autoselect EQ 0
&U;/status/standby NE 0
</test>
</switch>
<!-- -->
<fcs_function name="&T6;/out-flow-pps[0]">
......@@ -1332,14 +1331,13 @@
</fcs_function>
<switch name="&T6;/out-valve[1]">
<default value="&T6;/out-valve[1]"/>
<default value="&U;/panel/switch/select-6[1]"/>
<test value="&T6;/out-valve[1]">
&U;/status/standby EQ 0
</test>
<test value="1">
&U;/autoselect/program[1] EQ 6
</test>
<test value="&U;/panel/switch/select-6[1]">
&U;/panel/switch/autoselect EQ 0
&U;/status/standby NE 0
</test>
</switch>
<!-- -->
<fcs_function name="&T6;/out-flow-pps[1]">
......@@ -1354,14 +1352,13 @@
</fcs_function>
<switch name="&T6;/out-valve[2]">
<default value="&T6;/out-valve[2]"/>
<default value="&U;/panel/switch/select-6[2]"/>
<test value="&T6;/out-valve[2]">
&U;/status/standby EQ 0
</test>
<test value="1">
&U;/autoselect/program[2] EQ 6
</test>
<test value="&U;/panel/switch/select-6[2]">
&U;/panel/switch/autoselect EQ 0
&U;/status/standby NE 0
</test>
</switch>
<!-- -->
<fcs_function name="&T6;/out-flow-pps[2]">
......@@ -1376,14 +1373,13 @@
</fcs_function>
<switch name="&T6;/out-valve[3]">
<default value="&T6;/out-valve[3]"/>
<default value="&U;/panel/switch/select-6[3]"/>
<test value="&T6;/out-valve[3]">
&U;/status/standby EQ 0
</test>
<test value="1">
&U;/autoselect/program[3] EQ 6
</test>
<test value="&U;/panel/switch/select-6[3]">
&U;/panel/switch/autoselect EQ 0
&U;/status/standby NE 0
</test>
</switch>
<!-- -->
<fcs_function name="&T6;/out-flow-pps[3]">
......@@ -1485,14 +1481,13 @@
</fcs_function>
<switch name="&T4L;/out-valve[0]">
<default value="&T4L;/out-valve[0]"/>
<default value="&U;/panel/switch/select-4[0]"/>
<test value="&T4L;/out-valve[0]">
&U;/status/standby EQ 0
</test>
<test value="1">
&U;/autoselect/program[0] EQ 4
</test>
<test value="&U;/panel/switch/select-4[0]">
&U;/panel/switch/autoselect EQ 0
&U;/status/standby NE 0
</test>
</switch>
<!-- -->
<fcs_function name="&T4L;/out-flow-pps[0]">
......@@ -1507,14 +1502,13 @@
</fcs_function>
<switch name="&T4L;/out-valve[1]">
<default value="&T4L;/out-valve[1]"/>
<default value="&U;/panel/switch/select-4[1]"/>
<test value="&T4L;/out-valve[1]">
&U;/status/standby EQ 0
</test>
<test value="1">
&U;/autoselect/program[1] EQ 4
</test>
<test value="&U;/panel/switch/select-4[1]">
&U;/panel/switch/autoselect EQ 0
&U;/status/standby NE 0
</test>
</switch>
<!-- -->
<fcs_function name="&T4L;/out-flow-pps[1]">
......@@ -1580,14 +1574,13 @@
</fcs_function>
<switch name="&T4R;/out-valve[2]">
<default value="&T4R;/out-valve[2]"/>
<default value="&U;/panel/switch/select-4[2]"/>
<test value="&T4R;/out-valve[2]">
&U;/status/standby EQ 0
</test>
<test value="1">
&U;/autoselect/program[2] EQ 4
</test>
<test value="&U;/panel/switch/select-4[2]">
&U;/panel/switch/autoselect EQ 0
&U;/status/standby NE 0
</test>
</switch>
<!-- -->
<fcs_function name="&T4R;/out-flow-pps[2]">
......@@ -1602,14 +1595,13 @@
</fcs_function>
<switch name="&T4R;/out-valve[3]">
<default value="&T4R;/out-valve[3]"/>
<default value="&U;/panel/switch/select-4[3]"/>
<test value="&T4R;/out-valve[3]">
&U;/status/standby EQ 0
</test>
<test value="1">
&U;/autoselect/program[3] EQ 4
</test>
<test value="&U;/panel/switch/select-4[3]">
&U;/panel/switch/autoselect EQ 0
&U;/status/standby NE 0
</test>
</switch>
<!-- -->
<fcs_function name="&T4R;/out-flow-pps[3]">
......@@ -1677,14 +1669,13 @@
</fcs_function>
<switch name="&T3;/out-valve[1]">
<default value="&T3;/out-valve[1]"/>
<default value="&U;/panel/switch/select-3[1]"/>
<test value="&T3;/out-valve[1]">
&U;/status/standby EQ 0
</test>
<test value="1">
&U;/autoselect/program[1] EQ 3
</test>
<test value="&U;/panel/switch/select-3[1]">
&U;/panel/switch/autoselect EQ 0
&U;/status/standby NE 0
</test>
</switch>
<!-- -->
<fcs_function name="&T3;/out-flow-pps[1]">
......@@ -1699,14 +1690,13 @@
</fcs_function>
<switch name="&T3;/out-valve[2]">
<default value="&T3;/out-valve[2]"/>
<default value="&U;/panel/switch/select-3[2]"/>
<test value="&T3;/out-valve[2]">
&U;/status/standby EQ 0
</test>
<test value="1">
&U;/autoselect/program[2] EQ 3
</test>
<test value="&U;/panel/switch/select-3[2]">
&U;/panel/switch/autoselect EQ 0
&U;/status/standby NE 0
</test>
</switch>
<!-- -->
<fcs_function name="&T3;/out-flow-pps[2]">
......@@ -1747,14 +1737,13 @@
</fcs_function>
<switch name="&T7;/out-valve[0]">
<default value="&T7;/out-valve[0]"/>
<default value="&U;/panel/switch/select-7[0]"/>
<test value="&T7;/out-valve[0]">
&U;/status/standby EQ 0
</test>
<test value="1">
&U;/autoselect/program[0] EQ 7
</test>
<test value="&U;/panel/switch/select-7[0]">
&U;/panel/switch/autoselect EQ 0
&U;/status/standby NE 0
</test>
</switch>
<!-- -->
<fcs_function name="&T7;/out-flow-pps[0]">
......@@ -1769,14 +1758,13 @@
</fcs_function>
<switch name="&T7;/out-valve[3]">
<default value="&T7;/out-valve[3]"/>
<default value="&U;/panel/switch/select-7[3]"/>
<test value="&T7;/out-valve[3]">
&U;/status/standby EQ 0
</test>
<test value="1">
&U;/autoselect/program[3] EQ 7
</test>
<test value="&U;/panel/switch/select-7[3]">
&U;/panel/switch/autoselect EQ 0
&U;/status/standby NE 0
</test>
</switch>
<!-- -->
<fcs_function name="&T7;/out-flow-pps[3]">
......@@ -1818,14 +1806,13 @@
</fcs_function>
<switch name="&T5L;/out-valve[0]">
<default value="&T5L;/out-valve[0]"/>
<default value="&U;/panel/switch/select-5[0]"/>
<test value="&T5L;/out-valve[0]">
&U;/status/standby EQ 0
</test>
<test value="1">
&U;/autoselect/program[0] EQ 5
</test>
<test value="&U;/panel/switch/select-5[0]">
&U;/panel/switch/autoselect EQ 0
&U;/status/standby NE 0
</test>
</switch>
<!-- -->
<fcs_function name="&T5L;/out-flow-pps[0]">
......@@ -1865,14 +1852,13 @@
</fcs_function>
<switch name="&T5R;/out-valve[3]">
<default value="&T5R;/out-valve[3]"/>
<default value="&U;/panel/switch/select-5[3]"/>
<test value="&T5R;/out-valve[3]">
&U;/status/standby EQ 0
</test>
<test value="1">
&U;/autoselect/program[3] EQ 5
</test>
<test value="&U;/panel/switch/select-5[3]">
&U;/panel/switch/autoselect EQ 0
&U;/status/standby NE 0
</test>
</switch>
<!-- -->
<fcs_function name="&T5R;/out-flow-pps[3]">
......@@ -3294,10 +3280,8 @@
<switch name="&U;/panel/light/auto-fault">
<default value="0"/>
<test value="&U;/status/standby">
&U;/panel/button/test-lights NE 0
</test>
<test logic="OR" value="&U;/status/standby">
&U;/panel/button/test-lights NE 0
&U;/autoselect/program[0] EQ 0
&U;/autoselect/program[1] EQ 0
&U;/autoselect/program[2] EQ 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment