CVS: data/Aircraft/b29 b29.nas, 1.8, 1.9 b29-common.xml, 1.12, 1.13 b29-yasim.xml, 1.8, 1.9

Vivian Meazza <[email protected]> Thu, 8 Apr 2010 12:39:22 -0500
Newsgroups gmane.games.flightgear.cvc
Message-ID <[email protected]>
Update of /var/cvs/FlightGear-0.9/data/Aircraft/b29
In directory baron.flightgear.org:/tmp/cvs-serv3134

Modified Files:
	b29.nas b29-common.xml b29-yasim.xml 
Log Message:
Fine tuning the FDM, add Hobbs meter.

Index: b29.nas
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/b29/b29.nas,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- b29.nas	7 Apr 2010 22:16:35 -0000	1.8
+++ b29.nas	8 Apr 2010 17:39:08 -0000	1.9
@@ -494,6 +494,23 @@
 
 ########
 #
+# Hobbs Meter
+#
+########
+
+    updateHobbs = func{
+        var running = engine_running_Node.getValue();
+
+        if(running){
+            hobbs_engine.start();
+        } else {
+            hobbs_engine.stop();
+        }
+
+        settimer(updateHobbs,0)
+    }
+########
+#
 # Init section
 #
 ########
@@ -581,3 +598,12 @@
     setlistener("sim/current-view/field-of-view", adjustViewTarget);
     setlistener("sim/current-view/view-number", adjustViewTarget);
     setlistener("sim/model/doors/bombbay/position-norm", adjustViewTarget);
+
+    ###  Engine Hobbs Meter 
+
+    var hobbs_engine = aircraft.timer.new("sim/time/hobbs/engine[0]", 60, 0);
+    var engine_running_Node = props.globals.initNode("engines/engine[0]/running", 1, "BOOL");
+
+    hobbs_engine.reset();
+    updateHobbs();
+

Index: b29-common.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/b29/b29-common.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- b29-common.xml	7 Apr 2010 22:16:36 -0000	1.12
+++ b29-common.xml	8 Apr 2010 17:39:13 -0000	1.13
@@ -9,51 +9,47 @@
 	<!-- *************** set properties **********************-->
 	<controls>
 		<armament>
-			<trigger type="bool">0</trigger>
+			<bombs>
+				<pickle type="bool">false</pickle>
+			</bombs>
 		</armament>
 		<engines>
+			<wastegate type="double">1</wastegate>
 			<engine n="0">
+				<boost>0.8</boost>
 				<cowl-flaps-norm>0</cowl-flaps-norm>
 				<intercooler-norm>0</intercooler-norm>
 				<throttle>0</throttle>
 			</engine>
 			<engine n="1">
+				<boost>0.8</boost>
 				<cowl-flaps-norm>0</cowl-flaps-norm>
 				<intercooler-norm>0</intercooler-norm>
 				<throttle>0</throttle>
 			</engine>
 			<engine n="2">
+				<boost>0.8</boost>
 				<cowl-flaps-norm>0</cowl-flaps-norm>
 				<intercooler-norm>0</intercooler-norm>
 				<throttle>0</throttle>
 			</engine>
 			<engine n="3">
+				<boost>0.8</boost>
 				<cowl-flaps-norm>0</cowl-flaps-norm>
 				<intercooler-norm>0</intercooler-norm>
 				<throttle>0</throttle>
 			</engine>
 		</engines>
 		<gear>
+			<nosewheel-caster type="bool"
+												archive="y">true</nosewheel-caster>
+			<antiskid type="bool"
+								archive="y">false</antiskid>
 			<brake-parking>1</brake-parking>
-			<tailwheel-lock>true</tailwheel-lock>
-			<launchbar>
-				<acceleration-norm type="float">0.4</acceleration-norm>
-			</launchbar>
-			<lashings type ="bool">false</lashings>
 		</gear>
-		<flight>
-			<flaps-alternate-extension type="double">1</flaps-alternate-extension>
-			<speedbrake-lever type="bool">false</speedbrake-lever>
-			<flaps-lever type="double">0</flaps-lever>
-		</flight>
 		<lighting>
 			<nav-lights type="bool">false</nav-lights>
 		</lighting>
-		<armament>
-			<station n="0">
-				<jettison-all type="bool">false</jettison-all>
-			</station>
-		</armament>
 	</controls>
 
 	<gear>
@@ -73,22 +69,27 @@
 			<sprayspeed-ms type="double">0</sprayspeed-ms>
 			<spray-density type="double">0</spray-density>
 		</gear>
-		<tailhook>
-			<position-norm type="double">0</position-norm>
-		</tailhook>
 	</gear>
 
 	<engines>
 		<engine n="0">
 			<running type="bool">0</running>
 		</engine>
