[Flightgear-commitlogs] FlightGear Base Package branch, master, updated. 36ac5200c4d6f9e879eb33943e0c3fef0f4840cc

[Flightgear-commitlogs <ma...@hy...>]

The branch, master has been updated

- Log -----------------------------------------------------------------
commit 36ac5200c4d6f9e879eb33943e0c3fef0f4840cc
Author: Hyde Yamakawa
Date:   Tue Oct 30 22:55:42 2012 -0400

    Set Autopilot on when in air reposition for 777 and PC-9M.


- Summary -------------------------------------------------------------

 Aircraft/777/777-set-common.xml  |    2 +-
 Aircraft/777/Nasal/systems.nas   |   10 +++++++++-
 Aircraft/PC-9M/Nasal/systems.nas |   39 ++++++++++++++++++++++++++++++++++++++
 Aircraft/PC-9M/PC-9M-set.xml     |    2 +-
 4 files changed, 50 insertions(+), 3 deletions(-)
 mode change 100755 => 100644 Aircraft/777/777-set-common.xml
 create mode 100644 Aircraft/PC-9M/Nasal/systems.nas


- Diff ----------------------------------------------------------------

diff --git a/Aircraft/777/777-set-common.xml b/Aircraft/777/777-set-common.xml
old mode 100755
new mode 100644
index bce1efa..36ef90f
--- a/Aircraft/777/777-set-common.xml
+++ b/Aircraft/777/777-set-common.xml
@@ -9,7 +9,7 @@
             <cockpit type="int">4</cockpit>
             <model type="int">4</model>
         </rating>
-        <aircraft-version>20121027</aircraft-version>
+        <aircraft-version>20121030</aircraft-version>
         <flight-model>yasim</flight-model>
         <fuel-fraction type="double">0.7</fuel-fraction>
         <model n="0">
diff --git a/Aircraft/777/Nasal/systems.nas b/Aircraft/777/Nasal/systems.nas
index 5715ccb..5af3b5d 100644
--- a/Aircraft/777/Nasal/systems.nas
+++ b/Aircraft/777/Nasal/systems.nas
@@ -576,7 +576,7 @@ setlistener("/sim/signals/fdm-initialized", func {
     props.globals.initNode("/instrumentation/clock/et-knob",0,"INT");
     props.globals.initNode("/instrumentation/clock/set-knob",0,"INT");
 #    setprop("/instrumentation/groundradar/id",getprop("sim/tower/airport-id"));
-    setprop("/sim/flaps/current", 0);
+    setprop("/sim/flaps/current-setting", 0);
 	balance_fuel();
 #    setprop("/controls/gear/tiller-enabled", 0);
     setprop("controls/fuel/tank[0]/boost-pump[0]",1);
@@ -604,9 +604,17 @@ var start_updates = func {
         setprop("instrumentation/afds/ap-modes/roll-mode", "TO/GA");
         setprop("instrumentation/afds/inputs/vertical-index", 10);
         setprop("instrumentation/afds/inputs/lateral-index", 9);
+    	setprop("instrumentation/afds/inputs/at-armed", 1);
+    	setprop("instrumentation/afds/inputs/at-armed[1]", 1);
+		setprop("instrumentation/afds/inputs/AP", 1);
         setprop("autopilot/internal/airport-height", 0);
         setprop("/engines/engine[0]/run",1);
         setprop("/engines/engine[1]/run",1);
+    	setprop("/sim/flaps/current-setting", 0);
+		setprop("autopilot/settings/target-speed-kt", getprop("sim/presets/airspeed-kt"));
+		b777.afds.input(1,1);
+		setprop("autopilot/settings/actual-target-altitude-ft", getprop("sim/presets/altitude-ft"));
+		b777.afds.input(0,2);
     }
 
     # start update_systems loop - but start it once only
diff --git a/Aircraft/PC-9M/Nasal/systems.nas b/Aircraft/PC-9M/Nasal/systems.nas
new file mode 100644
index 0000000..afe6de5
--- /dev/null
+++ b/Aircraft/PC-9M/Nasal/systems.nas
@@ -0,0 +1,39 @@
+#PC-9M systems
+#Hyde Yamakawa
+#
+setlistener("/sim/signals/fdm-initialized", func {
+    settimer(start_updates,1);
+});
+
+var systems_running = 0;
+var start_updates = func {
+    if (getprop("position/altitude-agl-ft")>30)
+    {
+        # airborne startup
+		setprop("fdm/jsbsim/systems/canopy/command", 0);
+		setprop("fdm/jsbsim/systems/canopy/position", 0);
+		setprop("canopy/position-norm", 0);
+		setprop("/controls/engines/engine[0]/starter", 1);
+		settimer(func { setprop("/controls/engines/engine[0]/cutoff", 0); }, 1);
+		setprop("/controls/gear/gear-down", 0);
+		setprop("autopilot/settings/target-speed-kt", getprop("sim/presets/airspeed-kt"));
+		setprop("instrumentation/afds/inputs/at-armed", 1);
+		setprop("instrumentation/afds/inputs/AP", 1);
+        setprop("autopilot/settings/heading-bug-deg", getprop("sim/presets/heading-deg"));
+        setprop("autopilot/settings/counter-set-altitude-ft", getprop("sim/presets/altitude-ft"));
+		PC9M.afds.input(1,2);
+        setprop("autopilot/settings/vertical-speed-fpm", 2000);
+    }
+
+    # start update_systems loop - but start it once only
+    if (!systems_running)
+    {
+        systems_running = 1;
+#        update_systems();
+    }
+}
+
+var update_systems = func {
+    settimer(update_systems,0);
+}
+
diff --git a/Aircraft/PC-9M/PC-9M-set.xml b/Aircraft/PC-9M/PC-9M-set.xml
index 41b092b..6807bac 100644
--- a/Aircraft/PC-9M/PC-9M-set.xml
+++ b/Aircraft/PC-9M/PC-9M-set.xml
@@ -214,7 +214,6 @@
 </binding>
 </mod-up>
 </key>
-
 </keyboard>
 </input>
 
@@ -324,6 +323,7 @@
 <nasal n="0">
 	<PC9M>
 		<file>Aircraft/PC-9M/Nasal/AFDS.nas</file>
+		<file>Aircraft/PC-9M/Nasal/systems.nas</file>
 <file>Aircraft/PC-9M/Nasal/liveries.nas</file>
 <file>Aircraft/PC-9M/Nasal/light.nas</file>
 <file>Aircraft/PC-9M/Nasal/limits.nas</file>


-----------------------------------------------------------------------


FlightGear Base Package