fly/fgdata
1
0
Fork 0
Code Activity

Merge branch 'master' of gitorious.org:fg/fgdata

Browse source
This commit is contained in:
Erik Hofman 2012-01-02 19:35:31 +01:00
commit 41e58f6241
7 changed files with 150 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
Aircraft/Instruments-3d/VHF-22/ctl22-com1.xml
View file

@ -254,10 +254,16 @@ Syd Adams
<button>0</button> <button>0</button>
<repeatable>false</repeatable> <repeatable>false</repeatable>
<binding> <binding>
<command>property-swap</command> <condition>
<property>instrumentation/comm/frequencies/selected-mhz</property> <greater-than>
<property>instrumentation/comm/frequencies/standby-mhz</property> <property>systems/electrical/outputs/comm</property>
</binding> <value>1</value>
</greater-than>
</condition>
<command>property-swap</command>
<property>instrumentation/comm/frequencies/selected-mhz</property>
<property>instrumentation/comm/frequencies/standby-mhz</property>
</binding>
</action> </action>
</animation> </animation>
@ -346,6 +352,12 @@ Syd Adams
<repeatable>true</repeatable> <repeatable>true</repeatable>
<interval-sec>0.2</interval-sec> <interval-sec>0.2</interval-sec>
<binding> <binding>
<condition>
<greater-than>
<property>systems/electrical/outputs/comm</property>
<value>1</value>
</greater-than>
</condition>
<command>property-adjust</command> <command>property-adjust</command>
<property>instrumentation/comm/frequencies/standby-mhz</property> <property>instrumentation/comm/frequencies/standby-mhz</property>
<step>-0.025</step> <step>-0.025</step>
@ -364,6 +376,12 @@ Syd Adams
<repeatable>true</repeatable> <repeatable>true</repeatable>
<interval-sec>0.2</interval-sec> <interval-sec>0.2</interval-sec>
<binding> <binding>
<condition>
<greater-than>
<property>systems/electrical/outputs/comm</property>
<value>1</value>
</greater-than>
</condition>
<command>property-adjust</command> <command>property-adjust</command>
<property>instrumentation/comm/frequencies/standby-mhz</property> <property>instrumentation/comm/frequencies/standby-mhz</property>
<step>0.025</step> <step>0.025</step>
@ -382,6 +400,12 @@ Syd Adams
<repeatable>true</repeatable> <repeatable>true</repeatable>
<interval-sec>0.2</interval-sec> <interval-sec>0.2</interval-sec>
<binding> <binding>
<condition>
<greater-than>
<property>systems/electrical/outputs/comm</property>
<value>1</value>
</greater-than>
</condition>
<command>property-adjust</command> <command>property-adjust</command>
<property>instrumentation/comm/frequencies/standby-mhz</property> <property>instrumentation/comm/frequencies/standby-mhz</property>
<step>-0.025</step> <step>-0.025</step>
@ -400,6 +424,12 @@ Syd Adams
<repeatable>true</repeatable> <repeatable>true</repeatable>
<interval-sec>0.2</interval-sec> <interval-sec>0.2</interval-sec>
<binding> <binding>
<condition>
<greater-than>
<property>systems/electrical/outputs/comm</property>
<value>1</value>
</greater-than>
</condition>
<command>property-adjust</command> <command>property-adjust</command>
<property>instrumentation/comm/frequencies/standby-mhz</property> <property>instrumentation/comm/frequencies/standby-mhz</property>
<step>0.025</step> <step>0.025</step>
@ -418,6 +448,12 @@ Syd Adams
<repeatable>true</repeatable> <repeatable>true</repeatable>
<interval-sec>0.2</interval-sec> <interval-sec>0.2</interval-sec>
<binding> <binding>
<condition>
<greater-than>
<property>systems/electrical/outputs/comm</property>
<value>1</value>
</greater-than>
</condition>
<command>property-adjust</command> <command>property-adjust</command>
<property>instrumentation/comm/frequencies/standby-mhz</property> <property>instrumentation/comm/frequencies/standby-mhz</property>
<step>-1.0</step> <step>-1.0</step>
@ -436,6 +472,12 @@ Syd Adams
<repeatable>true</repeatable> <repeatable>true</repeatable>
<interval-sec>0.2</interval-sec> <interval-sec>0.2</interval-sec>
<binding> <binding>
<condition>
<greater-than>
<property>systems/electrical/outputs/comm</property>
<value>1</value>
</greater-than>
</condition>
<command>property-adjust</command> <command>property-adjust</command>
<property>instrumentation/comm/frequencies/standby-mhz</property> <property>instrumentation/comm/frequencies/standby-mhz</property>
<step>1.0</step> <step>1.0</step>
@ -454,6 +496,12 @@ Syd Adams
<repeatable>true</repeatable> <repeatable>true</repeatable>
<interval-sec>0.2</interval-sec> <interval-sec>0.2</interval-sec>
<binding> <binding>
<condition>
<greater-than>
<property>systems/electrical/outputs/comm</property>
<value>1</value>
</greater-than>
</condition>
<command>property-adjust</command> <command>property-adjust</command>
<property>instrumentation/comm/frequencies/standby-mhz</property> <property>instrumentation/comm/frequencies/standby-mhz</property>
<step>-1.0</step> <step>-1.0</step>
@ -472,6 +520,12 @@ Syd Adams
<repeatable>true</repeatable> <repeatable>true</repeatable>
<interval-sec>0.2</interval-sec> <interval-sec>0.2</interval-sec>
<binding> <binding>
<condition>
<greater-than>
<property>systems/electrical/outputs/comm</property>
<value>1</value>
</greater-than>
</condition>
<command>property-adjust</command> <command>property-adjust</command>
<property>instrumentation/comm/frequencies/standby-mhz</property> <property>instrumentation/comm/frequencies/standby-mhz</property>
<step>1.0</step> <step>1.0</step>
@ -482,4 +536,4 @@ Syd Adams
</action> </action>
</animation> </animation>
</PropertyList> </PropertyList>

