[Csp-commits] svn:csp r1637 - in trunk/CSP/CSPSim: . Include Source

[<sv...@ww...>]

Author: mkrose
Date: 2005-10-15 16:31:29 -0700 (Sat, 15 Oct 2005)
New Revision: 1637

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Include/ControlSurfacesChannels.h
   trunk/CSP/CSPSim/Include/FlightDynamicsChannels.h
   trunk/CSP/CSPSim/Source/Channels.cpp
Log:
* Add new standard channels, deprecate GForce channel in favor of G.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1637

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2005-10-15 23:24:51 UTC (rev 1636)
+++ trunk/CSP/CSPSim/CHANGES.current	2005-10-15 23:31:29 UTC (rev 1637)
@@ -28,6 +28,10 @@
 
  * Add basic fuel management system infrastructure.
 
+ * Add fuel tank, pylon, and aim-9 models.
+
+ * Add new standard channels, deprecate GForce channel in favor of G.
+
 2005-08-27: onsight
  * Link against sigc-2.0, not sigc-1.2 for debug builds under MSVC.
 

Modified: trunk/CSP/CSPSim/Include/ControlSurfacesChannels.h
===================================================================
--- trunk/CSP/CSPSim/Include/ControlSurfacesChannels.h	2005-10-15 23:24:51 UTC (rev 1636)
+++ trunk/CSP/CSPSim/Include/ControlSurfacesChannels.h	2005-10-15 23:31:29 UTC (rev 1637)
@@ -34,6 +34,8 @@
 	static const char *ElevatorDeflection;
 	static const char *RudderDeflection;
 	static const char *AirbrakeDeflection;
+	static const char *LeadingEdgeFlapDeflection;
+	static const char *TrailingEdgeFlapDeflection;
 };
 
 }

Modified: trunk/CSP/CSPSim/Include/FlightDynamicsChannels.h
===================================================================
--- trunk/CSP/CSPSim/Include/FlightDynamicsChannels.h	2005-10-15 23:24:51 UTC (rev 1636)
+++ trunk/CSP/CSPSim/Include/FlightDynamicsChannels.h	2005-10-15 23:31:29 UTC (rev 1637)
@@ -34,7 +34,9 @@
 	static const char *Beta;
 	static const char *Airspeed;
 	static const char *QBar;
-	static const char *GForce;
+	static const char *GForce;  // DEPRECATED; use "G" instead.
+	static const char *G;  // normal G, includes gravity and rotation
+	static const char *LateralG;  // includes gravity and rotation
 	static const char *PressureAltitude;
 	static const char *VerticalVelocity;
 };

Modified: trunk/CSP/CSPSim/Source/Channels.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/Channels.cpp	2005-10-15 23:24:51 UTC (rev 1636)
+++ trunk/CSP/CSPSim/Source/Channels.cpp	2005-10-15 23:31:29 UTC (rev 1637)
@@ -61,9 +61,9 @@
 	const char *FlightDynamics::Beta = "FlightDynamics.Beta";
 	const char *FlightDynamics::Airspeed = "FlightDynamics.Airspeed";
 	const char *FlightDynamics::QBar = "FlightDynamics.QBar";
-	const char *FlightDynamics::GForce = "FlightDynamics.G";
-	//const char *FlightDynamics::G = "FlightDynamics.G";
-	//const char *FlightDynamics::LateralG = "FlightDynamics.LateralG";
+	const char *FlightDynamics::GForce = "FlightDynamics.G";  // DEPRECATED
+	const char *FlightDynamics::G = "FlightDynamics.G";
+	const char *FlightDynamics::LateralG = "FlightDynamics.LateralG";
 	const char *FlightDynamics::PressureAltitude = "FlightDynamics.PressureAltitude";
 	const char *FlightDynamics::VerticalVelocity = "FlightDynamics.VerticalVelocity";
 
@@ -78,8 +78,8 @@
 	const char *ControlSurfaces::ElevatorDeflection = "ControlSurfaces.ElevatorDeflection";
 	const char *ControlSurfaces::RudderDeflection = "ControlSurfaces.RudderDeflection";
 	const char *ControlSurfaces::AirbrakeDeflection = "ControlSurfaces.AirbrakeDeflection";
-	//const char *ControlSurfaces::TrailingEdgeFlapDeflection = "ControlSurfaces.TrailingEdgeFlapDeflection";
-	//const char *ControlSurfaces::LeadingEdgeFlapDeflection = "ControlSurfaces.LeadingEdgeFlapDeflection";
+	const char *ControlSurfaces::TrailingEdgeFlapDeflection = "ControlSurfaces.TrailingEdgeFlapDeflection";
+	const char *ControlSurfaces::LeadingEdgeFlapDeflection = "ControlSurfaces.LeadingEdgeFlapDeflection";
 
 	const char *ControlInputs::PitchInput = "ControlInputs.PitchInput";
 	const char *ControlInputs::RollInput = "ControlInputs.RollInput";