Цифровой расходомер РТ-31.

parent b55e35bf
...@@ -3833,7 +3833,7 @@ ...@@ -3833,7 +3833,7 @@
<animation> <animation>
<type>textranslate</type> <type>textranslate</type>
<object-name>6LO1I 0 l d0</object-name> <object-name>6LO1I 0 l d0</object-name>
<property>instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-d0[0]</property> <property>instrumentation/jsbsim/systems/instr/RT/panel/crt/d0[0]</property>
<axis> <axis>
<x>0.0</x> <x>0.0</x>
<y>1.0</y> <y>1.0</y>
...@@ -3854,7 +3854,7 @@ ...@@ -3854,7 +3854,7 @@
<animation> <animation>
<type>textranslate</type> <type>textranslate</type>
<object-name>6LO1I 0 l d1</object-name> <object-name>6LO1I 0 l d1</object-name>
<property>instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-d1[0]</property> <property>instrumentation/jsbsim/systems/instr/RT/panel/crt/d1[0]</property>
<axis> <axis>
<x>0.0</x> <x>0.0</x>
<y>1.0</y> <y>1.0</y>
...@@ -3875,7 +3875,7 @@ ...@@ -3875,7 +3875,7 @@
<animation> <animation>
<type>textranslate</type> <type>textranslate</type>
<object-name>6LO1I 0 l c</object-name> <object-name>6LO1I 0 l c</object-name>
<property>instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-c[0]</property> <property>instrumentation/jsbsim/systems/instr/RT/panel/crt/c[0]</property>
<axis> <axis>
<x>0.0</x> <x>0.0</x>
<y>1.0</y> <y>1.0</y>
...@@ -3896,7 +3896,7 @@ ...@@ -3896,7 +3896,7 @@
<animation> <animation>
<type>textranslate</type> <type>textranslate</type>
<object-name>6LO1I 1 l d0</object-name> <object-name>6LO1I 1 l d0</object-name>
<property>instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-d0[1]</property> <property>instrumentation/jsbsim/systems/instr/RT/panel/crt/d0[1]</property>
<axis> <axis>
<x>0.0</x> <x>0.0</x>
<y>1.0</y> <y>1.0</y>
...@@ -3917,7 +3917,7 @@ ...@@ -3917,7 +3917,7 @@
<animation> <animation>
<type>textranslate</type> <type>textranslate</type>
<object-name>6LO1I 1 l d1</object-name> <object-name>6LO1I 1 l d1</object-name>
<property>instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-d1[1]</property> <property>instrumentation/jsbsim/systems/instr/RT/panel/crt/d1[1]</property>
<axis> <axis>
<x>0.0</x> <x>0.0</x>
<y>1.0</y> <y>1.0</y>
...@@ -3938,7 +3938,7 @@ ...@@ -3938,7 +3938,7 @@
<animation> <animation>
<type>textranslate</type> <type>textranslate</type>
<object-name>6LO1I 1 l c</object-name> <object-name>6LO1I 1 l c</object-name>
<property>instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-c[1]</property> <property>instrumentation/jsbsim/systems/instr/RT/panel/crt/c[1]</property>
<axis> <axis>
<x>0.0</x> <x>0.0</x>
<y>1.0</y> <y>1.0</y>
...@@ -3959,7 +3959,7 @@ ...@@ -3959,7 +3959,7 @@
<animation> <animation>
<type>textranslate</type> <type>textranslate</type>
<object-name>6LO1I 2 l d0</object-name> <object-name>6LO1I 2 l d0</object-name>
<property>instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-d0[2]</property> <property>instrumentation/jsbsim/systems/instr/RT/panel/crt/d0[2]</property>
<axis> <axis>
<x>0.0</x> <x>0.0</x>
<y>1.0</y> <y>1.0</y>
...@@ -3980,7 +3980,7 @@ ...@@ -3980,7 +3980,7 @@
<animation> <animation>
<type>textranslate</type> <type>textranslate</type>
<object-name>6LO1I 2 l d1</object-name> <object-name>6LO1I 2 l d1</object-name>
<property>instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-d1[2]</property> <property>instrumentation/jsbsim/systems/instr/RT/panel/crt/d1[2]</property>
<axis> <axis>
<x>0.0</x> <x>0.0</x>
<y>1.0</y> <y>1.0</y>
...@@ -4001,7 +4001,7 @@ ...@@ -4001,7 +4001,7 @@
<animation> <animation>
<type>textranslate</type> <type>textranslate</type>
<object-name>6LO1I 2 l c</object-name> <object-name>6LO1I 2 l c</object-name>
<property>instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-c[2]</property> <property>instrumentation/jsbsim/systems/instr/RT/panel/crt/c[2]</property>
<axis> <axis>
<x>0.0</x> <x>0.0</x>
<y>1.0</y> <y>1.0</y>
...@@ -4022,7 +4022,7 @@ ...@@ -4022,7 +4022,7 @@
<animation> <animation>
<type>textranslate</type> <type>textranslate</type>
<object-name>6LO1I 3 l d0</object-name> <object-name>6LO1I 3 l d0</object-name>
<property>instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-d0[3]</property> <property>instrumentation/jsbsim/systems/instr/RT/panel/crt/d0[3]</property>
<axis> <axis>
<x>0.0</x> <x>0.0</x>
<y>1.0</y> <y>1.0</y>
...@@ -4043,7 +4043,7 @@ ...@@ -4043,7 +4043,7 @@
<animation> <animation>
<type>textranslate</type> <type>textranslate</type>
<object-name>6LO1I 3 l d1</object-name> <object-name>6LO1I 3 l d1</object-name>
<property>instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-d1[3]</property> <property>instrumentation/jsbsim/systems/instr/RT/panel/crt/d1[3]</property>
<axis> <axis>
<x>0.0</x> <x>0.0</x>
<y>1.0</y> <y>1.0</y>
...@@ -4064,7 +4064,7 @@ ...@@ -4064,7 +4064,7 @@
<animation> <animation>
<type>textranslate</type> <type>textranslate</type>
<object-name>6LO1I 3 l c</object-name> <object-name>6LO1I 3 l c</object-name>
<property>instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-c[3]</property> <property>instrumentation/jsbsim/systems/instr/RT/panel/crt/c[3]</property>
<axis> <axis>
<x>0.0</x> <x>0.0</x>
<y>1.0</y> <y>1.0</y>
...@@ -4085,7 +4085,7 @@ ...@@ -4085,7 +4085,7 @@
<animation> <animation>
<type>textranslate</type> <type>textranslate</type>
<object-name>6LO1I 4 l d0</object-name> <object-name>6LO1I 4 l d0</object-name>
<property>instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-d0[4]</property> <property>instrumentation/jsbsim/systems/instr/RT/panel/crt/d0[4]</property>
<axis> <axis>
<x>0.0</x> <x>0.0</x>
<y>1.0</y> <y>1.0</y>
...@@ -4106,7 +4106,7 @@ ...@@ -4106,7 +4106,7 @@
<animation> <animation>
<type>textranslate</type> <type>textranslate</type>
<object-name>6LO1I 4 l d1</object-name> <object-name>6LO1I 4 l d1</object-name>
<property>instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-d1[4]</property> <property>instrumentation/jsbsim/systems/instr/RT/panel/crt/d1[4]</property>
<axis> <axis>
<x>0.0</x> <x>0.0</x>
<y>1.0</y> <y>1.0</y>
...@@ -4127,7 +4127,7 @@ ...@@ -4127,7 +4127,7 @@
<animation> <animation>
<type>textranslate</type> <type>textranslate</type>
<object-name>6LO1I 4 l d2</object-name> <object-name>6LO1I 4 l d2</object-name>
<property>instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-d2[4]</property> <property>instrumentation/jsbsim/systems/instr/RT/panel/crt/d2[4]</property>
<axis> <axis>
<x>0.0</x> <x>0.0</x>
<y>1.0</y> <y>1.0</y>
...@@ -4169,7 +4169,7 @@ ...@@ -4169,7 +4169,7 @@
<animation> <animation>
<type>knob</type> <type>knob</type>
<object-name>RT-31 s on</object-name> <object-name>RT-31 s on</object-name>
<property>fdm/jsbsim/propulsion/fuel/panel/switch/RT</property> <property>fdm/jsbsim/systems/instr/RT/panel/switch/run</property>
<factor>56.0</factor> <factor>56.0</factor>
<min-deg>0.0</min-deg> <min-deg>0.0</min-deg>
<max-deg>56.0</max-deg> <max-deg>56.0</max-deg>
...@@ -4186,7 +4186,7 @@ ...@@ -4186,7 +4186,7 @@
<action> <action>
<binding> <binding>
<command>property-adjust</command> <command>property-adjust</command>
<property>fdm/jsbsim/propulsion/fuel/panel/switch/RT</property> <property>fdm/jsbsim/systems/instr/RT/panel/switch/run</property>
<factor>1</factor> <factor>1</factor>
<min>0.0</min> <min>0.0</min>
<max>1.0</max> <max>1.0</max>
...@@ -4204,13 +4204,13 @@ ...@@ -4204,13 +4204,13 @@
<repeatable>false</repeatable> <repeatable>false</repeatable>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>fdm/jsbsim/propulsion/fuel/panel/button/RT-add-d-1</property> <property>fdm/jsbsim/systems/instr/RT/panel/button/set[0]</property>
<value>1</value> <value>1</value>
</binding> </binding>
<mod-up> <mod-up>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>fdm/jsbsim/propulsion/fuel/panel/button/RT-add-d-1</property> <property>fdm/jsbsim/systems/instr/RT/panel/button/set[0]</property>
<value>0</value> <value>0</value>
</binding> </binding>
</mod-up> </mod-up>
...@@ -4219,7 +4219,7 @@ ...@@ -4219,7 +4219,7 @@
<animation> <animation>
<type>translate</type> <type>translate</type>
<object-name>RT-31 b 0</object-name> <object-name>RT-31 b 0</object-name>
<property>fdm/jsbsim/propulsion/fuel/panel/button/RT-add-d-1</property> <property>fdm/jsbsim/systems/instr/RT/panel/button/set[0]</property>
<factor>0.001</factor> <factor>0.001</factor>
<axis> <axis>
<x>0.0</x> <x>0.0</x>
...@@ -4237,13 +4237,13 @@ ...@@ -4237,13 +4237,13 @@
<repeatable>false</repeatable> <repeatable>false</repeatable>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>fdm/jsbsim/propulsion/fuel/panel/button/RT-add-d0</property> <property>fdm/jsbsim/systems/instr/RT/panel/button/set[1]</property>
<value>1</value> <value>1</value>
</binding> </binding>
<mod-up> <mod-up>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>fdm/jsbsim/propulsion/fuel/panel/button/RT-add-d0</property> <property>fdm/jsbsim/systems/instr/RT/panel/button/set[1]</property>
<value>0</value> <value>0</value>
</binding> </binding>
</mod-up> </mod-up>
...@@ -4252,7 +4252,7 @@ ...@@ -4252,7 +4252,7 @@
<animation> <animation>
<type>translate</type> <type>translate</type>
<object-name>RT-31 b 1</object-name> <object-name>RT-31 b 1</object-name>
<property>fdm/jsbsim/propulsion/fuel/panel/button/RT-add-d0</property> <property>fdm/jsbsim/systems/instr/RT/panel/button/set[1]</property>
<factor>0.001</factor> <factor>0.001</factor>
<axis> <axis>
<x>0.0</x> <x>0.0</x>
...@@ -4270,13 +4270,13 @@ ...@@ -4270,13 +4270,13 @@
<repeatable>false</repeatable> <repeatable>false</repeatable>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>fdm/jsbsim/propulsion/fuel/panel/button/RT-add-d1</property> <property>fdm/jsbsim/systems/instr/RT/panel/button/set[2]</property>
<value>1</value> <value>1</value>
</binding> </binding>
<mod-up> <mod-up>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>fdm/jsbsim/propulsion/fuel/panel/button/RT-add-d1</property> <property>fdm/jsbsim/systems/instr/RT/panel/button/set[2]</property>
<value>0</value> <value>0</value>
</binding> </binding>
</mod-up> </mod-up>
...@@ -4285,7 +4285,7 @@ ...@@ -4285,7 +4285,7 @@
<animation> <animation>
<type>translate</type> <type>translate</type>
<object-name>RT-31 b 2</object-name> <object-name>RT-31 b 2</object-name>
<property>fdm/jsbsim/propulsion/fuel/panel/button/RT-add-d1</property> <property>fdm/jsbsim/systems/instr/RT/panel/button/set[2]</property>
<factor>0.001</factor> <factor>0.001</factor>
<axis> <axis>
<x>0.0</x> <x>0.0</x>
......
...@@ -57,19 +57,19 @@ setlistener("/sim/signals/fdm-initialized", func(p) { ...@@ -57,19 +57,19 @@ setlistener("/sim/signals/fdm-initialized", func(p) {
#Tu144.SetFuel(8000.0, 0.0, 0.0, 0.0); #Tu144.SetFuel(8000.0, 0.0, 0.0, 0.0);
}else if(state == "taxi"){ }else if(state == "taxi"){
Tu144.SetFuel(22000.0, 2000.0, 5000.0, 3000.0); Tu144.SetFuel(22000.0, 2000.0, 5000.0, 3000.0);
Tu144.FuelMeterTarget(3, 2, 0); Tu144.FuelMeterFill(32000.0);
}else if(state == "take-off"){ }else if(state == "take-off"){
Tu144.SetFuel(20000.0, 2000.0, 5000.0, 3000.0); Tu144.SetFuel(20000.0, 2000.0, 5000.0, 3000.0);
Tu144.FuelMeterTarget(3, 0, 0); Tu144.FuelMeterFill(30000.0);
}else if(state == "approach"){ }else if(state == "approach"){
Tu144.SetFuel(10000.0, 0.0, 0.0, 0.0); Tu144.SetFuel(10000.0, 0.0, 0.0, 0.0);
Tu144.FuelMeterTarget(1, 0, 0); Tu144.FuelMeterFill(10000.0);
}else if(state == "cruise"){ }else if(state == "cruise"){
Tu144.SetFuel(20000.0, 2000.0, 0.0, 8000.0); Tu144.SetFuel(20000.0, 2000.0, 0.0, 8000.0);
Tu144.FuelMeterTarget(3, 0, 0); Tu144.FuelMeterFill(30000.0);
}else{ }else{
Tu144.SetFuel(20000.0, 0.0, 5000.0, 5000.0); Tu144.SetFuel(20000.0, 0.0, 5000.0, 5000.0);
Tu144.FuelMeterTarget(3, 0, 0); Tu144.FuelMeterFill(30000.0);
} }
if((state == "parked") or (state == "gate")){ if((state == "parked") or (state == "gate")){
......
...@@ -430,19 +430,27 @@ Crossfeeds = func(on) { ...@@ -430,19 +430,27 @@ Crossfeeds = func(on) {
} }
} }
# @brief Set init values for digital fuel meter digits. # @brief Set digital fuel meter fill. Takes 1 second.
# @param tens tens of tons, 0..9 # @param kg Fuel in kg, will be rounded to 100.
# @param ones tons, 0..9 FuelMeterFill = func(kg, reset = 0) {
# @param tenths hundreds of kg, 0..9 setprop("/fdm/jsbsim/systems/instr/RT/init/fill-t", math.round(kg * 0.001, 0.1));
FuelMeterTarget = func(tens, ones, tenths) { var on = 0;
setprop("/fdm/jsbsim/propulsion/fuel/RT/init/d-1", tenths); if(reset){
setprop("/fdm/jsbsim/propulsion/fuel/RT/init/d0", ones); on = getprop("/fdm/jsbsim/systems/instr/RT/panel/switch/run");
setprop("/fdm/jsbsim/propulsion/fuel/RT/init/d1", tens); FuelMeter(0);
}
setprop("/fdm/jsbsim/systems/instr/RT/init/fill-set", 1);
settimer(func {
setprop("/fdm/jsbsim/systems/instr/RT/init/fill-set", 0);
if(reset){
FuelMeter(on);
}
}, 1.0);
} }
# @brief Toggle digital fuel meter. # @brief Toggle digital fuel meter.
FuelMeter = func(on) { FuelMeter = func(on) {
setprop("/fdm/jsbsim/propulsion/fuel/panel/switch/RT", on); setprop("/fdm/jsbsim/systems/instr/RT/panel/switch/run", on);
} }
# @brief Do fuel trim. # @brief Do fuel trim.
......
...@@ -342,21 +342,6 @@ ...@@ -342,21 +342,6 @@
<filter><type>exponential</type><filter-time>0.05</filter-time><input>/fdm/jsbsim/propulsion/engine[4]/panel/light/start-ready</input><output>/instrumentation/jsbsim/propulsion/engine[4]/panel/light/start-ready</output></filter> <filter><type>exponential</type><filter-time>0.05</filter-time><input>/fdm/jsbsim/propulsion/engine[4]/panel/light/start-ready</input><output>/instrumentation/jsbsim/propulsion/engine[4]/panel/light/start-ready</output></filter>
<filter><type>exponential</type><filter-time>0.05</filter-time><input>/fdm/jsbsim/propulsion/engine[4]/panel/light/test-ok</input><output>/instrumentation/jsbsim/propulsion/engine[4]/panel/light/test-ok</output></filter> <filter><type>exponential</type><filter-time>0.05</filter-time><input>/fdm/jsbsim/propulsion/engine[4]/panel/light/test-ok</input><output>/instrumentation/jsbsim/propulsion/engine[4]/panel/light/test-ok</output></filter>
<filter><type>exponential</type><filter-time>0.05</filter-time><input>/fdm/jsbsim/propulsion/fire/panel/light/fire-pilots</input><output>/instrumentation/jsbsim/propulsion/fire/panel/light/fire-pilots</output></filter> <filter><type>exponential</type><filter-time>0.05</filter-time><input>/fdm/jsbsim/propulsion/fire/panel/light/fire-pilots</input><output>/instrumentation/jsbsim/propulsion/fire/panel/light/fire-pilots</output></filter>
<filter><type>gain</type><gain>1.0</gain><input>/fdm/jsbsim/propulsion/fuel/panel/crt/RT-c[0]</input><output>/instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-c[0]</output></filter>
<filter><type>gain</type><gain>1.0</gain><input>/fdm/jsbsim/propulsion/fuel/panel/crt/RT-c[1]</input><output>/instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-c[1]</output></filter>
<filter><type>gain</type><gain>1.0</gain><input>/fdm/jsbsim/propulsion/fuel/panel/crt/RT-c[2]</input><output>/instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-c[2]</output></filter>
<filter><type>gain</type><gain>1.0</gain><input>/fdm/jsbsim/propulsion/fuel/panel/crt/RT-c[3]</input><output>/instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-c[3]</output></filter>
<filter><type>gain</type><gain>1.0</gain><input>/fdm/jsbsim/propulsion/fuel/panel/crt/RT-d0[0]</input><output>/instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-d0[0]</output></filter>
<filter><type>gain</type><gain>1.0</gain><input>/fdm/jsbsim/propulsion/fuel/panel/crt/RT-d0[1]</input><output>/instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-d0[1]</output></filter>
<filter><type>gain</type><gain>1.0</gain><input>/fdm/jsbsim/propulsion/fuel/panel/crt/RT-d0[2]</input><output>/instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-d0[2]</output></filter>
<filter><type>gain</type><gain>1.0</gain><input>/fdm/jsbsim/propulsion/fuel/panel/crt/RT-d0[3]</input><output>/instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-d0[3]</output></filter>
<filter><type>gain</type><gain>1.0</gain><input>/fdm/jsbsim/propulsion/fuel/panel/crt/RT-d0[4]</input><output>/instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-d0[4]</output></filter>
<filter><type>gain</type><gain>1.0</gain><input>/fdm/jsbsim/propulsion/fuel/panel/crt/RT-d1[0]</input><output>/instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-d1[0]</output></filter>
<filter><type>gain</type><gain>1.0</gain><input>/fdm/jsbsim/propulsion/fuel/panel/crt/RT-d1[1]</input><output>/instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-d1[1]</output></filter>
<filter><type>gain</type><gain>1.0</gain><input>/fdm/jsbsim/propulsion/fuel/panel/crt/RT-d1[2]</input><output>/instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-d1[2]</output></filter>
<filter><type>gain</type><gain>1.0</gain><input>/fdm/jsbsim/propulsion/fuel/panel/crt/RT-d1[3]</input><output>/instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-d1[3]</output></filter>
<filter><type>gain</type><gain>1.0</gain><input>/fdm/jsbsim/propulsion/fuel/panel/crt/RT-d1[4]</input><output>/instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-d1[4]</output></filter>
<filter><type>gain</type><gain>1.0</gain><input>/fdm/jsbsim/propulsion/fuel/panel/crt/RT-d2[4]</input><output>/instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-d2[4]</output></filter>
<filter><type>exponential</type><filter-time>0.08</filter-time><input>/fdm/jsbsim/propulsion/fuel/panel/gauge/cg-pMAC</input><output>/instrumentation/jsbsim/propulsion/fuel/panel/gauge/cg-pMAC</output></filter> <filter><type>exponential</type><filter-time>0.08</filter-time><input>/fdm/jsbsim/propulsion/fuel/panel/gauge/cg-pMAC</input><output>/instrumentation/jsbsim/propulsion/fuel/panel/gauge/cg-pMAC</output></filter>
<filter><type>exponential</type><filter-time>0.08</filter-time><input>/fdm/jsbsim/propulsion/fuel/panel/gauge/cg-set-pMAC</input><output>/instrumentation/jsbsim/propulsion/fuel/panel/gauge/cg-set-pMAC</output></filter> <filter><type>exponential</type><filter-time>0.08</filter-time><input>/fdm/jsbsim/propulsion/fuel/panel/gauge/cg-set-pMAC</input><output>/instrumentation/jsbsim/propulsion/fuel/panel/gauge/cg-set-pMAC</output></filter>
<filter><type>exponential</type><filter-time>0.08</filter-time><input>/fdm/jsbsim/propulsion/fuel/panel/gauge/ITD-1-kg</input><output>/instrumentation/jsbsim/propulsion/fuel/panel/gauge/ITD-1-kg</output></filter> <filter><type>exponential</type><filter-time>0.08</filter-time><input>/fdm/jsbsim/propulsion/fuel/panel/gauge/ITD-1-kg</input><output>/instrumentation/jsbsim/propulsion/fuel/panel/gauge/ITD-1-kg</output></filter>
...@@ -541,6 +526,21 @@ ...@@ -541,6 +526,21 @@
<filter><type>exponential</type><filter-time>0.08</filter-time><input>/fdm/jsbsim/systems/instr/DA[1]/gauge/ball-deg</input><output>/instrumentation/jsbsim/systems/instr/DA[1]/gauge/ball-deg</output></filter> <filter><type>exponential</type><filter-time>0.08</filter-time><input>/fdm/jsbsim/systems/instr/DA[1]/gauge/ball-deg</input><output>/instrumentation/jsbsim/systems/instr/DA[1]/gauge/ball-deg</output></filter>
<filter><type>exponential</type><filter-time>0.08</filter-time><input>/fdm/jsbsim/systems/instr/DA[1]/gauge/Habs-dot-m_s</input><output>/instrumentation/jsbsim/systems/instr/DA[1]/gauge/Habs-dot-m_s</output></filter> <filter><type>exponential</type><filter-time>0.08</filter-time><input>/fdm/jsbsim/systems/instr/DA[1]/gauge/Habs-dot-m_s</input><output>/instrumentation/jsbsim/systems/instr/DA[1]/gauge/Habs-dot-m_s</output></filter>
<filter><type>exponential</type><filter-time>0.08</filter-time><input>/fdm/jsbsim/systems/instr/DA[1]/gauge/roll-deg</input><output>/instrumentation/jsbsim/systems/instr/DA[1]/gauge/roll-deg</output></filter> <filter><type>exponential</type><filter-time>0.08</filter-time><input>/fdm/jsbsim/systems/instr/DA[1]/gauge/roll-deg</input><output>/instrumentation/jsbsim/systems/instr/DA[1]/gauge/roll-deg</output></filter>
<filter><type>gain</type><gain>1.0</gain><input>/fdm/jsbsim/systems/instr/RT/panel/crt/c[0]</input><output>/instrumentation/jsbsim/systems/instr/RT/panel/crt/c[0]</output></filter>
<filter><type>gain</type><gain>1.0</gain><input>/fdm/jsbsim/systems/instr/RT/panel/crt/c[1]</input><output>/instrumentation/jsbsim/systems/instr/RT/panel/crt/c[1]</output></filter>
<filter><type>gain</type><gain>1.0</gain><input>/fdm/jsbsim/systems/instr/RT/panel/crt/c[2]</input><output>/instrumentation/jsbsim/systems/instr/RT/panel/crt/c[2]</output></filter>
<filter><type>gain</type><gain>1.0</gain><input>/fdm/jsbsim/systems/instr/RT/panel/crt/c[3]</input><output>/instrumentation/jsbsim/systems/instr/RT/panel/crt/c[3]</output></filter>
<filter><type>gain</type><gain>1.0</gain><input>/fdm/jsbsim/systems/instr/RT/panel/crt/d0[0]</input><output>/instrumentation/jsbsim/systems/instr/RT/panel/crt/d0[0]</output></filter>
<filter><type>gain</type><gain>1.0</gain><input>/fdm/jsbsim/systems/instr/RT/panel/crt/d0[1]</input><output>/instrumentation/jsbsim/systems/instr/RT/panel/crt/d0[1]</output></filter>
<filter><type>gain</type><gain>1.0</gain><input>/fdm/jsbsim/systems/instr/RT/panel/crt/d0[2]</input><output>/instrumentation/jsbsim/systems/instr/RT/panel/crt/d0[2]</output></filter>
<filter><type>gain</type><gain>1.0</gain><input>/fdm/jsbsim/systems/instr/RT/panel/crt/d0[3]</input><output>/instrumentation/jsbsim/systems/instr/RT/panel/crt/d0[3]</output></filter>
<filter><type>gain</type><gain>1.0</gain><input>/fdm/jsbsim/systems/instr/RT/panel/crt/d0[4]</input><output>/instrumentation/jsbsim/systems/instr/RT/panel/crt/d0[4]</output></filter>
<filter><type>gain</type><gain>1.0</gain><input>/fdm/jsbsim/systems/instr/RT/panel/crt/d1[0]</input><output>/instrumentation/jsbsim/systems/instr/RT/panel/crt/d1[0]</output></filter>
<filter><type>gain</type><gain>1.0</gain><input>/fdm/jsbsim/systems/instr/RT/panel/crt/d1[1]</input><output>/instrumentation/jsbsim/systems/instr/RT/panel/crt/d1[1]</output></filter>
<filter><type>gain</type><gain>1.0</gain><input>/fdm/jsbsim/systems/instr/RT/panel/crt/d1[2]</input><output>/instrumentation/jsbsim/systems/instr/RT/panel/crt/d1[2]</output></filter>
<filter><type>gain</type><gain>1.0</gain><input>/fdm/jsbsim/systems/instr/RT/panel/crt/d1[3]</input><output>/instrumentation/jsbsim/systems/instr/RT/panel/crt/d1[3]</output></filter>
<filter><type>gain</type><gain>1.0</gain><input>/fdm/jsbsim/systems/instr/RT/panel/crt/d1[4]</input><output>/instrumentation/jsbsim/systems/instr/RT/panel/crt/d1[4]</output></filter>
<filter><type>gain</type><gain>1.0</gain><input>/fdm/jsbsim/systems/instr/RT/panel/crt/d2[4]</input><output>/instrumentation/jsbsim/systems/instr/RT/panel/crt/d2[4]</output></filter>
<filter><type>exponential</type><filter-time>0.08</filter-time><input>/fdm/jsbsim/systems/instr/TNV/gauge/T-degC</input><output>/instrumentation/jsbsim/systems/instr/TNV/gauge/T-degC</output></filter> <filter><type>exponential</type><filter-time>0.08</filter-time><input>/fdm/jsbsim/systems/instr/TNV/gauge/T-degC</input><output>/instrumentation/jsbsim/systems/instr/TNV/gauge/T-degC</output></filter>
<filter><type>exponential</type><filter-time>0.08</filter-time><input>/fdm/jsbsim/systems/instr/US/gauge/V-km_h</input><output>/instrumentation/jsbsim/systems/instr/US/gauge/V-km_h</output></filter> <filter><type>exponential</type><filter-time>0.08</filter-time><input>/fdm/jsbsim/systems/instr/US/gauge/V-km_h</input><output>/instrumentation/jsbsim/systems/instr/US/gauge/V-km_h</output></filter>
<filter><type>exponential</type><filter-time>0.08</filter-time><input>/fdm/jsbsim/systems/instr/VAR[0]/gauge/Habs-dot-m_s</input><output>/instrumentation/jsbsim/systems/instr/VAR[0]/gauge/Habs-dot-m_s</output></filter> <filter><type>exponential</type><filter-time>0.08</filter-time><input>/fdm/jsbsim/systems/instr/VAR[0]/gauge/Habs-dot-m_s</input><output>/instrumentation/jsbsim/systems/instr/VAR[0]/gauge/Habs-dot-m_s</output></filter>
......
...@@ -342,21 +342,6 @@ ...@@ -342,21 +342,6 @@
<signal><property type="string">/instrumentation/jsbsim/propulsion/engine[4]/panel/light/start-ready</property><type>float</type></signal> <signal><property type="string">/instrumentation/jsbsim/propulsion/engine[4]/panel/light/start-ready</property><type>float</type></signal>
<signal><property type="string">/instrumentation/jsbsim/propulsion/engine[4]/panel/light/test-ok</property><type>float</type></signal> <signal><property type="string">/instrumentation/jsbsim/propulsion/engine[4]/panel/light/test-ok</property><type>float</type></signal>
<signal><property type="string">/instrumentation/jsbsim/propulsion/fire/panel/light/fire-pilots</property><type>float</type></signal> <signal><property type="string">/instrumentation/jsbsim/propulsion/fire/panel/light/fire-pilots</property><type>float</type></signal>
<signal><property type="string">/instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-c[0]</property><type>int</type><interpolation>discrete</interpolation></signal>
<signal><property type="string">/instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-c[1]</property><type>int</type><interpolation>discrete</interpolation></signal>
<signal><property type="string">/instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-c[2]</property><type>int</type><interpolation>discrete</interpolation></signal>
<signal><property type="string">/instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-c[3]</property><type>int</type><interpolation>discrete</interpolation></signal>
<signal><property type="string">/instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-d0[0]</property><type>int</type><interpolation>discrete</interpolation></signal>
<signal><property type="string">/instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-d0[1]</property><type>int</type><interpolation>discrete</interpolation></signal>
<signal><property type="string">/instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-d0[2]</property><type>int</type><interpolation>discrete</interpolation></signal>
<signal><property type="string">/instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-d0[3]</property><type>int</type><interpolation>discrete</interpolation></signal>
<signal><property type="string">/instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-d0[4]</property><type>int</type><interpolation>discrete</interpolation></signal>
<signal><property type="string">/instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-d1[0]</property><type>int</type><interpolation>discrete</interpolation></signal>
<signal><property type="string">/instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-d1[1]</property><type>int</type><interpolation>discrete</interpolation></signal>
<signal><property type="string">/instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-d1[2]</property><type>int</type><interpolation>discrete</interpolation></signal>
<signal><property type="string">/instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-d1[3]</property><type>int</type><interpolation>discrete</interpolation></signal>
<signal><property type="string">/instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-d1[4]</property><type>int</type><interpolation>discrete</interpolation></signal>
<signal><property type="string">/instrumentation/jsbsim/propulsion/fuel/panel/crt/RT-d2[4]</property><type>int</type><interpolation>discrete</interpolation></signal>
<signal><property type="string">/instrumentation/jsbsim/propulsion/fuel/panel/gauge/cg-pMAC</property><type>float</type></signal> <signal><property type="string">/instrumentation/jsbsim/propulsion/fuel/panel/gauge/cg-pMAC</property><type>float</type></signal>
<signal><property type="string">/instrumentation/jsbsim/propulsion/fuel/panel/gauge/cg-set-pMAC</property><type>float</type></signal> <signal><property type="string">/instrumentation/jsbsim/propulsion/fuel/panel/gauge/cg-set-pMAC</property><type>float</type></signal>
<signal><property type="string">/instrumentation/jsbsim/propulsion/fuel/panel/gauge/ITD-1-kg</property><type>float</type></signal> <signal><property type="string">/instrumentation/jsbsim/propulsion/fuel/panel/gauge/ITD-1-kg</property><type>float</type></signal>
...@@ -541,6 +526,21 @@ ...@@ -541,6 +526,21 @@
<signal><property type="string">/instrumentation/jsbsim/systems/instr/DA[1]/gauge/ball-deg</property><type>float</type></signal> <signal><property type="string">/instrumentation/jsbsim/systems/instr/DA[1]/gauge/ball-deg</property><type>float</type></signal>
<signal><property type="string">/instrumentation/jsbsim/systems/instr/DA[1]/gauge/Habs-dot-m_s</property><type>float</type></signal> <signal><property type="string">/instrumentation/jsbsim/systems/instr/DA[1]/gauge/Habs-dot-m_s</property><type>float</type></signal>
<signal><property type="string">/instrumentation/jsbsim/systems/instr/DA[1]/gauge/roll-deg</property><type>float</type></signal> <signal><property type="string">/instrumentation/jsbsim/systems/instr/DA[1]/gauge/roll-deg</property><type>float</type></signal>
<signal><property type="string">/instrumentation/jsbsim/systems/instr/RT/panel/crt/c[0]</property><type>int</type><interpolation>discrete</interpolation></signal>
<signal><property type="string">/instrumentation/jsbsim/systems/instr/RT/panel/crt/c[1]</property><type>int</type><interpolation>discrete</interpolation></signal>
<signal><property type="string">/instrumentation/jsbsim/systems/instr/RT/panel/crt/c[2]</property><type>int</type><interpolation>discrete</interpolation></signal>
<signal><property type="string">/instrumentation/jsbsim/systems/instr/RT/panel/crt/c[3]</property><type>int</type><interpolation>discrete</interpolation></signal>
<signal><property type="string">/instrumentation/jsbsim/systems/instr/RT/panel/crt/d0[0]</property><type>int</type><interpolation>discrete</interpolation></signal>
<signal><property type="string">/instrumentation/jsbsim/systems/instr/RT/panel/crt/d0[1]</property><type>int</type><interpolation>discrete</interpolation></signal>
<signal><property type="string">/instrumentation/jsbsim/systems/instr/RT/panel/crt/d0[2]</property><type>int</type><interpolation>discrete</interpolation></signal>
<signal><property type="string">/instrumentation/jsbsim/systems/instr/RT/panel/crt/d0[3]</property><type>int</type><interpolation>discrete</interpolation></signal>
<signal><property type="string">/instrumentation/jsbsim/systems/instr/RT/panel/crt/d0[4]</property><type>int</type><interpolation>discrete</interpolation></signal>
<signal><property type="string">/instrumentation/jsbsim/systems/instr/RT/panel/crt/d1[0]</property><type>int</type><interpolation>discrete</interpolation></signal>
<signal><property type="string">/instrumentation/jsbsim/systems/instr/RT/panel/crt/d1[1]</property><type>int</type><interpolation>discrete</interpolation></signal>
<signal><property type="string">/instrumentation/jsbsim/systems/instr/RT/panel/crt/d1[2]</property><type>int</type><interpolation>discrete</interpolation></signal>
<signal><property type="string">/instrumentation/jsbsim/systems/instr/RT/panel/crt/d1[3]</property><type>int</type><interpolation>discrete</interpolation></signal>
<signal><property type="string">/instrumentation/jsbsim/systems/instr/RT/panel/crt/d1[4]</property><type>int</type><interpolation>discrete</interpolation></signal>
<signal><property type="string">/instrumentation/jsbsim/systems/instr/RT/panel/crt/d2[4]</property><type>int</type><interpolation>discrete</interpolation></signal>
<signal><property type="string">/instrumentation/jsbsim/systems/instr/TNV/gauge/T-degC</property><type>float</type></signal> <signal><property type="string">/instrumentation/jsbsim/systems/instr/TNV/gauge/T-degC</property><type>float</type></signal>
<signal><property type="string">/instrumentation/jsbsim/systems/instr/US/gauge/V-km_h</property><type>float</type></signal> <signal><property type="string">/instrumentation/jsbsim/systems/instr/US/gauge/V-km_h</property><type>float</type></signal>
<signal><property type="string">/instrumentation/jsbsim/systems/instr/VAR[0]/gauge/Habs-dot-m_s</property><type>float</type></signal> <signal><property type="string">/instrumentation/jsbsim/systems/instr/VAR[0]/gauge/Habs-dot-m_s</property><type>float</type></signal>
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
<property>fcs/NPK/Orbita/clock/time-sec</property> <property>fcs/NPK/Orbita/clock/time-sec</property>
<property>fcs/NPK/Orbita/sensor/fuel/remaining-t</property> <property>systems/instr/RT/fuel-remaining-t</property>
<property>fcs/NPK/Orbita/sensor/fuel/flow-t_h</property> <property>systems/instr/RT/fuel-flow-t_h</property>
<property>fcs/NPK/Orbita/func/Vground/Vground/V_g-km_h</property> <property>fcs/NPK/Orbita/func/Vground/Vground/V_g-km_h</property>
...@@ -25,13 +25,13 @@ ...@@ -25,13 +25,13 @@
<min> <min>
<quotient> <quotient>
<difference> <difference>
<p>fcs/NPK/Orbita/sensor/fuel/remaining-t</p> <p>systems/instr/RT/fuel-remaining-t</p>
<product> <product>
<p>fcs/NPK/Orbita/flightplan/ANZ-kg</p> <p>fcs/NPK/Orbita/flightplan/ANZ-kg</p>
<v>0.001</v> <v>0.001</v>
</product> </product>
</difference> </difference>
<p>fcs/NPK/Orbita/sensor/fuel/flow-t_h</p> <p>systems/instr/RT/fuel-flow-t_h</p>
</quotient> </quotient>
<v>1000.0</v> <v>1000.0</v>
</min> </min>
......
...@@ -253,6 +253,7 @@ ...@@ -253,6 +253,7 @@
<system file="Tu-144-jsbsim/instruments/AChS_3"/> <system file="Tu-144-jsbsim/instruments/AChS_3"/>
--> -->
<system file="Tu-144-jsbsim/instruments/SSTM"/> <system file="Tu-144-jsbsim/instruments/SSTM"/>
<system file="Tu-144-jsbsim/instruments/RT"/>
<system file="Tu-144-jsbsim/comm/SPU"/> <system file="Tu-144-jsbsim/comm/SPU"/>
<system file="Tu-144-jsbsim/comm/Landysh_0"/> <system file="Tu-144-jsbsim/comm/Landysh_0"/>
......
This diff is collapsed.
This diff is collapsed.
...@@ -825,6 +825,7 @@ ...@@ -825,6 +825,7 @@
<input>systems/comm/Micron/elec/DC27-A</input> <input>systems/comm/Micron/elec/DC27-A</input>
<input>systems/comm/SOM/elec/DC27-A</input> <input>systems/comm/SOM/elec/DC27-A</input>
<input>systems/comm/SO/elec/DC27-A</input> <input>systems/comm/SO/elec/DC27-A</input>
<input>systems/instr/RT/elec/DC27-A</input>
</summer> </summer>
......
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