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);
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FGOutput::~FGOutput()
{
if (socket) delete socket;
- if (debug_lvl & 2) cout << "Destroyed: FGOutput" << endl;
+ Debug(1);
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
}
if (SubSystems & ssRates) {
outstream << ", ";
- outstream << "P, Q, R";
+ outstream << "P, Q, R, ";
+ outstream << "Pdot, Qdot, Rdot";
}
if (SubSystems & ssVelocities) {
outstream << ", ";
}
if (SubSystems & ssAtmosphere) {
outstream << ", ";
- outstream << "Rho";
+ outstream << "Rho, ";
+ outstream << "NWind, EWind, DWind";
}
if (SubSystems & ssMassProps) {
outstream << ", ";
outstream << ", ";
outstream << GroundReactions->GetGroundReactionStrings();
}
- if (SubSystems & ssPropulsion) {
+ if (SubSystems & ssPropulsion && Propulsion->GetNumEngines() > 0) {
outstream << ", ";
outstream << Propulsion->GetPropulsionStrings();
}
}
if (SubSystems & ssRates) {
outstream << ", ";
- outstream << Rotation->GetPQR();
+ outstream << Rotation->GetPQR() << ", ";
+ outstream << Rotation->GetPQRdot();
}
if (SubSystems & ssVelocities) {
outstream << ", ";
}
if (SubSystems & ssAtmosphere) {
outstream << ", ";
- outstream << Atmosphere->GetDensity();
+ outstream << Atmosphere->GetDensity() << ", ";
+ outstream << Atmosphere->GetWindNED();
}
if (SubSystems & ssMassProps) {
outstream << ", ";
outstream << ", ";
outstream << GroundReactions->GetGroundReactionValues();
}
- if (SubSystems & ssPropulsion) {
+ if (SubSystems & ssPropulsion && Propulsion->GetNumEngines() > 0) {
outstream << ", ";
outstream << Propulsion->GetPropulsionValues();
}
void FGOutput::SocketOutput(void)
{
string asciiData;
- /*
+
if (socket == NULL) return;
+ if (!socket->GetConnectStatus()) return;
socket->Clear();
if (sFirstPass) {
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();
}
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();
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
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")) {
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-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
+ }
+ if (debug_lvl & 64) {
+ if (from == 0) { // Constructor
+ cout << IdSrc << endl;
+ cout << IdHdr << endl;
+ }
+ }
}
projects / flightgear.git / blobdiff