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

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

Author: mkrose
Date: 2005-06-17 22:00:54 -0700 (Fri, 17 Jun 2005)
New Revision: 1571

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Include/FlightDynamicsChannels.h
   trunk/CSP/CSPSim/Include/Systems/AircraftFlightSensors.h
   trunk/CSP/CSPSim/Source/Channels.cpp
   trunk/CSP/CSPSim/Source/Systems/AircraftFlightSensors.cpp
Log:
Add PressureAltitude and VerticalVelocity channels.  These are updated
by AircraftFlightSensors and currently record exact values (no sensor
modeling yet).

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

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2005-06-18 04:58:46 UTC (rev 1570)
+++ trunk/CSP/CSPSim/CHANGES.current	2005-06-18 05:00:54 UTC (rev 1571)
@@ -8,6 +8,10 @@
    can also use the channels to transmit events back to the UFC system
    when clicked on in the 3D cockpit.
 
+ * Add PressureAltitude and VerticalVelocity channels.  These are updated
+   by AircraftFlightSensors and currently record exact values (no sensor
+   modeling yet).
+
 2005-06-16: onsight
  * Refactor SimCore/Util/Callback.h.  The new code achieves the same
    effect with a cleaner interface and much simpler logic.  Corresponding

Modified: trunk/CSP/CSPSim/Include/FlightDynamicsChannels.h
===================================================================
--- trunk/CSP/CSPSim/Include/FlightDynamicsChannels.h	2005-06-18 04:58:46 UTC (rev 1570)
+++ trunk/CSP/CSPSim/Include/FlightDynamicsChannels.h	2005-06-18 05:00:54 UTC (rev 1571)
@@ -35,6 +35,8 @@
 	static const char *Airspeed;
 	static const char *QBar;
 	static const char *GForce;
+	static const char *PressureAltitude;
+	static const char *VerticalVelocity;
 };
 
 }

Modified: trunk/CSP/CSPSim/Include/Systems/AircraftFlightSensors.h
===================================================================
--- trunk/CSP/CSPSim/Include/Systems/AircraftFlightSensors.h	2005-06-18 04:58:46 UTC (rev 1570)
+++ trunk/CSP/CSPSim/Include/Systems/AircraftFlightSensors.h	2005-06-18 05:00:54 UTC (rev 1571)
@@ -51,6 +51,8 @@
 	DataChannel<double>::Ref b_Density;
 	DataChannel<double>::Ref b_Mach;
 	DataChannel<double>::Ref b_CAS;
+	DataChannel<double>::Ref b_PressureAltitude;
+	DataChannel<double>::Ref b_VerticalVelocity;
 
 private:
 	double m_Distance;

Modified: trunk/CSP/CSPSim/Source/Channels.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/Channels.cpp	2005-06-18 04:58:46 UTC (rev 1570)
+++ trunk/CSP/CSPSim/Source/Channels.cpp	2005-06-18 05:00:54 UTC (rev 1571)
@@ -61,6 +61,8 @@
 	const char *FlightDynamics::Airspeed = "FlightDynamics.Airspeed";
 	const char *FlightDynamics::QBar = "FlightDynamics.QBar";
 	const char *FlightDynamics::GForce = "FlightDynamics.G";
+	const char *FlightDynamics::PressureAltitude = "FlightDynamics.PressureAltitude";
+	const char *FlightDynamics::VerticalVelocity = "FlightDynamics.VerticalVelocity";
 
 	const char *Conditions::WindVelocity = "Conditions.WindVelocity";
 	const char *Conditions::Pressure = "Conditions.Pressure";

Modified: trunk/CSP/CSPSim/Source/Systems/AircraftFlightSensors.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/Systems/AircraftFlightSensors.cpp	2005-06-18 04:58:46 UTC (rev 1570)
+++ trunk/CSP/CSPSim/Source/Systems/AircraftFlightSensors.cpp	2005-06-18 05:00:54 UTC (rev 1571)
@@ -29,6 +29,7 @@
 
 #include <Systems/AircraftFlightSensors.h>
 #include <ConditionsChannels.h>
+#include <FlightDynamicsChannels.h>
 #include <KineticsChannels.h>
 #include <Atmosphere.h>
 #include <CSPSim.h>
@@ -58,6 +59,8 @@
 		b_Density->value() = 1.25; // nominal sea-level air density
 		b_WindVelocity->value() = simdata::Vector3::ZERO;
 	}
+	b_VerticalVelocity->value() = b_Velocity->value().z();
+	b_PressureAltitude->value() = pos.z(); // FIXME roll in atmospheric pressure variations
 	return 0.0; //return 0.101;
 }
 
@@ -75,6 +78,8 @@
 	b_Temperature = bus->registerLocalDataChannel<double>(bus::Conditions::Temperature, 300);
 	b_Mach = bus->registerLocalDataChannel<double>(bus::Conditions::Mach, 0.0);
 	b_CAS = bus->registerLocalDataChannel<double>(bus::Conditions::CAS, 0.0);
+	b_PressureAltitude = bus->registerLocalDataChannel<double>(bus::FlightDynamics::PressureAltitude, 0.0);
+	b_VerticalVelocity = bus->registerLocalDataChannel<double>(bus::FlightDynamics::VerticalVelocity, 0.0);
 }
 
 void AircraftFlightSensors::getInfo(InfoList &info) const {