+		<engine n="1">
+			<running type="bool">0</running>
+		</engine>
+		<engine n="2">
+			<running type="bool">0</running>
+		</engine>
+		<engine n="3">
+			<running type="bool">0</running>
+		</engine>
 	</engines>
 
 	<position>
 		<altitude-agl-ft type="double">0</altitude-agl-ft>
 	</position>
 
-
 	<sim include="help.xml">
 		<description type="string">Boeing B-29 Superfortress</description>
 
@@ -194,7 +195,6 @@
 									type="bool">true</show-pilot>
 		</hurricane>
 
-
 		<multiplay>
 			<generic>
 				<string n="0"
@@ -253,41 +253,12 @@
 							 alias="/controls/engines/engine[2]/intercooler-norm"/>
 				<float n="19"
 							 alias="/controls/engines/engine[3]/intercooler-norm"/>
-
-
-				controls/engines/engine[2]/intercooler-norm
 			</generic>
 		</multiplay>
 
 	</sim>
 
-	<controls>
-		<gear>
-			<nosewheel-caster type="bool"
-												archive="y">true</nosewheel-caster>
-			<antiskid type="bool"
-								archive="y">false</antiskid>
-		</gear>
-		<engines>
-			<engine n="0">
-				<boost>0.8</boost>
-			</engine>
-			<engine n="1">
-				<boost>0.8</boost>
-			</engine>
-			<engine n="2">
-				<boost>0.8</boost>
-			</engine>
-			<engine n="3">
-				<boost>0.8</boost>
-			</engine>
-		</engines>
-		<armament>
-			<bombs>
-				<pickle type="bool">false</pickle>
-			</bombs>
-		</armament>
-	</controls>
+
 
 	<instrumentation>
 		<pdi>

Index: b29-yasim.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/b29/b29-yasim.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- b29-yasim.xml	7 Apr 2010 22:16:37 -0000	1.8
+++ b29-yasim.xml	8 Apr 2010 17:39:14 -0000	1.9
@@ -182,13 +182,13 @@
 					 lift="1.4"
 					 drag="1.4"/>
 		<control-input axis="/controls/flight/elevator"
-									 control="FLAP0"
-									 transition-time="2"/>
+									 control="FLAP0" />
 		<control-input axis="/controls/flight/elevator-trim"
 									 control="FLAP0"/>
 		<control-output control="FLAP0"
-										prop="/surface-positions/elevator-pos-norm"
-										transition-time="2"/>
+										prop="/surface-positions/elevator-pos-norm"/>
+		<control-speed control="FLAP0"
+									 transition-time="2.0"/>
 	</hstab>
 
 	<vstab x="-25.23"
@@ -215,8 +215,9 @@
 									 control="FLAP0"
 									 invert="true"/>
 		<control-output control="FLAP0"
-										prop="/surface-positions/rudder-pos-norm"
-										transition-time="2"/>
+										prop="/surface-positions/rudder-pos-norm"/>
+		<control-speed control="FLAP0"
+									 transition-time="2.0"/>
 	</vstab>
 
 	<!-- #1 engine -->
@@ -258,7 +259,8 @@
 										 control="MIXTURE"/>
 			<control-input axis="/controls/engines/engine[0]/boost"
 										 control="BOOST"/>
-			<!--control-input axis="/controls/engines/wastegate" control="WASTEGATE"/-->
+			<!-- 			<control-input axis="/controls/engines/wastegate"
+										 control="WASTEGATE"/> -->
 		</piston-engine>
 	</propeller>
 	<!-- #2 engine -->
@@ -300,7 +302,8 @@
 										 control="MIXTURE"/>
 			<control-input axis="/controls/engines/engine[1]/boost"
 										 control="BOOST"/>
-			<!--control-input axis="/controls/engines/wastegate" control="WASTEGATE"/-->
+			<!-- 			<control-input axis="/controls/engines/wastegate"
+										 control="WASTEGATE"/> -->
 		</piston-engine>
 	</propeller>
 
@@ -343,7 +346,8 @@
 										 control="MIXTURE"/>
 			<control-input axis="/controls/engines/engine[2]/boost"
 										 control="BOOST"/>
-			<!--control-input axis="/controls/engines/wastegate" control="WASTEGATE"/-->
+			<!-- 			<control-input axis="/controls/engines/wastegate"
+										 control="WASTEGATE"/> -->
 		</piston-engine>
 	</propeller>
 
@@ -386,7 +390,8 @@
 										 control="MIXTURE"/>
 			<control-input axis="/controls/engines/engine[3]/boost"
 										 control="BOOST"/>
-			<!--control-input axis="/controls/engines/wastegate" control="WASTEGATE"/-->
+			<!-- 			<control-input axis="/controls/engines/wastegate"
+										 control="WASTEGATE"/> -->
 		</piston-engine>
 	</propeller>
 


------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev