Initial revision.

[flightgear.git] / src / FDM / JSBSim / FGOutput.cpp

diff --git a/src/FDM/JSBSim/FGOutput.cpp b/src/FDM/JSBSim/FGOutput.cpp
index c18b4831b15dafcdef6cc522f1747ba90c49d0ad..5cc3d6e1344784905f9483658d65df78ca14f9be 100644 (file)
--- a/src/FDM/JSBSim/FGOutput.cpp
+++ b/src/FDM/JSBSim/FGOutput.cpp
@@ -72,7 +72,7 @@ FGOutput::FGOutput(FGFDMExec* fdmex) : FGModel(fdmex)
 #ifdef FG_WITH_JSBSIM_SOCKET
   socket = new FGfdmSocket("localhost",1138);
 #endif
-  if (debug_lvl & 2) cout << "Instantiated: " << Name << endl;
+  Debug(0);
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -80,7 +80,7 @@ FGOutput::FGOutput(FGFDMExec* fdmex) : FGModel(fdmex)
 FGOutput::~FGOutput()
 {
   if (socket) delete socket;
-  if (debug_lvl & 2) cout << "Destroyed:    FGOutput" << endl;
+  Debug(1);
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -148,8 +148,6 @@ void FGOutput::DelimitedOutput(string fname)
     }
     if (SubSystems & ssAerosurfaces) {
       outstream << ", ";
-      outstream << "Throttle, ";
-      outstream << "Mixture, ";
       outstream << "Aileron Cmd, ";
       outstream << "Elevator Cmd, ";
       outstream << "Rudder Cmd, ";
@@ -159,7 +157,8 @@ void FGOutput::DelimitedOutput(string fname)
     }
     if (SubSystems & ssRates) {
       outstream << ", ";
-      outstream << "P, Q, R";
+      outstream << "P, Q, R, ";
+      outstream << "Pdot, Qdot, Rdot";
     }
     if (SubSystems & ssVelocities) {
       outstream << ", ";
@@ -181,7 +180,8 @@ void FGOutput::DelimitedOutput(string fname)
     }
     if (SubSystems & ssAtmosphere) {
       outstream << ", ";
-      outstream << "Rho";
+      outstream << "Rho, ";
+      outstream << "NWind, EWind, DWind";
     }
     if (SubSystems & ssMassProps) {
       outstream << ", ";
@@ -197,6 +197,7 @@ void FGOutput::DelimitedOutput(string fname)
       outstream << "Altitude, ";
       outstream << "Phi, Tht, Psi, ";
       outstream << "Alpha, ";
+      outstream << "Beta, ";
       outstream << "Latitude, ";
       outstream << "Longitude, ";
       outstream << "Distance AGL, ";
@@ -210,7 +211,7 @@ void FGOutput::DelimitedOutput(string fname)
       outstream << ", ";
       outstream << GroundReactions->GetGroundReactionStrings();
     }
