]> git.mxchange.org Git - flightgear.git/blobdiff - src/FDM/JSBSim/FGOutput.cpp
First steps in a weather reorganization. Note especially that
[flightgear.git] / src / FDM / JSBSim / FGOutput.cpp
index b5e1df66537a40fd4a796b98d5d6c2a949db05b9..77bd0f66388a205e926f9d4a71dfd7a4c972545a 100644 (file)
@@ -69,10 +69,7 @@ FGOutput::FGOutput(FGFDMExec* fdmex) : FGModel(fdmex)
   SubSystems = 0;
   enabled = true;
   
-#ifdef FG_WITH_JSBSIM_SOCKET
-  socket = new FGfdmSocket("localhost",1138);
-#endif
-  if (debug_lvl & 2) cout << "Instantiated: " << Name << endl;
+  Debug(0);
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -80,7 +77,7 @@ FGOutput::FGOutput(FGFDMExec* fdmex) : FGModel(fdmex)
 FGOutput::~FGOutput()
 {
   if (socket) delete socket;
-  if (debug_lvl & 2) cout << "Destroyed:    FGOutput" << endl;
+  Debug(1);
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -120,7 +117,7 @@ void FGOutput::SetType(string type)
     Type = otSocket;
   } else if (type == "TERMINAL") {
     Type = otTerminal;
-  } else if (type != "NONE"){
+  } else if (type != string("NONE")){
     Type = otUnknown;
     cerr << "Unknown type of output specified in config file" << endl;
   }