64
Aircraft/Instruments-3d/VHF-22/ctl22-com2.xml
View file

@ -254,10 +254,16 @@ Syd Adams
<button>0</button> <button>0</button>
<repeatable>false</repeatable> <repeatable>false</repeatable>
<binding> <binding>
<command>property-swap</command> <condition>
<property>instrumentation/comm[1]/frequencies/selected-mhz</property> <greater-than>
<property>instrumentation/comm[1]/frequencies/standby-mhz</property> <property>systems/electrical/outputs/comm[1]</property>
</binding> <value>1</value>
</greater-than>
</condition>
<command>property-swap</command>
<property>instrumentation/comm[1]/frequencies/selected-mhz</property>
<property>instrumentation/comm[1]/frequencies/standby-mhz</property>
</binding>
</action> </action>
</animation> </animation>
@ -346,6 +352,12 @@ Syd Adams
<repeatable>true</repeatable> <repeatable>true</repeatable>
<interval-sec>0.2</interval-sec> <interval-sec>0.2</interval-sec>
<binding> <binding>
<condition>
<greater-than>
<property>systems/electrical/outputs/comm[1]</property>
<value>1</value>
</greater-than>
</condition>
<command>property-adjust</command> <command>property-adjust</command>
<property>instrumentation/comm[1]/frequencies/standby-mhz</property> <property>instrumentation/comm[1]/frequencies/standby-mhz</property>
<step>-0.025</step> <step>-0.025</step>
@ -364,6 +376,12 @@ Syd Adams
<repeatable>true</repeatable> <repeatable>true</repeatable>
<interval-sec>0.2</interval-sec> <interval-sec>0.2</interval-sec>
<binding> <binding>
<condition>
<greater-than>
<property>systems/electrical/outputs/comm[1]</property>
<value>1</value>
</greater-than>
</condition>
<command>property-adjust</command> <command>property-adjust</command>
<property>instrumentation/comm[1]/frequencies/standby-mhz</property> <property>instrumentation/comm[1]/frequencies/standby-mhz</property>
<step>0.025</step> <step>0.025</step>
@ -382,6 +400,12 @@ Syd Adams
<repeatable>true</repeatable> <repeatable>true</repeatable>
<interval-sec>0.2</interval-sec> <interval-sec>0.2</interval-sec>
<binding> <binding>
<condition>
<greater-than>
<property>systems/electrical/outputs/comm[1]</property>
<value>1</value>
</greater-than>
</condition>
<command>property-adjust</command> <command>property-adjust</command>
<property>instrumentation/comm[1]/frequencies/standby-mhz</property> <property>instrumentation/comm[1]/frequencies/standby-mhz</property>
<step>-0.025</step> <step>-0.025</step>
@ -400,6 +424,12 @@ Syd Adams
<repeatable>true</repeatable> <repeatable>true</repeatable>
<interval-sec>0.2</interval-sec> <interval-sec>0.2</interval-sec>
<binding> <binding>
<condition>
<greater-than>
<property>systems/electrical/outputs/comm[1]</property>
<value>1</value>
</greater-than>
</condition>
<command>property-adjust</command> <command>property-adjust</command>
<property>instrumentation/comm[1]/frequencies/standby-mhz</property> <property>instrumentation/comm[1]/frequencies/standby-mhz</property>
<step>0.025</step> <step>0.025</step>
@ -418,6 +448,12 @@ Syd Adams
<repeatable>true</repeatable> <repeatable>true</repeatable>
<interval-sec>0.2</interval-sec> <interval-sec>0.2</interval-sec>
<binding> <binding>
<condition>
<greater-than>
<property>systems/electrical/outputs/comm[1]</property>
<value>1</value>
</greater-than>
</condition>
<command>property-adjust</command> <command>property-adjust</command>
<property>instrumentation/comm[1]/frequencies/standby-mhz</property> <property>instrumentation/comm[1]/frequencies/standby-mhz</property>
<step>-1.0</step> <step>-1.0</step>
@ -436,6 +472,12 @@ Syd Adams
<repeatable>true</repeatable> <repeatable>true</repeatable>
<interval-sec>0.2</interval-sec> <interval-sec>0.2</interval-sec>
<binding> <binding>
<condition>
<greater-than>
<property>systems/electrical/outputs/comm[1]</property>
<value>1</value>
</greater-than>
</condition>
<command>property-adjust</command> <command>property-adjust</command>
<property>instrumentation/comm[1]/frequencies/standby-mhz</property> <property>instrumentation/comm[1]/frequencies/standby-mhz</property>
<step>1.0</step> <step>1.0</step>
@ -454,6 +496,12 @@ Syd Adams
<repeatable>true</repeatable> <repeatable>true</repeatable>
<interval-sec>0.2</interval-sec> <interval-sec>0.2</interval-sec>
<binding> <binding>
<condition>
<greater-than>
<property>systems/electrical/outputs/comm[1]</property>
<value>1</value>
</greater-than>
</condition>
<command>property-adjust</command> <command>property-adjust</command>
<property>instrumentation/comm[1]/frequencies/standby-mhz</property> <property>instrumentation/comm[1]/frequencies/standby-mhz</property>
<step>-1.0</step> <step>-1.0</step>
@ -472,6 +520,12 @@ Syd Adams
<repeatable>true</repeatable> <repeatable>true</repeatable>
<interval-sec>0.2</interval-sec> <interval-sec>0.2</interval-sec>
<binding> <binding>
<condition>
<greater-than>
<property>systems/electrical/outputs/comm[1]</property>
<value>1</value>
</greater-than>
</condition>
<command>property-adjust</command> <command>property-adjust</command>
<property>instrumentation/comm[1]/frequencies/standby-mhz</property> <property>instrumentation/comm[1]/frequencies/standby-mhz</property>
<step>1.0</step> <step>1.0</step>
@ -482,4 +536,4 @@ Syd Adams
</action> </action>
</animation> </animation>
</PropertyList> </PropertyList>

