diff --git a/Aircraft/Instruments-3d/VHF-22/ctl22-com1.xml b/Aircraft/Instruments-3d/VHF-22/ctl22-com1.xml index 526531869..93be263e7 100644 --- a/Aircraft/Instruments-3d/VHF-22/ctl22-com1.xml +++ b/Aircraft/Instruments-3d/VHF-22/ctl22-com1.xml @@ -254,10 +254,16 @@ Syd Adams false - property-swap - instrumentation/comm/frequencies/selected-mhz - instrumentation/comm/frequencies/standby-mhz - + + + systems/electrical/outputs/comm + 1 + + + property-swap + instrumentation/comm/frequencies/selected-mhz + instrumentation/comm/frequencies/standby-mhz + @@ -346,6 +352,12 @@ Syd Adams true 0.2 + + + systems/electrical/outputs/comm + 1 + + property-adjust instrumentation/comm/frequencies/standby-mhz -0.025 @@ -364,6 +376,12 @@ Syd Adams true 0.2 + + + systems/electrical/outputs/comm + 1 + + property-adjust instrumentation/comm/frequencies/standby-mhz 0.025 @@ -382,6 +400,12 @@ Syd Adams true 0.2 + + + systems/electrical/outputs/comm + 1 + + property-adjust instrumentation/comm/frequencies/standby-mhz -0.025 @@ -400,6 +424,12 @@ Syd Adams true 0.2 + + + systems/electrical/outputs/comm + 1 + + property-adjust instrumentation/comm/frequencies/standby-mhz 0.025 @@ -418,6 +448,12 @@ Syd Adams true 0.2 + + + systems/electrical/outputs/comm + 1 + + property-adjust instrumentation/comm/frequencies/standby-mhz -1.0 @@ -436,6 +472,12 @@ Syd Adams true 0.2 + + + systems/electrical/outputs/comm + 1 + + property-adjust instrumentation/comm/frequencies/standby-mhz 1.0 @@ -454,6 +496,12 @@ Syd Adams true 0.2 + + + systems/electrical/outputs/comm + 1 + + property-adjust instrumentation/comm/frequencies/standby-mhz -1.0 @@ -472,6 +520,12 @@ Syd Adams true 0.2 + + + systems/electrical/outputs/comm + 1 + + property-adjust instrumentation/comm/frequencies/standby-mhz 1.0 @@ -482,4 +536,4 @@ Syd Adams - \ No newline at end of file + diff --git a/Aircraft/Instruments-3d/VHF-22/ctl22-com2.xml b/Aircraft/Instruments-3d/VHF-22/ctl22-com2.xml index efe3c57ce..0a109cbce 100644 --- a/Aircraft/Instruments-3d/VHF-22/ctl22-com2.xml +++ b/Aircraft/Instruments-3d/VHF-22/ctl22-com2.xml @@ -254,10 +254,16 @@ Syd Adams false - property-swap - instrumentation/comm[1]/frequencies/selected-mhz - instrumentation/comm[1]/frequencies/standby-mhz - + + + systems/electrical/outputs/comm[1] + 1 + + + property-swap + instrumentation/comm[1]/frequencies/selected-mhz + instrumentation/comm[1]/frequencies/standby-mhz + @@ -346,6 +352,12 @@ Syd Adams true 0.2 + + + systems/electrical/outputs/comm[1] + 1 + + property-adjust instrumentation/comm[1]/frequencies/standby-mhz -0.025 @@ -364,6 +376,12 @@ Syd Adams true 0.2 + + + systems/electrical/outputs/comm[1] + 1 + + property-adjust instrumentation/comm[1]/frequencies/standby-mhz 0.025 @@ -382,6 +400,12 @@ Syd Adams true 0.2 + + + systems/electrical/outputs/comm[1] + 1 + + property-adjust instrumentation/comm[1]/frequencies/standby-mhz -0.025 @@ -400,6 +424,12 @@ Syd Adams true 0.2 + + + systems/electrical/outputs/comm[1] + 1 + + property-adjust instrumentation/comm[1]/frequencies/standby-mhz 0.025 @@ -418,6 +448,12 @@ Syd Adams true 0.2 + + + systems/electrical/outputs/comm[1] + 1 + + property-adjust instrumentation/comm[1]/frequencies/standby-mhz -1.0 @@ -436,6 +472,12 @@ Syd Adams true 0.2 + + + systems/electrical/outputs/comm[1] + 1 + + property-adjust instrumentation/comm[1]/frequencies/standby-mhz 1.0 @@ -454,6 +496,12 @@ Syd Adams true 0.2 + + + systems/electrical/outputs/comm[1] + 1 + + property-adjust instrumentation/comm[1]/frequencies/standby-mhz -1.0 @@ -472,6 +520,12 @@ Syd Adams true 0.2 + + + systems/electrical/outputs/comm[1] + 1 + + property-adjust instrumentation/comm[1]/frequencies/standby-mhz 1.0 @@ -482,4 +536,4 @@ Syd Adams - \ No newline at end of file + diff --git a/Aircraft/c172p/Tutorials/taxiing.xml b/Aircraft/c172p/Tutorials/taxiing.xml index aedcf15c9..e611d138a 100644 --- a/Aircraft/c172p/Tutorials/taxiing.xml +++ b/Aircraft/c172p/Tutorials/taxiing.xml @@ -103,10 +103,10 @@ For more information on taxiing, see Section 2-9 of the FAA Airplane Flying Hand /controls/engines/engine/starter false - I've already started the engine. Press Shift-B to release the parking brake, allow the aircraft - to move forward slightly, then hold b to check that the normal brakes work. + I've already started the engine. Press Shift-B to release the parking brake. Throttle up to about + 20% to move forward slightly, then hold b to check that the normal brakes work. - Apply the brakes by pressing b + Apply the brakes by pressing b. @@ -133,6 +133,21 @@ For more information on taxiing, see Section 2-9 of the FAA Airplane Flying Hand + + Throttle up to about 20% to move forward slightly. + + + + /controls/gear/brake-parking + 0 + + + /controls/engines/engine/throttle + 0.15 + + + + diff --git a/Input/Joysticks/SpeedLink/black-widow.xml b/Input/Joysticks/SpeedLink/black-widow.xml index 382acbdb8..a0b1c9e08 100644 --- a/Input/Joysticks/SpeedLink/black-widow.xml +++ b/Input/Joysticks/SpeedLink/black-widow.xml @@ -44,6 +44,7 @@ $Id$ Mega World USB Game Controllers SpeedLink SL-6640 Black Widow Flight Stick + SL-6640 Black Widow Flightstick Aileron diff --git a/Nasal/fuel.nas b/Nasal/fuel.nas index 17f554a47..edf28ac0b 100644 --- a/Nasal/fuel.nas +++ b/Nasal/fuel.nas @@ -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]: # + level-lbs - Current fuel load. Can be set by user code. # + selected - boolean indicating tank selection. @@ -22,9 +25,6 @@ var update = func { fuel.setDoubleValue(0); } - if (!consumed_fuel) - return; - var selected_tanks = []; foreach (var t; tanks) { var cap = t.getNode("capacity-gal_us",0); @@ -71,6 +71,10 @@ var fuel_freeze = nil; _setlistener("/sim/signals/fdm-initialized", func { 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"); foreach (var e; engines) { e.getNode("fuel-consumed-lbs", 1).setDoubleValue(0); diff --git a/gui/dialogs/about.xml b/gui/dialogs/about.xml index 0a3764dee..0886cc404 100644 --- a/gui/dialogs/about.xml +++ b/gui/dialogs/about.xml @@ -74,7 +74,7 @@ - + diff --git a/gui/dialogs/atc-freq-search.xml b/gui/dialogs/atc-freq-search.xml index c3aab8201..3b64f0a6c 100644 --- a/gui/dialogs/atc-freq-search.xml +++ b/gui/dialogs/atc-freq-search.xml @@ -17,9 +17,8 @@ false ICAO - property-assign - /sim/atc/freq-airport - ICAO + ATC-freq-display + ICAO dialog-close @@ -60,6 +59,9 @@ dialog-apply + + ATC-freq-display + dialog-close