@@ -130,28 +127,24 @@ void FGOutput::SetType(string type)
 
 void FGOutput::DelimitedOutput(string fname)
 {
-# if defined(sgi) && !defined(__GNUC__)
-  ostream_withassign outstream;
-# else
-  _IO_ostream_withassign outstream;
-# endif
+  streambuf* buffer;
 
   if (fname == "COUT" || fname == "cout") {
-    outstream = cout;
+    buffer = cout.rdbuf();
   } else {
     datafile.open(fname.c_str());
-    outstream = datafile;
+    buffer = datafile.rdbuf();
   }
 
+  ostream outstream(buffer);
+
   if (dFirstPass) {
     outstream << "Time";
-    if (SubSystems & FGAircraft::ssSimulation) {
+    if (SubSystems & ssSimulation) {
       // Nothing here, yet
     }
-    if (SubSystems & FGAircraft::ssAerosurfaces) {
+    if (SubSystems & ssAerosurfaces) {
       outstream << ", ";
-      outstream << "Throttle, ";
-      outstream << "Mixture, ";
       outstream << "Aileron Cmd, ";
       outstream << "Elevator Cmd, ";
       outstream << "Rudder Cmd, ";
@@ -159,11 +152,12 @@ void FGOutput::DelimitedOutput(string fname)
       outstream << "Elevator Pos, ";
       outstream << "Rudder Pos";
     }
-    if (SubSystems & FGAircraft::ssRates) {
+    if (SubSystems & ssRates) {
       outstream << ", ";
-      outstream << "P, Q, R";
+      outstream << "P, Q, R, ";
+      outstream << "Pdot, Qdot, Rdot";
     }
-    if (SubSystems & FGAircraft::ssVelocities) {
+    if (SubSystems & ssVelocities) {
       outstream << ", ";
       outstream << "QBar, ";
       outstream << "Vtotal, ";
@@ -171,21 +165,22 @@ void FGOutput::DelimitedOutput(string fname)
       outstream << "UAero, VAero, WAero, ";
       outstream << "Vn, Ve, Vd";
     }
-    if (SubSystems & FGAircraft::ssForces) {
+    if (SubSystems & ssForces) {
       outstream << ", ";
       outstream << "Drag, Side, Lift, ";
       outstream << "L/D, ";
       outstream << "Xforce, Yforce, Zforce";
     }
-    if (SubSystems & FGAircraft::ssMoments) {
+    if (SubSystems & ssMoments) {
       outstream << ", ";
       outstream << "L, M, N";
     }
-    if (SubSystems & FGAircraft::ssAtmosphere) {
+    if (SubSystems & ssAtmosphere) {
       outstream << ", ";
-      outstream << "Rho";
+      outstream << "Rho, ";
+      outstream << "NWind, EWind, DWind";
     }
-    if (SubSystems & FGAircraft::ssMassProps) {
+    if (SubSystems & ssMassProps) {
       outstream << ", ";
       outstream << "Ixx, ";
       outstream << "Iyy, ";
@@ -194,25 +189,26 @@ void FGOutput::DelimitedOutput(string fname)
       outstream << "Mass, ";
       outstream << "Xcg, Ycg, Zcg";
     }
-    if (SubSystems & FGAircraft::ssPosition) {
+    if (SubSystems & ssPosition) {
       outstream << ", ";
       outstream << "Altitude, ";
       outstream << "Phi, Tht, Psi, ";
       outstream << "Alpha, ";
+      outstream << "Beta, ";
       outstream << "Latitude, ";
       outstream << "Longitude, ";
       outstream << "Distance AGL, ";
       outstream << "Runway Radius";
     }
-    if (SubSystems & FGAircraft::ssCoefficients) {
+    if (SubSystems & ssCoefficients) {
       outstream << ", ";
       outstream << Aerodynamics->GetCoefficientStrings();
     }
-    if (SubSystems & FGAircraft::ssGroundReactions) {
+    if (SubSystems & ssGroundReactions) {
       outstream << ", ";
       outstream << GroundReactions->GetGroundReactionStrings();
     }
-    if (SubSystems & FGAircraft::ssPropulsion) {
+    if (SubSystems & ssPropulsion && Propulsion->GetNumEngines() > 0) {
       outstream << ", ";
       outstream << Propulsion->GetPropulsionStrings();
     }
@@ -222,12 +218,10 @@ void FGOutput::DelimitedOutput(string fname)
   }
 
   outstream << State->Getsim_time();
-  if (SubSystems & FGAircraft::ssSimulation) {
+  if (SubSystems & ssSimulation) {
   }
-  if (SubSystems & FGAircraft::ssAerosurfaces) {
+  if (SubSystems & ssAerosurfaces) {
     outstream << ", ";
-    outstream << FCS->GetThrottlePos(0) << ", ";
-    outstream << FCS->GetMixturePos(0) << ", ";
     outstream << FCS->GetDaCmd() << ", ";
     outstream << FCS->GetDeCmd() << ", ";
     outstream << FCS->GetDrCmd() << ", ";
@@ -235,33 +229,35 @@ void FGOutput::DelimitedOutput(string fname)
     outstream << FCS->GetDePos() << ", ";
     outstream << FCS->GetDrPos();
   }
-  if (SubSystems & FGAircraft::ssRates) {
+  if (SubSystems & ssRates) {
     outstream << ", ";
-    outstream << Rotation->GetPQR();
+    outstream << Rotation->GetPQR() << ", ";
+    outstream << Rotation->GetPQRdot();
   }
-  if (SubSystems & FGAircraft::ssVelocities) {
+  if (SubSystems & ssVelocities) {
     outstream << ", ";
     outstream << Translation->Getqbar() << ", ";
     outstream << Translation->GetVt() << ", ";
     outstream << Translation->GetUVW() << ", ";
-    outstream << Translation->GetvAero() << ", ";
+    outstream << Translation->GetvAeroUVW() << ", ";
     outstream << Position->GetVel();
   }
-  if (SubSystems & FGAircraft::ssForces) {
+  if (SubSystems & ssForces) {
     outstream << ", ";
     outstream << Aerodynamics->GetvFs() << ", ";
     outstream << Aerodynamics->GetLoD() << ", ";
     outstream << Aircraft->GetForces();
   }
-  if (SubSystems & FGAircraft::ssMoments) {
+  if (SubSystems & ssMoments) {
     outstream << ", ";
     outstream << Aircraft->GetMoments();
   }
-  if (SubSystems & FGAircraft::ssAtmosphere) {
+  if (SubSystems & ssAtmosphere) {
     outstream << ", ";
-    outstream << Atmosphere->GetDensity();
+    outstream << Atmosphere->GetDensity() << ", ";
+    outstream << Atmosphere->GetWindNED();
   }
-  if (SubSystems & FGAircraft::ssMassProps) {
+  if (SubSystems & ssMassProps) {
     outstream << ", ";
     outstream << MassBalance->GetIxx() << ", ";
     outstream << MassBalance->GetIyy() << ", ";
@@ -270,25 +266,26 @@ void FGOutput::DelimitedOutput(string fname)
     outstream << MassBalance->GetMass() << ", ";
     outstream << MassBalance->GetXYZcg();
   }
-  if (SubSystems & FGAircraft::ssPosition) {
+  if (SubSystems & ssPosition) {
     outstream << ", ";
     outstream << Position->Geth() << ", ";
     outstream << Rotation->GetEuler() << ", ";
     outstream << Translation->Getalpha() << ", ";
+    outstream << Translation->Getbeta() << ", ";
     outstream << Position->GetLatitude() << ", ";
     outstream << Position->GetLongitude() << ", ";
     outstream << Position->GetDistanceAGL() << ", ";
     outstream << Position->GetRunwayRadius();
   }
-  if (SubSystems & FGAircraft::ssCoefficients) {
+  if (SubSystems & ssCoefficients) {
     outstream << ", ";
     outstream << Aerodynamics->GetCoefficientValues();
   }
-  if (SubSystems & FGAircraft::ssGroundReactions) {
+  if (SubSystems & ssGroundReactions) {
     outstream << ", ";
     outstream << GroundReactions->GetGroundReactionValues();
   }
-  if (SubSystems & FGAircraft::ssPropulsion) {
+  if (SubSystems & ssPropulsion && Propulsion->GetNumEngines() > 0) {
     outstream << ", ";
     outstream << Propulsion->GetPropulsionValues();
   }
@@ -302,8 +299,9 @@ void FGOutput::DelimitedOutput(string fname)
 void FGOutput::SocketOutput(void)
 {
   string asciiData;
-  /*
+
   if (socket == NULL) return;
+  if (!socket->GetConnectStatus()) return;
 
   socket->Clear();
   if (sFirstPass) {
@@ -343,10 +341,10 @@ void FGOutput::SocketOutput(void)
     socket->Append("L");
     socket->Append("M");
     socket->Append("N");
-    socket->Append("Throttle");
-    socket->Append("Aileron");
-    socket->Append("Elevator");
-    socket->Append("Rudder");
+    socket->Append("Throttle Position");
+    socket->Append("Aileron Position");
+    socket->Append("Elevator Position");
+    socket->Append("Rudder Position");
     sFirstPass = false;
     socket->Send();
   }
@@ -362,36 +360,36 @@ 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());
-  socket->Append(Translation->GetUdot());
-  socket->Append(Translation->GetVdot());
-  socket->Append(Translation->GetWdot());
-  socket->Append(Rotation->GetP());
-  socket->Append(Rotation->GetQ());
-  socket->Append(Rotation->GetR());
-  socket->Append(Rotation->GetPdot());
-  socket->Append(Rotation->GetQdot());
-  socket->Append(Rotation->GetRdot());
-  socket->Append(Aircraft->GetFx());
-  socket->Append(Aircraft->GetFy());
-  socket->Append(Aircraft->GetFz());
+  socket->Append(Translation->GetUVWdot(eU));
+  socket->Append(Translation->GetUVWdot(eV));
+  socket->Append(Translation->GetUVWdot(eW));
+  socket->Append(Rotation->GetPQR(eP));
+  socket->Append(Rotation->GetPQR(eQ));
+  socket->Append(Rotation->GetPQR(eR));
+  socket->Append(Rotation->GetPQRdot(eP));
+  socket->Append(Rotation->GetPQRdot(eQ));
+  socket->Append(Rotation->GetPQRdot(eR));
+  socket->Append(Aircraft->GetForces(eX));
+  socket->Append(Aircraft->GetForces(eY));
+  socket->Append(Aircraft->GetForces(eZ));
   socket->Append(Position->GetLatitude());
   socket->Append(Position->GetLongitude());
   socket->Append(Translation->Getqbar());
   socket->Append(Translation->Getalpha());
-  socket->Append(Aircraft->GetL());
-  socket->Append(Aircraft->GetM());
-  socket->Append(Aircraft->GetN());
-  socket->Append(FCS->GetThrottle(0));
-  socket->Append(FCS->GetDa());
-  socket->Append(FCS->GetDe());
-  socket->Append(FCS->GetDr());
-  socket->Send(); */
+  socket->Append(Aircraft->GetMoments(eL));
+  socket->Append(Aircraft->GetMoments(eM));
+  socket->Append(Aircraft->GetMoments(eN));
+  socket->Append(FCS->GetThrottlePos(0));
+  socket->Append(FCS->GetDaPos());
+  socket->Append(FCS->GetDePos());
+  socket->Append(FCS->GetDrPos());
+  socket->Send();
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -410,8 +408,130 @@ void FGOutput::SocketStatusOutput(string out_str)
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-void FGOutput::Debug(void)
+bool FGOutput::Load(FGConfigFile* AC_cfg)
 {
-    //TODO: Add your source code here
+  string token, parameter;
+  int OutRate = 0;
+
+  token = AC_cfg->GetValue("NAME");
+  Output->SetFilename(token);
+  token = AC_cfg->GetValue("TYPE");
+  Output->SetType(token);
+
+#if defined( FG_WITH_JSBSIM_SOCKET ) || !defined( FGFS )
+  if (token == "SOCKET") {
+    socket = new FGfdmSocket("localhost",1138);
+  }
+#endif
+  
+  AC_cfg->GetNextConfigLine();
+
+  while ((token = AC_cfg->GetValue()) != string("/OUTPUT")) {
+    *AC_cfg >> parameter;
+    if (parameter == "RATE_IN_HZ") *AC_cfg >> OutRate;
+    if (parameter == "SIMULATION") {
+      *AC_cfg >> parameter;
+      if (parameter == "ON") SubSystems += ssSimulation;
+    }
+    if (parameter == "AEROSURFACES") {
+      *AC_cfg >> parameter;
+      if (parameter == "ON") SubSystems += ssAerosurfaces;
+    }
+    if (parameter == "RATES") {
+      *AC_cfg >> parameter;
+      if (parameter == "ON") SubSystems += ssRates;
+    }
+    if (parameter == "VELOCITIES") {
+      *AC_cfg >> parameter;
+      if (parameter == "ON") SubSystems += ssVelocities;
+    }
+    if (parameter == "FORCES") {
+      *AC_cfg >> parameter;
+      if (parameter == "ON") SubSystems += ssForces;
+    }
+    if (parameter == "MOMENTS") {
+      *AC_cfg >> parameter;
+      if (parameter == "ON") SubSystems += ssMoments;
+    }
+    if (parameter == "ATMOSPHERE") {
+      *AC_cfg >> parameter;
+      if (parameter == "ON") SubSystems += ssAtmosphere;
+    }
+    if (parameter == "MASSPROPS") {
+      *AC_cfg >> parameter;
+      if (parameter == "ON") SubSystems += ssMassProps;
+    }
+    if (parameter == "POSITION") {
+      *AC_cfg >> parameter;
+      if (parameter == "ON") SubSystems += ssPosition;
+    }
+    if (parameter == "COEFFICIENTS") {
+      *AC_cfg >> parameter;
+      if (parameter == "ON") SubSystems += ssCoefficients;
+    }
+    if (parameter == "GROUND_REACTIONS") {
+      *AC_cfg >> parameter;
+      if (parameter == "ON") SubSystems += ssGroundReactions;
+    }
+    if (parameter == "FCS") {
+      *AC_cfg >> parameter;
+      if (parameter == "ON") SubSystems += ssFCS;
+    }
+    if (parameter == "PROPULSION") {
+      *AC_cfg >> parameter;
+      if (parameter == "ON") SubSystems += ssPropulsion;
+    }
+  }
+
+  OutRate = OutRate>120?120:(OutRate<0?0:OutRate);
+  rate = (int)(0.5 + 1.0/(State->Getdt()*OutRate));
+
+  return true;
+}
+
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+//    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)
+{
+  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
+  }
+  if (debug_lvl & 64) {
+    if (from == 0) { // Constructor
+      cout << IdSrc << endl;
+      cout << IdHdr << endl;
+    }
+  }
 }