-    if (SubSystems & ssPropulsion) {
+    if (SubSystems & ssPropulsion && Propulsion->GetNumEngines() > 0) {
       outstream << ", ";
       outstream << Propulsion->GetPropulsionStrings();
     }
@@ -224,8 +225,6 @@ void FGOutput::DelimitedOutput(string fname)
   }
   if (SubSystems & ssAerosurfaces) {
     outstream << ", ";
-    outstream << FCS->GetThrottlePos(0) << ", ";
-    outstream << FCS->GetMixturePos(0) << ", ";
     outstream << FCS->GetDaCmd() << ", ";
     outstream << FCS->GetDeCmd() << ", ";
     outstream << FCS->GetDrCmd() << ", ";
@@ -235,14 +234,15 @@ void FGOutput::DelimitedOutput(string fname)
   }
   if (SubSystems & ssRates) {
     outstream << ", ";
-    outstream << Rotation->GetPQR();
+    outstream << Rotation->GetPQR() << ", ";
+    outstream << Rotation->GetPQRdot();
   }
   if (SubSystems & ssVelocities) {
     outstream << ", ";
     outstream << Translation->Getqbar() << ", ";
     outstream << Translation->GetVt() << ", ";
     outstream << Translation->GetUVW() << ", ";
-    outstream << Translation->GetvAero() << ", ";
+    outstream << Translation->GetvAeroUVW() << ", ";
     outstream << Position->GetVel();
   }
   if (SubSystems & ssForces) {
@@ -257,7 +257,8 @@ void FGOutput::DelimitedOutput(string fname)
   }
   if (SubSystems & ssAtmosphere) {
     outstream << ", ";
-    outstream << Atmosphere->GetDensity();
+    outstream << Atmosphere->GetDensity() << ", ";
+    outstream << Atmosphere->GetWindNED();
   }
   if (SubSystems & ssMassProps) {
     outstream << ", ";
@@ -273,6 +274,7 @@ void FGOutput::DelimitedOutput(string fname)
     outstream << Position->Geth() << ", ";
     outstream << Rotation->GetEuler() << ", ";
     outstream << Translation->Getalpha() << ", ";
+    outstream << Translation->Getbeta() << ", ";
     outstream << Position->GetLatitude() << ", ";
     outstream << Position->GetLongitude() << ", ";
     outstream << Position->GetDistanceAGL() << ", ";
@@ -286,7 +288,7 @@ void FGOutput::DelimitedOutput(string fname)
     outstream << ", ";
     outstream << GroundReactions->GetGroundReactionValues();
   }
-  if (SubSystems & ssPropulsion) {
+  if (SubSystems & ssPropulsion && Propulsion->GetNumEngines() > 0) {
     outstream << ", ";
     outstream << Propulsion->GetPropulsionValues();
   }
@@ -360,9 +362,9 @@ void FGOutput::SocketOutput(void)
   socket->Append(Translation->GetUVW(eU));
   socket->Append(Translation->GetUVW(eV));
   socket->Append(Translation->GetUVW(eW));
-  socket->Append(Translation->GetvAero(eU));
-  socket->Append(Translation->GetvAero(eV));
-  socket->Append(Translation->GetvAero(eW));
+  socket->Append(Translation->GetvAeroUVW(eU));
+  socket->Append(Translation->GetvAeroUVW(eV));
+  socket->Append(Translation->GetvAeroUVW(eW));
   socket->Append(Position->GetVn());
   socket->Append(Position->GetVe());
   socket->Append(Position->GetVd());
@@ -483,9 +485,42 @@ bool FGOutput::Load(FGConfigFile* AC_cfg)
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-void FGOutput::Debug(void)
+//    The bitmasked value choices are as follows:
+//    unset: In this case (the default) JSBSim would only print
+//       out the normally expected messages, essentially echoing
+//       the config files as they are read. If the environment
+//       variable is not set, debug_lvl is set to 1 internally
+//    0: This requests JSBSim not to output any messages
+//       whatsoever.
+//    1: This value explicity requests the normal JSBSim
+//       startup messages
+//    2: This value asks for a message to be printed out when
+//       a class is instantiated
+//    4: When this value is set, a message is displayed when a
+//       FGModel object executes its Run() method
+//    8: When this value is set, various runtime state variables
+//       are printed out periodically
+//    16: When set various parameters are sanity checked and
+//       a message is printed out when they go out of bounds
+
+void FGOutput::Debug(int from)
 {
-    //TODO: Add your source code here
+  if (debug_lvl <= 0) return;
+
+  if (debug_lvl & 1) { // Standard console startup message output
+    if (from == 0) { // Constructor
+
+    }
+  }
+  if (debug_lvl & 2 ) { // Instantiation/Destruction notification
+    if (from == 0) cout << "Instantiated: FGOutput" << endl;
+    if (from == 1) cout << "Destroyed:    FGOutput" << endl;
+  }
+  if (debug_lvl & 4 ) { // Run() method entry print for FGModel-derived objects
+  }
+  if (debug_lvl & 8 ) { // Runtime state variables
+  }
+  if (debug_lvl & 16) { // Sanity checking
+  }
 }