Выключатели В-200.

parent 3a5232ed
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -223,8 +223,9 @@ APDSelect = func (eng) {
# @brief Start engine on the ground.
# @param eng Engine 0..3.
# @param pump -1: backup, 0: off, 1: main.
# @param relight Relight. If not, start normally.
EngineStart = func (eng, relight = 0) {
EngineStart = func (eng, pump, relight = 0) {
Generator(eng, 0);
AirconEngine(eng, 0);
ThrottleTarget(eng, 0.0);
......@@ -246,6 +247,7 @@ EngineStart = func (eng, relight = 0) {
}, 3.0);
}
settimer(func {
Boostpump(eng, pump);
Generator(eng, 1);
}, 82.0);
}
......@@ -402,14 +404,7 @@ Autoselect = func(on) {
# @param eng Engine number 0..3.
# @param pump -1: backup, 0: off, 1: main.
Boostpump = func(eng, pump) {
# FIXME Replace when 3d is modeled.
setprop("/fdm/jsbsim/propulsion/fuel/panel/switch/boost-pump_1[" ~ eng ~ "]", 0);
setprop("/fdm/jsbsim/propulsion/fuel/panel/switch/boost-pump_2[" ~ eng ~ "]", 0);
if(pump == 1){
setprop("/fdm/jsbsim/propulsion/fuel/panel/switch/boost-pump_1[" ~ eng ~ "]", 1);
}else if(pump == -1){
setprop("/fdm/jsbsim/propulsion/fuel/panel/switch/boost-pump_2[" ~ eng ~ "]", 1);
}
setprop("/fdm/jsbsim/propulsion/fuel/panel/switch/boost-pump[" ~ eng ~ "]", pump);
}
# @brief Set boost pump for all engines.
......@@ -711,21 +706,21 @@ PreTaxi = func {
AirconOff();
setprop("/systems/ground-supply/dialog/hot-air-unit", 0);
# FIXME for() does not work inside settimer, they all get the final index.
EngineStart(0);
EngineStart(0, 0);
settimer(func {
EngineStart(1);
EngineStart(1, 0);
gui.popupTip("Starting engine 2.");
}, 85.0);
}, 90.0);
settimer(func {
EngineStart(2);
EngineStart(2, 0);
gui.popupTip("Starting engine 3.");
TrimTargetTakeoff();
TrimDo();
}, 170.0);
}, 180.0);
settimer(func {
EngineStart(3);
EngineStart(3, 0);
gui.popupTip("Starting engine 4.");
}, 255.0);
}, 270.0);
settimer(func {
ElecDefault();
for(var ii = 0; ii < 4; ii += 1){
......@@ -745,7 +740,7 @@ PreTaxi = func {
APUPower(0);
gui.popupTip("Ready to taxi.");
}, 60.0);
}, 340.0);
}, 360.0);
}
......
......@@ -162,16 +162,6 @@
<property>&T2R;/contents-kg</property>
<property>&T8;/contents-kg</property>
<!-- UI -->
<property>&U;/panel/switch/boost-pump_1[0]</property>
<property>&U;/panel/switch/boost-pump_2[0]</property>
<property>&U;/panel/switch/boost-pump_1[1]</property>
<property>&U;/panel/switch/boost-pump_2[1]</property>
<property>&U;/panel/switch/boost-pump_1[2]</property>
<property>&U;/panel/switch/boost-pump_2[2]</property>
<property>&U;/panel/switch/boost-pump_1[3]</property>
<property>&U;/panel/switch/boost-pump_2[3]</property>
<channel name="Status" execrate="4">
......@@ -279,8 +269,14 @@
<function>
<product>
<sum>
<min><p>&TF1;/boost-pump</p><v>1.0</v></min>
<min><p>&TF2;/boost-pump</p><v>1.0</v></min>
<nq>
<p>&TF1;/boost-pump</p>
<v>0</v>
</nq>
<nq>
<p>&TF2;/boost-pump</p>
<v>0</v>
</nq>
<product>
<p>&U;/elec/AC200-ok[1]</p>
<sum>
......@@ -304,8 +300,14 @@
<function>
<product>
<sum>
<min><p>&TF3;/boost-pump</p><v>1.0</v></min>
<min><p>&TF4;/boost-pump</p><v>1.0</v></min>
<nq>
<p>&TF3;/boost-pump</p>
<v>0</v>
</nq>
<nq>
<p>&TF4;/boost-pump</p>
<v>0</v>
</nq>
<product>
<p>&U;/elec/AC200-ok[2]</p>
<sum>
......@@ -451,8 +453,12 @@
<v>1.25</v>
</product>
<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] -->
<nq>
<p>&TF1;/boost-pump</p>
<v>0</v>
</nq>
<!-- = 64 m^3/h = 14.2 kg/s [Pumps] -->
<v>31.306</v>
</product>
</max>
<table>
......@@ -653,8 +659,12 @@
<v>1.25</v>
</product>
<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] -->
<nq>
<p>&TF2;/boost-pump</p>
<v>0</v>
</nq>
<!-- = 64 m^3/h = 14.2 kg/s [Pumps] -->
<v>31.306</v>
</product>
</max>
<table>
......@@ -853,8 +863,12 @@
<v>1.25</v>
</product>
<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] -->
<nq>
<p>&TF3;/boost-pump</p>
<v>0</v>
</nq>
<!-- = 64 m^3/h = 14.2 kg/s [Pumps] -->
<v>31.306</v>
</product>
</max>
<table>
......@@ -1053,8 +1067,12 @@
<v>1.25</v>
</product>
<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] -->
<nq>
<p>&TF4;/boost-pump</p>
<v>0</v>
</nq>
<!-- = 64 m^3/h = 14.2 kg/s [Pumps] -->
<v>31.306</v>
</product>
</max>
<table>
......@@ -2986,7 +3004,7 @@
&U;/panel/button/test-lights NE 0
</test>
<test logic="AND" value="&U;/status/standby">
&TF1;/boost-pump EQ 2
&TF1;/boost-pump EQ -1
</test>
</switch>
......@@ -3057,7 +3075,7 @@
&U;/panel/button/test-lights NE 0
</test>
<test logic="AND" value="&U;/status/standby">
&TF2;/boost-pump EQ 2
&TF2;/boost-pump EQ -1
</test>
</switch>
......@@ -3128,7 +3146,7 @@
&U;/panel/button/test-lights NE 0
</test>
<test logic="AND" value="&U;/status/standby">
&TF3;/boost-pump EQ 2
&TF3;/boost-pump EQ -1
</test>
</switch>
......@@ -3199,7 +3217,7 @@
&U;/panel/button/test-lights NE 0
</test>
<test logic="AND" value="&U;/status/standby">
&TF4;/boost-pump EQ 2
&TF4;/boost-pump EQ -1
</test>
</switch>
......@@ -3798,49 +3816,4 @@
<channel name="Kludges" execrate="8">
<switch name="&U;/panel/switch/boost-pump[0]">
<default value="0"/>
<test value="1">
&U;/panel/switch/boost-pump_1[0] NE 0
</test>
<test value="2">
&U;/panel/switch/boost-pump_2[0] NE 0
</test>
</switch>
<switch name="&U;/panel/switch/boost-pump[1]">
<default value="0"/>
<test value="1">
&U;/panel/switch/boost-pump_1[1] NE 0
</test>
<test value="2">
&U;/panel/switch/boost-pump_2[1] NE 0
</test>
</switch>
<switch name="&U;/panel/switch/boost-pump[2]">
<default value="0"/>
<test value="1">
&U;/panel/switch/boost-pump_1[2] NE 0
</test>
<test value="2">
&U;/panel/switch/boost-pump_2[2] NE 0
</test>
</switch>
<switch name="&U;/panel/switch/boost-pump[3]">
<default value="0"/>
<test value="1">
&U;/panel/switch/boost-pump_1[3] NE 0
</test>
<test value="2">
&U;/panel/switch/boost-pump_2[3] NE 0
</test>
</switch>
</channel>
</system>
......@@ -501,24 +501,12 @@
<!-- INPUTS (GUI) -->
<property value="1">&U;/panel/switch/auto-1</property>
<property>&U;/panel/switch/auto-2</property>
<property>&U;/panel/pot/ramp-norm_</property>
<property>&U;/panel/pot/spill-norm_</property>
<channel name="GUI kludges" execrate="8">
<switch name="&U;/panel/switch/auto">
<default value="0"/>
<test value="1">
&U;/panel/switch/auto-1 NE 0
</test>
<test value="-1">
&U;/panel/switch/auto-2 NE 0
</test>
</switch>
<switch name="&U;/panel/pot/ramp-norm">
<default value="&U;/panel/pot/ramp-norm_"/>
<clipto><min>0.0</min><max>1.0</max></clipto>
......
......@@ -501,24 +501,12 @@
<!-- INPUTS (GUI) -->
<property value="1">&U;/panel/switch/auto-1</property>
<property>&U;/panel/switch/auto-2</property>
<property>&U;/panel/pot/ramp-norm_</property>
<property>&U;/panel/pot/spill-norm_</property>
<channel name="GUI kludges" execrate="8">
<switch name="&U;/panel/switch/auto">
<default value="0"/>
<test value="1">
&U;/panel/switch/auto-1 NE 0
</test>
<test value="-1">
&U;/panel/switch/auto-2 NE 0
</test>
</switch>
<switch name="&U;/panel/pot/ramp-norm">
<default value="&U;/panel/pot/ramp-norm_"/>
<clipto><min>0.0</min><max>1.0</max></clipto>
......
......@@ -501,24 +501,12 @@
<!-- INPUTS (GUI) -->
<property value="1">&U;/panel/switch/auto-1</property>
<property>&U;/panel/switch/auto-2</property>
<property>&U;/panel/pot/ramp-norm_</property>
<property>&U;/panel/pot/spill-norm_</property>
<channel name="GUI kludges" execrate="8">
<switch name="&U;/panel/switch/auto">
<default value="0"/>
<test value="1">
&U;/panel/switch/auto-1 NE 0
</test>
<test value="-1">
&U;/panel/switch/auto-2 NE 0
</test>
</switch>
<switch name="&U;/panel/pot/ramp-norm">
<default value="&U;/panel/pot/ramp-norm_"/>
<clipto><min>0.0</min><max>1.0</max></clipto>
......
......@@ -501,24 +501,12 @@
<!-- INPUTS (GUI) -->
<property value="1">&U;/panel/switch/auto-1</property>
<property>&U;/panel/switch/auto-2</property>
<property>&U;/panel/pot/ramp-norm_</property>
<property>&U;/panel/pot/spill-norm_</property>
<channel name="GUI kludges" execrate="8">
<switch name="&U;/panel/switch/auto">
<default value="0"/>
<test value="1">
&U;/panel/switch/auto-1 NE 0
</test>
<test value="-1">
&U;/panel/switch/auto-2 NE 0
</test>
</switch>
<switch name="&U;/panel/pot/ramp-norm">
<default value="&U;/panel/pot/ramp-norm_"/>
<clipto><min>0.0</min><max>1.0</max></clipto>
......
......@@ -156,8 +156,8 @@
<property>&U;/panel/switch/AC200-gen[2]</property><!-- 0: off, 1: on, -1: test -->
<property>&U;/panel/switch/AC200-gen[3]</property><!-- 0: off, 1: on, -1: test -->
<property>&U;/panel/switch/AC200-gen[4]</property><!-- 0: off, 1: on, -1: test -->
<property>&U;/panel/switch/AC200-parallel[1]</property>
<property>&U;/panel/switch/AC200-parallel[4]</property>
<property value="1">&U;/panel/switch/AC200-parallel[1]</property>
<property value="1">&U;/panel/switch/AC200-parallel[4]</property>
<property value="1">&U;/panel/switch/AC200-join[1]</property>
<property value="1">&U;/panel/switch/AC200-join[2]</property>
<!-- -1: backup, 0: off, 1: main -->
......
......@@ -74,82 +74,7 @@
</group>
</group>
<group><layout>hbox</layout>
<group><layout>vbox</layout>
<group><layout>hbox</layout>
<text><label>1 Engine 2</label></text>
<text><label>3 Engine 4</label></text>
</group>
<text><label>Boost pumps</label></text>
<text><label>Main</label></text>
<group><layout>hbox</layout>
<checkbox>
<property>/fdm/jsbsim/propulsion/fuel/panel/switch/boost-pump_1[0]</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</checkbox>
<checkbox>
<property>/fdm/jsbsim/propulsion/fuel/panel/switch/boost-pump_1[1]</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</checkbox>
<checkbox>
<property>/fdm/jsbsim/propulsion/fuel/panel/switch/boost-pump_1[2]</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</checkbox>
<checkbox>
<property>/fdm/jsbsim/propulsion/fuel/panel/switch/boost-pump_1[3]</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</checkbox>
</group>
<group><layout>hbox</layout>
<checkbox>
<property>/fdm/jsbsim/propulsion/fuel/panel/switch/boost-pump_2[0]</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</checkbox>
<checkbox>
<property>/fdm/jsbsim/propulsion/fuel/panel/switch/boost-pump_2[1]</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</checkbox>
<checkbox>
<property>/fdm/jsbsim/propulsion/fuel/panel/switch/boost-pump_2[2]</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</checkbox>
<checkbox>
<property>/fdm/jsbsim/propulsion/fuel/panel/switch/boost-pump_2[3]</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</checkbox>
</group>
<text><label>Backup</label></text>
<text><label>Crossfeed valves</label></text>
<group><layout>hbox</layout>
<checkbox>
<property>/fdm/jsbsim/propulsion/fuel/panel/switch/crossfeed[0]</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</checkbox>
<checkbox>
<property>/fdm/jsbsim/propulsion/fuel/panel/switch/crossfeed[1]</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</checkbox>
<checkbox>
<property>/fdm/jsbsim/propulsion/fuel/panel/switch/crossfeed[2]</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</checkbox>
<checkbox>
<property>/fdm/jsbsim/propulsion/fuel/panel/switch/crossfeed[3]</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</checkbox>
</group>
</group>
<group><layout>vbox</layout>
<text><label>3</label></text>
<input>
......@@ -185,63 +110,62 @@
</input>
<text><label>Sum (max. 100000)</label></text>
</group>
<group><layout>vbox</layout>
<text><label>Fuel meter</label></text>
<input>
<property>/fdm/jsbsim/propulsion/fuel/panel/gauge/meter-t</property>
<live>true</live>
</input>
<text><label>t</label></text>
<group><layout>hbox</layout>
<button>
<pref-width>24</pref-width>
<pref-height>24</pref-height>
<legend>10</legend>
<property>/fdm/jsbsim/propulsion/fuel/panel/button/meter-add-d1</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</button>
<button>
<pref-width>24</pref-width>
<pref-height>24</pref-height>
<legend>1</legend>
<property>/fdm/jsbsim/propulsion/fuel/panel/button/meter-add-d0</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</button>
<button>
<pref-width>24</pref-width>
<pref-height>24</pref-height>
<legend>0,1</legend>
<property>/fdm/jsbsim/propulsion/fuel/panel/button/meter-add-d-1</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</button>
</group>
<text><label>On</label></text>
<checkbox>
<property>/fdm/jsbsim/propulsion/fuel/panel/switch/meter</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</checkbox>
<text><label>Reset</label></text>
<text><label>Feed display</label></text>
<combo>
<pref-width>55</pref-width>
<pref-height>25</pref-height>
<value>1</value>
<value>2</value>
<value>3</value>
<value>4</value>
<property>/fdm/jsbsim/propulsion/fuel/panel/switch/feed-display</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</combo>
</group>
<empty><stretch>true</stretch></empty>
</group>
</group>
<!-- FUEL 3 -->
<group><layout>vbox</layout>
<empty><stretch>true</stretch></empty>
<text><label>Fuel meter</label></text>
<input>
<property>/fdm/jsbsim/propulsion/fuel/panel/gauge/meter-t</property>
<live>true</live>
</input>
<text><label>t</label></text>
<group><layout>hbox</layout>
<button>
<pref-width>24</pref-width>
<pref-height>24</pref-height>
<legend>10</legend>
<property>/fdm/jsbsim/propulsion/fuel/panel/button/meter-add-d1</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</button>
<button>
<pref-width>24</pref-width>
<pref-height>24</pref-height>
<legend>1</legend>
<property>/fdm/jsbsim/propulsion/fuel/panel/button/meter-add-d0</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</button>
<button>
<pref-width>24</pref-width>
<pref-height>24</pref-height>
<legend>0,1</legend>
<property>/fdm/jsbsim/propulsion/fuel/panel/button/meter-add-d-1</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</button>
</group>
<text><label>On</label></text>
<checkbox>
<property>/fdm/jsbsim/propulsion/fuel/panel/switch/meter</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</checkbox>
<text><label>Reset</label></text>
<text><label>Feed display</label></text>
<combo>
<pref-width>55</pref-width>
<pref-height>25</pref-height>
<value>1</value>
<value>2</value>
<value>3</value>
<value>4</value>
<property>/fdm/jsbsim/propulsion/fuel/panel/switch/feed-display</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</combo>
</group>
<group><layout>vbox</layout>
<button>
<legend/>
......
......@@ -48,23 +48,6 @@
<text><label>Manual</label></text>
</group>
</group>
<group><layout>hbox</layout>
<group><layout>vbox</layout>
<text><label>Ramp Auto</label></text>
<text><label>Main</label></text>
<checkbox>
<property>/fdm/jsbsim/propulsion/inlet[0]/panel/switch/auto-1</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</checkbox>
<checkbox>
<property>/fdm/jsbsim/propulsion/inlet[0]/panel/switch/auto-2</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</checkbox>
<text><label>Backup</label></text>
</group>
</group>
</group>
<group><layout>vbox</layout>
......@@ -112,23 +95,6 @@
<text><label>Manual</label></text>
</group>
</group>
<group><layout>hbox</layout>
<group><layout>vbox</layout>
<text><label>Ramp Auto</label></text>
<text><label>Main</label></text>
<checkbox>
<property>/fdm/jsbsim/propulsion/inlet[1]/panel/switch/auto-1</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</checkbox>
<checkbox>
<property>/fdm/jsbsim/propulsion/inlet[1]/panel/switch/auto-2</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</checkbox>
<text><label>Backup</label></text>
</group>
</group>
</group>
<group><layout>vbox</layout>
......@@ -176,23 +142,6 @@
<text><label>Manual</label></text>
</group>
</group>
<group><layout>hbox</layout>
<group><layout>vbox</layout>
<text><label>Ramp Auto</label></text>
<text><label>Main</label></text>
<checkbox>
<property>/fdm/jsbsim/propulsion/inlet[2]/panel/switch/auto-1</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</checkbox>
<checkbox>
<property>/fdm/jsbsim/propulsion/inlet[2]/panel/switch/auto-2</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</checkbox>
<text><label>Backup</label></text>
</group>
</group>
</group>
<group><layout>vbox</layout>
......@@ -240,23 +189,6 @@
<text><label>Manual</label></text>
</group>
</group>
<group><layout>hbox</layout>
<group><layout>vbox</layout>
<text><label>Ramp Auto</label></text>
<text><label>Main</label></text>
<checkbox>
<property>/fdm/jsbsim/propulsion/inlet[3]/panel/switch/auto-1</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</checkbox>
<checkbox>
<property>/fdm/jsbsim/propulsion/inlet[3]/panel/switch/auto-2</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</checkbox>
<text><label>Backup</label></text>
</group>
</group>
</group>
<group><layout>vbox</layout>
......
......@@ -71,54 +71,6 @@
<text><label>~200V</label></text>
<text><label>Right</label></text>
</group>
<group><layout>hbox</layout>
<text><label>1</label></text>
<text><label>Gen.</label></text>
<text><label>2</label></text>
<text><label>Join</label></text>
<text><label>APU</label></text>
<text><label>GPU</label></text>
<text><label>3</label></text>
<text><label>Gen.</label></text>
<text><label>4</label></text>
</group>
<group><layout>hbox</layout>
<checkbox>
<property>/fdm/jsbsim/systems/elec/panel/switch/AC200-gen[1]</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</checkbox>
<checkbox>
<property>/fdm/jsbsim/systems/elec/panel/switch/AC200-gen[2]</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</checkbox>
<checkbox>
<property>/fdm/jsbsim/systems/elec/panel/switch/AC200-join</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</checkbox>
<checkbox>
<property>/fdm/jsbsim/systems/elec/panel/switch/APU</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</checkbox>
<checkbox>
<property>/fdm/jsbsim/systems/elec/panel/switch/GPU</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</checkbox>
<checkbox>
<property>/fdm/jsbsim/systems/elec/panel/switch/AC200-gen[3]</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</checkbox>
<checkbox>
<property>/fdm/jsbsim/systems/elec/panel/switch/AC200-gen[4]</property>
<live>true</live>
<binding><command>dialog-apply</command></binding>
</checkbox>
</group>
<group><layout>hbox</layout>
<input>
<property>/fdm/jsbsim/systems/elec/panel/gauge/AC200-A[1]</property>
......
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