From 167e947c4ccf38b08ee061e473be921d51dcaf4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20de=20l=27Hamaide?= Date: Wed, 5 Mar 2014 00:46:48 +0100 Subject: [PATCH 1/3] update Joystick documentation for new delay-sec and release-delay-sec properties --- Docs/README.Joystick.html | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Docs/README.Joystick.html b/Docs/README.Joystick.html index 25e7f885c..f357dab7d 100644 --- a/Docs/README.Joystick.html +++ b/Docs/README.Joystick.html @@ -608,10 +608,24 @@ Here's an example of how to use an axis to adjust the elevator trim: If you want you can specify a time interval for processing digital hat repeats. For example if you want an interval of 0.05 seconds, which will effect up to 20 repeats per second, then add the following to the property: +

   --prop:/input/joysticks/js/axis[1]/interval-sec=0.05

+

+If you want specify a delay time before interval repeats action. For example +if you want an interval of 0.05 seconds after 1 second the axis has been pressed, then add +the following to the property: +

+
+  --prop:/input/joysticks/js/axis[1]/delay-sec=1
+  --prop:/input/joysticks/js/axis[1]/interval-sec=0.05
+
+

+Similarly, release-delay-sec is how long to wait after releasing the button. +

+

You could also bind some axes to brakes, so that you can use positions between between 0.0 (no brakes) and 1.0 (full brakes). From b388691fc277a9fdea73019fbbae8aa94abe3028 Mon Sep 17 00:00:00 2001 From: Torsten Dreyer Date: Wed, 5 Mar 2014 13:59:03 +0100 Subject: [PATCH 2/3] Add varying wind for eddh atis --- ATC/atis/eddh.xml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/ATC/atis/eddh.xml b/ATC/atis/eddh.xml index 704f6e05d..96729a7ad 100644 --- a/ATC/atis/eddh.xml +++ b/ATC/atis/eddh.xml @@ -47,7 +47,7 @@ wind-dir degrees wind-speed-kn - knots + knots gusts @@ -55,7 +55,20 @@ gusts up to gusts - knots + knots + + + + + wind-from + wind-to + + + varying between + wind-from + and + wind-to + degrees . From 2e451f292fb2fd380298d49f71b7617c4cd20449 Mon Sep 17 00:00:00 2001 From: James Turner Date: Wed, 5 Mar 2014 16:46:10 +0000 Subject: [PATCH 3/3] Switch GUI to use new reposition command. (Must have latest FG or you'll get a crash due to old ATIS subsystem) --- Nasal/aircraft.nas | 2 +- Nasal/gui.nas | 2 +- Nasal/tutorial/tutorial.nas | 4 ++-- gui/dialogs/airports.xml | 2 +- gui/dialogs/location-in-air.xml | 2 +- gui/dialogs/seaport.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Nasal/aircraft.nas b/Nasal/aircraft.nas index 581dbf795..8d28b1a2f 100644 --- a/Nasal/aircraft.nas +++ b/Nasal/aircraft.nas @@ -1002,7 +1002,7 @@ var teleport = func(airport = "", runway = "", lat = -9999, lon = -9999, alt = 0 setprop("/sim/presets/offset-azimuth-nm", azimuth); setprop("/sim/presets/glideslope-deg", glideslope); setprop("/sim/presets/heading-deg", heading); - fgcommand("presets-commit"); + fgcommand("reposition"); } diff --git a/Nasal/gui.nas b/Nasal/gui.nas index f3d25a753..65b160c96 100644 --- a/Nasal/gui.nas +++ b/Nasal/gui.nas @@ -597,7 +597,7 @@ var load_flight_sel = nil; var load_flight = func { var load = func(n) { fgcommand("load", props.Node.new({ file: n.getValue() })); - fgcommand("presets-commit"); + fgcommand("reposition"); } if (load_flight_sel == nil) load_flight_sel = FileSelector.new(load, "Load Flight", "Load", diff --git a/Nasal/tutorial/tutorial.nas b/Nasal/tutorial/tutorial.nas index 4c50659b8..e4604cb62 100644 --- a/Nasal/tutorial/tutorial.nas +++ b/Nasal/tutorial/tutorial.nas @@ -85,7 +85,7 @@ var startTutorial = func { var presets = tutorialN.getChild("presets"); if (presets != nil) { props.copy(presets, props.globals.getNode("/sim/presets")); - fgcommand("presets-commit"); + fgcommand("reposition"); if (getprop("/sim/presets/on-ground")) { var eng = props.globals.getNode("/controls/engines"); @@ -104,7 +104,7 @@ var startTutorial = func { # do_group(tutorialN.getNode("init")); - is_running(1); # needs to be after "presets-commit" + is_running(1); # needs to be after "reposition" display.clear(); display.show(); diff --git a/gui/dialogs/airports.xml b/gui/dialogs/airports.xml index 635344c21..e4a324c9f 100644 --- a/gui/dialogs/airports.xml +++ b/gui/dialogs/airports.xml @@ -1434,7 +1434,7 @@ - presets-commit + reposition dialog-close diff --git a/gui/dialogs/location-in-air.xml b/gui/dialogs/location-in-air.xml index 64d4c879d..e8329d41e 100644 --- a/gui/dialogs/location-in-air.xml +++ b/gui/dialogs/location-in-air.xml @@ -363,7 +363,7 @@ - presets-commit + reposition nasal diff --git a/gui/dialogs/seaport.xml b/gui/dialogs/seaport.xml index 08fab29ef..cb62fcb06 100644 --- a/gui/dialogs/seaport.xml +++ b/gui/dialogs/seaport.xml @@ -69,7 +69,7 @@ var teleport = func(lat, lon) { setprop("/sim/presets/latitude-deg", lat); setprop("/sim/presets/longitude-deg", lon); - fgcommand("presets-commit"); + fgcommand("reposition"); } var on_water = func(lat, lon) {