21
Aircraft/c172p/Tutorials/taxiing.xml
View file

@ -103,10 +103,10 @@ For more information on taxiing, see Section 2-9 of the FAA Airplane Flying Hand
<property>/controls/engines/engine/starter</property> <property>/controls/engines/engine/starter</property>
<value>false</value> <value>false</value>
</set> </set>
<message>I've already started the engine. Press Shift-B to release the parking brake, allow the aircraft <message>I've already started the engine. Press Shift-B to release the parking brake. Throttle up to about
to move forward slightly, then hold b to check that the normal brakes work.</message> 20% to move forward slightly, then hold b to check that the normal brakes work.</message>
<error> <error>
<message>Apply the brakes by pressing b</message> <message>Apply the brakes by pressing b.</message>
<condition> <condition>
<and> <and>
<equals> <equals>
@ -133,6 +133,21 @@ For more information on taxiing, see Section 2-9 of the FAA Airplane Flying Hand
</equals> </equals>
</condition> </condition>
</error> </error>
<error>
<message>Throttle up to about 20% to move forward slightly.</message>
<condition>
<and>
<equals>
<property>/controls/gear/brake-parking</property>
<value>0</value>
</equals>
<less-than>
<property>/controls/engines/engine/throttle</property>
<value>0.15</value>
</less-than>
</and>
</condition>
</error>
<exit> <exit>
<condition> <condition>
<and> <and>

