#include "FGPosition.h"
#include "FGAuxiliary.h"
+namespace JSBSim {
+
static const char *IdSrc = "$Id$";
static const char *IdHdr = ID_OUTPUT;
sFirstPass = dFirstPass = true;
socket = 0;
Type = otNone;
- Filename = "JSBSim.out";
+ Filename = "";
SubSystems = 0;
enabled = true;
+ outputInFileName = "";
-#ifdef FG_WITH_JSBSIM_SOCKET
- socket = new FGfdmSocket("localhost",1138);
-#endif
Debug(0);
}
FGOutput::~FGOutput()
{
if (socket) delete socket;
+ for (int i=0; i<OutputProperties.size(); i++) delete OutputProperties[i];
+
Debug(1);
}
} else {
// Not a valid type of output
}
-
+ return false;
} else {
+ return true;
}
}
return false;
Type = otSocket;
} else if (type == "TERMINAL") {
Type = otTerminal;
- } else if (type != string("NONE")){
+ } else if (type != string("NONE")) {
Type = otUnknown;
cerr << "Unknown type of output specified in config file" << endl;
}
outstream << "Aileron Cmd, ";
outstream << "Elevator Cmd, ";
outstream << "Rudder Cmd, ";
- outstream << "Aileron Pos, ";
+ outstream << "Flap Cmd, ";
+ outstream << "Left Aileron Pos, ";
+ outstream << "Right Aileron Pos, ";
outstream << "Elevator Pos, ";
- outstream << "Rudder Pos";
+ outstream << "Rudder Pos, ";
+ outstream << "Flap Pos";
}
if (SubSystems & ssRates) {
outstream << ", ";
- outstream << "P, Q, R";
+ outstream << "P, Q, R, ";
+ outstream << "Pdot, Qdot, Rdot";
}
if (SubSystems & ssVelocities) {
outstream << ", ";
outstream << ", ";
outstream << "Drag, Side, Lift, ";
outstream << "L/D, ";
- outstream << "Xforce, Yforce, Zforce";
+ outstream << "Xforce, Yforce, Zforce, ";
+ outstream << "xGravity, yGravity, zGravity, ";
+ outstream << "xCoriolis, yCoriolis, zCoriolis, ";
+ outstream << "xCentrifugal, yCentrifugal, zCentrifugal";
}
if (SubSystems & ssMoments) {
outstream << ", ";
}
if (SubSystems & ssAtmosphere) {
outstream << ", ";
- outstream << "Rho";
+ outstream << "Rho, ";
+ outstream << "NWind, EWind, DWind";
}
if (SubSystems & ssMassProps) {
outstream << ", ";
outstream << ", ";
outstream << Aerodynamics->GetCoefficientStrings();
}
+ if (SubSystems & ssFCS) {
+ outstream << ", ";
+ outstream << FCS->GetComponentStrings();
+ }
if (SubSystems & ssGroundReactions) {
outstream << ", ";
outstream << GroundReactions->GetGroundReactionStrings();
outstream << ", ";
outstream << Propulsion->GetPropulsionStrings();
}
+ if (OutputProperties.size() > 0) {
+ for (int i=0;i<OutputProperties.size();i++) {
+ outstream << ", " << OutputProperties[i]->GetName();
+ }
+ }
outstream << endl;
dFirstPass = false;
outstream << FCS->GetDaCmd() << ", ";
outstream << FCS->GetDeCmd() << ", ";
outstream << FCS->GetDrCmd() << ", ";
- outstream << FCS->GetDaPos() << ", ";
+ outstream << FCS->GetDfCmd() << ", ";
+ outstream << FCS->GetDaLPos() << ", ";
+ outstream << FCS->GetDaRPos() << ", ";
outstream << FCS->GetDePos() << ", ";
- outstream << FCS->GetDrPos();
+ outstream << FCS->GetDrPos() << ", ";
+ outstream << FCS->GetDfPos();
}
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->GetvAeroUVW() << ", ";
+ outstream << Translation->GetAeroUVW() << ", ";
outstream << Position->GetVel();
}
if (SubSystems & ssForces) {
outstream << ", ";
outstream << Aerodynamics->GetvFs() << ", ";
outstream << Aerodynamics->GetLoD() << ", ";
- outstream << Aircraft->GetForces();
+ outstream << Aircraft->GetForces() << ", ";
+ outstream << Inertial->GetGravity() << ", ";
+ outstream << Inertial->GetCoriolis() << ", ";
+ outstream << Inertial->GetCentrifugal();
}
if (SubSystems & ssMoments) {
outstream << ", ";
}
if (SubSystems & ssAtmosphere) {
outstream << ", ";
- outstream << Atmosphere->GetDensity();
+ outstream << Atmosphere->GetDensity() << ", ";
+ outstream << Atmosphere->GetWindNED();
}
if (SubSystems & ssMassProps) {
outstream << ", ";
outstream << ", ";
outstream << Aerodynamics->GetCoefficientValues();
}
+ if (SubSystems & ssFCS) {
+ outstream << ", ";
+ outstream << FCS->GetComponentValues();
+ }
if (SubSystems & ssGroundReactions) {
outstream << ", ";
outstream << GroundReactions->GetGroundReactionValues();
outstream << Propulsion->GetPropulsionValues();
}
+ for (int i=0;i<OutputProperties.size();i++) {
+ outstream << ", " << OutputProperties[i]->getDoubleValue();
+ }
+
outstream << endl;
outstream.flush();
}
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("Left Aileron Position");
+ socket->Append("Right Aileron Position");
+ socket->Append("Elevator Position");
+ socket->Append("Rudder Position");
sFirstPass = false;
socket->Send();
}
socket->Append(Translation->GetUVW(eU));
socket->Append(Translation->GetUVW(eV));
socket->Append(Translation->GetUVW(eW));
- socket->Append(Translation->GetvAeroUVW(eU));
- socket->Append(Translation->GetvAeroUVW(eV));
- socket->Append(Translation->GetvAeroUVW(eW));
+ socket->Append(Translation->GetAeroUVW(eU));
+ socket->Append(Translation->GetAeroUVW(eV));
+ socket->Append(Translation->GetAeroUVW(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->GetDaLPos());
+ socket->Append(FCS->GetDaRPos());
+ socket->Append(FCS->GetDePos());
+ socket->Append(FCS->GetDrPos());
+ socket->Send();
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
bool FGOutput::Load(FGConfigFile* AC_cfg)
{
- string token, parameter;
+ string token="", parameter="", separator="";
+ string name="", fname="";
int OutRate = 0;
+ FGConfigFile* Output_cfg;
+ string property;
- token = AC_cfg->GetValue("NAME");
- Output->SetFilename(token);
+# ifndef macintosh
+ separator = "/";
+# else
+ separator = ";";
+# endif
+
+ name = AC_cfg->GetValue("NAME");
+ fname = AC_cfg->GetValue("FILE");
token = AC_cfg->GetValue("TYPE");
Output->SetType(token);
- AC_cfg->GetNextConfigLine();
- while ((token = AC_cfg->GetValue()) != string("/OUTPUT")) {
- *AC_cfg >> parameter;
- if (parameter == "RATE_IN_HZ") *AC_cfg >> OutRate;
+#if defined( FG_WITH_JSBSIM_SOCKET ) || !defined( FGFS )
+ if (token == "SOCKET") {
+ socket = new FGfdmSocket("localhost",1138);
+ }
+#endif
+
+ if (!fname.empty()) {
+ outputInFileName = FDMExec->GetAircraftPath() + separator
+ + FDMExec->GetModelName() + separator + fname + ".xml";
+ Output_cfg = new FGConfigFile(outputInFileName);
+ if (!Output_cfg->IsOpen()) {
+ cerr << "Could not open file: " << outputInFileName << endl;
+ return false;
+ }
+ } else {
+ Output_cfg = AC_cfg;
+ }
+ Output->SetFilename(name);
+
+ while ((token = Output_cfg->GetValue()) != string("/OUTPUT")) {
+ *Output_cfg >> parameter;
+ if (parameter == "RATE_IN_HZ") {
+ *Output_cfg >> OutRate;
+ }
if (parameter == "SIMULATION") {
- *AC_cfg >> parameter;
+ *Output_cfg >> parameter;
if (parameter == "ON") SubSystems += ssSimulation;
}
if (parameter == "AEROSURFACES") {
- *AC_cfg >> parameter;
+ *Output_cfg >> parameter;
if (parameter == "ON") SubSystems += ssAerosurfaces;
}
if (parameter == "RATES") {
- *AC_cfg >> parameter;
+ *Output_cfg >> parameter;
if (parameter == "ON") SubSystems += ssRates;
}
if (parameter == "VELOCITIES") {
- *AC_cfg >> parameter;
+ *Output_cfg >> parameter;
if (parameter == "ON") SubSystems += ssVelocities;
}
if (parameter == "FORCES") {
- *AC_cfg >> parameter;
+ *Output_cfg >> parameter;
if (parameter == "ON") SubSystems += ssForces;
}
if (parameter == "MOMENTS") {
- *AC_cfg >> parameter;
+ *Output_cfg >> parameter;
if (parameter == "ON") SubSystems += ssMoments;
}
if (parameter == "ATMOSPHERE") {
- *AC_cfg >> parameter;
+ *Output_cfg >> parameter;
if (parameter == "ON") SubSystems += ssAtmosphere;
}
if (parameter == "MASSPROPS") {
- *AC_cfg >> parameter;
+ *Output_cfg >> parameter;
if (parameter == "ON") SubSystems += ssMassProps;
}
if (parameter == "POSITION") {
- *AC_cfg >> parameter;
+ *Output_cfg >> parameter;
if (parameter == "ON") SubSystems += ssPosition;
}
if (parameter == "COEFFICIENTS") {
- *AC_cfg >> parameter;
+ *Output_cfg >> parameter;
if (parameter == "ON") SubSystems += ssCoefficients;
}
if (parameter == "GROUND_REACTIONS") {
- *AC_cfg >> parameter;
+ *Output_cfg >> parameter;
if (parameter == "ON") SubSystems += ssGroundReactions;
}
if (parameter == "FCS") {
- *AC_cfg >> parameter;
+ *Output_cfg >> parameter;
if (parameter == "ON") SubSystems += ssFCS;
}
if (parameter == "PROPULSION") {
- *AC_cfg >> parameter;
+ *Output_cfg >> parameter;
if (parameter == "ON") SubSystems += ssPropulsion;
}
+ if (parameter == "PROPERTY") {
+ *Output_cfg >> property;
+ OutputProperties.push_back(PropertyManager->GetNode(property));
+ }
+
+ if (parameter == "EOF") break;
}
OutRate = OutRate>120?120:(OutRate<0?0:OutRate);
rate = (int)(0.5 + 1.0/(State->Getdt()*OutRate));
+ Debug(2);
+
return true;
}
void FGOutput::Debug(int from)
{
+ string scratch="";
+
if (debug_lvl <= 0) return;
if (debug_lvl & 1) { // Standard console startup message output
if (from == 0) { // Constructor
}
+ if (from == 2) {
+ if (outputInFileName.empty())
+ cout << " " << "Output parameters read inline" << endl;
+ else
+ cout << " Output parameters read from file: " << outputInFileName << endl;
+
+ if (Filename == "cout" || Filename == "COUT") {
+ scratch = " Log output goes to screen console";
+ } else if (!Filename.empty()) {
+ scratch = " Log output goes to file: " + Filename;
+ }
+ switch (Type) {
+ case otCSV:
+ cout << scratch << " in CSV format output at rate " << 120/rate << " Hz" << endl;
+ break;
+ case otNone:
+ cout << " No log output" << endl;
+ break;
+ }
+
+ if (SubSystems & ssSimulation) cout << " Simulation parameters logged" << endl;
+ if (SubSystems & ssAerosurfaces) cout << " Aerosurface parameters logged" << endl;
+ if (SubSystems & ssRates) cout << " Rate parameters logged" << endl;
+ if (SubSystems & ssVelocities) cout << " Velocity parameters logged" << endl;
+ if (SubSystems & ssForces) cout << " Force parameters logged" << endl;
+ if (SubSystems & ssMoments) cout << " Moments parameters logged" << endl;
+ if (SubSystems & ssAtmosphere) cout << " Atmosphere parameters logged" << endl;
+ if (SubSystems & ssMassProps) cout << " Mass parameters logged" << endl;
+ if (SubSystems & ssCoefficients) cout << " Coefficient parameters logged" << endl;
+ if (SubSystems & ssPosition) cout << " Position parameters logged" << endl;
+ if (SubSystems & ssGroundReactions) cout << " Ground parameters logged" << endl;
+ if (SubSystems & ssFCS) cout << " FCS parameters logged" << endl;
+ if (SubSystems & ssPropulsion) cout << " Propulsion parameters logged" << endl;
+ }
}
if (debug_lvl & 2 ) { // Instantiation/Destruction notification
if (from == 0) cout << "Instantiated: FGOutput" << endl;
}
if (debug_lvl & 16) { // Sanity checking
}
+ if (debug_lvl & 64) {
+ if (from == 0) { // Constructor
+ cout << IdSrc << endl;
+ cout << IdHdr << endl;
+ }
+ }
+}
}
-
projects / flightgear.git / blobdiff