1
Input/Joysticks/SpeedLink/black-widow.xml
View file

@ -44,6 +44,7 @@ $Id$
<!--<name type="string">Microsoft-PC-Joysticktreiber</name>--> <!--<name type="string">Microsoft-PC-Joysticktreiber</name>-->
<name type="string">Mega World USB Game Controllers</name> <name type="string">Mega World USB Game Controllers</name>
<name type="string">SpeedLink SL-6640 Black Widow Flight Stick</name> <name type="string">SpeedLink SL-6640 Black Widow Flight Stick</name>
<name type="string">SL-6640 Black Widow Flightstick</name>
<axis> <axis>
<desc type="string">Aileron</desc> <desc type="string">Aileron</desc>
<number> <number>

10
Nasal/fuel.nas
View file

@ -1,3 +1,6 @@
# Fuel handling for the YASim FDM. Note that other FDMs (e.g. JSBSim)
# handle fuel within the FDM itself.
#
# Properties under /consumables/fuel/tank[n]: # Properties under /consumables/fuel/tank[n]:
# + level-lbs - Current fuel load. Can be set by user code. # + level-lbs - Current fuel load. Can be set by user code.
# + selected - boolean indicating tank selection. # + selected - boolean indicating tank selection.
@ -22,9 +25,6 @@ var update = func {
fuel.setDoubleValue(0); fuel.setDoubleValue(0);
} }
if (!consumed_fuel)
return;
var selected_tanks = []; var selected_tanks = [];
foreach (var t; tanks) { foreach (var t; tanks) {
var cap = t.getNode("capacity-gal_us",0); var cap = t.getNode("capacity-gal_us",0);
@ -71,6 +71,10 @@ var fuel_freeze = nil;
_setlistener("/sim/signals/fdm-initialized", func { _setlistener("/sim/signals/fdm-initialized", func {
setlistener("/sim/freeze/fuel", func(n) { fuel_freeze = n.getBoolValue() }, 1); setlistener("/sim/freeze/fuel", func(n) { fuel_freeze = n.getBoolValue() }, 1);
# Fuel sub-system is only used by YASim. Other FDMs (e.g. JSBSim)
# handle fuel themselves.
if (getprop("/sim/flight-model") != "yasim") { return; }
engines = props.globals.getNode("engines", 1).getChildren("engine"); engines = props.globals.getNode("engines", 1).getChildren("engine");
foreach (var e; engines) { foreach (var e; engines) {
e.getNode("fuel-consumed-lbs", 1).setDoubleValue(0); e.getNode("fuel-consumed-lbs", 1).setDoubleValue(0);

2
gui/dialogs/about.xml
View file

@ -74,7 +74,7 @@
</group> </group>
<text> <text>
<label>(c) 1996-2011, the FlightGear Contributors</label> <label>(c) 1996-2012, the FlightGear Contributors</label>
</text> </text>
<group> <group>

8
gui/dialogs/atc-freq-search.xml
View file

@ -17,9 +17,8 @@
<enabled>false</enabled> <enabled>false</enabled>
<legend>ICAO</legend> <legend>ICAO</legend>
<binding> <binding>
<command>property-assign</command> <command>ATC-freq-display</command>
<property>/sim/atc/freq-airport</property> <icao type="string">ICAO</icao>
<value type="string">ICAO</value>
</binding> </binding>
<binding> <binding>
<command>dialog-close</command> <command>dialog-close</command>
@ -60,6 +59,9 @@
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
</binding> </binding>
<binding>
<command>ATC-freq-display</command>
</binding>
<binding> <binding>
<command>dialog-close</command> <command>dialog-close</command>
</binding> </binding>