]> git.mxchange.org Git - flightgear.git/blobdiff - src/FDM/JSBSim/FGState.cpp
Curt Olson:
[flightgear.git] / src / FDM / JSBSim / FGState.cpp
index 5adfb8757b81c2d16eca5c24b118b8572ddac74a..999af7da55af9ef0a0e056f44949702fed14b616 100644 (file)
@@ -47,12 +47,14 @@ INCLUDES
 #  endif
 #endif
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 #define snprintf _snprintf
 #endif
 
 #include "FGState.h"
 
+namespace JSBSim {
+
 static const char *IdSrc = "$Id$";
 static const char *IdHdr = ID_STATE;
 
@@ -60,39 +62,17 @@ static const char *IdHdr = ID_STATE;
 MACROS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#define RegisterVariable(ID,DEF) coeffdef[#ID] = ID; paramdef[ID] = DEF
-
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CLASS IMPLEMENTATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-//
-// For every term registered here there must be a corresponding handler in
-// GetParameter() below that retrieves that parameter. Also, there must be an
-// entry in the enum eParam definition in FGJSBBase.h. The ID is what must be used
-// in any config file entry which references that item.
-
-FGState::FGState(FGFDMExec* fdex) : 
-    mTb2l(3,3),
-    mTl2b(3,3),
-    mTs2b(3,3),
-    mTb2s(3,3),
-    vQtrn(4),
-    vlastQdot(4),
-    vQdot(4),
-    vUVW(3),
-    vLocalVelNED(3),
-    vLocalEuler(3),
-    vTmp(4),
-    vEuler(3)
+FGState::FGState(FGFDMExec* fdex)
 {
   FDMExec = fdex;
 
   a = 1000.0;
   sim_time = 0.0;
   dt = 1.0/120.0;
-  ActiveEngine = -1;
 
   Aircraft     = FDMExec->GetAircraft();
   Translation  = FDMExec->GetTranslation();
@@ -104,383 +84,21 @@ FGState::FGState(FGFDMExec* fdex) :
   Aerodynamics = FDMExec->GetAerodynamics();
   GroundReactions = FDMExec->GetGroundReactions();
   Propulsion      = FDMExec->GetPropulsion();
+  PropertyManager = FDMExec->GetPropertyManager();
 
-  RegisterVariable(FG_TIME,           " time "           );
-  RegisterVariable(FG_QBAR,           " qbar "           );
-  RegisterVariable(FG_WINGAREA,       " wing_area "      );
-  RegisterVariable(FG_WINGSPAN,       " wingspan "       );
-  RegisterVariable(FG_CBAR,           " cbar "           );
-  RegisterVariable(FG_ALPHA,          " alpha "          );
-  RegisterVariable(FG_ALPHADOT,       " alphadot "       );
-  RegisterVariable(FG_BETA,           " beta "           );
-  RegisterVariable(FG_ABETA,          " |beta| "         );
-  RegisterVariable(FG_BETADOT,        " betadot "        );
-  RegisterVariable(FG_PHI,            " roll_angle "     );
-  RegisterVariable(FG_THT,            " pitch_angle "    );
-  RegisterVariable(FG_PSI,            " heading_angle "  );
-  RegisterVariable(FG_PITCHRATE,      " pitch_rate "     );
-  RegisterVariable(FG_ROLLRATE,       " roll_rate "      );
-  RegisterVariable(FG_YAWRATE,        " yaw_rate "       );
-  RegisterVariable(FG_AEROQ,          " aero_pitch_rate ");
-  RegisterVariable(FG_AEROP,          " aero_roll_rate " );
-  RegisterVariable(FG_AEROR,          " aero_yaw_rate "  );
-  RegisterVariable(FG_CL_SQRD,        " Clift_sqrd "     );
-  RegisterVariable(FG_MACH,           " mach "           );
-  RegisterVariable(FG_ALTITUDE,       " altitude "       );
-  RegisterVariable(FG_BI2VEL,         " BI2Vel "         );
-  RegisterVariable(FG_CI2VEL,         " CI2Vel "         );
-  RegisterVariable(FG_ELEVATOR_POS,   " elevator_pos "   );
-  RegisterVariable(FG_AILERON_POS,    " aileron_pos "    );
-  RegisterVariable(FG_RUDDER_POS,     " rudder_pos "     );
-  RegisterVariable(FG_SPDBRAKE_POS,   " speedbrake_pos " );
-  RegisterVariable(FG_SPOILERS_POS,   " spoiler_pos "    );
-  RegisterVariable(FG_FLAPS_POS,      " flaps_pos "      );
-  RegisterVariable(FG_GEAR_POS,       " gear_pos "       );
-  RegisterVariable(FG_ELEVATOR_CMD,   " elevator_cmd "   );
-  RegisterVariable(FG_AILERON_CMD,    " aileron_cmd "    );
-  RegisterVariable(FG_RUDDER_CMD,     " rudder_cmd "     );
-  RegisterVariable(FG_SPDBRAKE_CMD,   " speedbrake_cmd " );
-  RegisterVariable(FG_SPOILERS_CMD,   " spoiler_cmd "    );
-  RegisterVariable(FG_FLAPS_CMD,      " flaps_cmd "      );
-  RegisterVariable(FG_THROTTLE_CMD,   " throttle_cmd "   );
-  RegisterVariable(FG_GEAR_CMD,       " gear_cmd "       );
-  RegisterVariable(FG_THROTTLE_POS,   " throttle_pos "   );
-  RegisterVariable(FG_MIXTURE_CMD,    " mixture_cmd "    );
-  RegisterVariable(FG_MIXTURE_POS,    " mixture_pos "    );
-  RegisterVariable(FG_MAGNETO_CMD,    " magneto_cmd "    );
-  RegisterVariable(FG_STARTER_CMD,    " starter_cmd "    );
-  RegisterVariable(FG_ACTIVE_ENGINE,  " active_engine "  );
-  RegisterVariable(FG_HOVERB,         " height/span "    );
-  RegisterVariable(FG_PITCH_TRIM_CMD, " pitch_trim_cmd " );
-  RegisterVariable(FG_LEFT_BRAKE_CMD, " left_brake_cmd " );
-  RegisterVariable(FG_RIGHT_BRAKE_CMD," right_brake_cmd ");
-  RegisterVariable(FG_CENTER_BRAKE_CMD," center_brake_cmd ");
-  RegisterVariable(FG_ALPHAH,          " h-tail alpha " );
-  RegisterVariable(FG_ALPHAW,          " wing alpha " );
-  RegisterVariable(FG_LBARH,           " h-tail arm " );
-  RegisterVariable(FG_LBARV,           " v-tail arm " );
-  RegisterVariable(FG_HTAILAREA,       " h-tail area " );
-  RegisterVariable(FG_VTAILAREA,       " v-tail area " );
-  RegisterVariable(FG_VBARH,           " h-tail volume " );
-  RegisterVariable(FG_VBARV,           " v-tail volume " );
-  RegisterVariable(FG_SET_LOGGING,    " data_logging "   );
-
-  if (debug_lvl & 2) cout << "Instantiated: FGState" << endl;
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+  for(int i=0;i<4;i++) vQdot_prev[i].InitMatrix();
 
-FGState::~FGState()
-{
-  if (debug_lvl & 2) cout << "Destroyed:    FGState" << endl;
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-double FGState::GetParameter(eParam val_idx) {
-  double scratch;
+  bind();
   
-  switch(val_idx) {
-  case FG_TIME:
-    return sim_time;
-  case FG_QBAR:
-    return Translation->Getqbar();
-  case FG_WINGAREA:
-    return Aircraft->GetWingArea();
-  case FG_WINGSPAN:
-    return Aircraft->GetWingSpan();
-  case FG_CBAR:
-    return Aircraft->Getcbar();
-  case FG_LBARH:
-    return Aircraft->Getlbarh();
-  case FG_LBARV:
-    return Aircraft->Getvbarh();
-  case FG_HTAILAREA:
-    return Aircraft->GetHTailArea();
-  case FG_VTAILAREA:
-    return Aircraft->GetVTailArea();
-  case FG_VBARH:
-    return Aircraft->Getvbarh();
-  case FG_VBARV:
-    return Aircraft->Getvbarv();
-  case FG_ALPHA:
-    return Translation->Getalpha();
-  case FG_ALPHAW:
-    return  Translation->Getalpha() + Aircraft->GetWingIncidence();
-  case FG_ALPHADOT:
-    return Translation->Getadot();
-  case FG_BETA:
-    return Translation->Getbeta();
-  case FG_ABETA:
-    return fabs(Translation->Getbeta());   
-  case FG_BETADOT:
-    return Translation->Getbdot();
-  case FG_PHI:
-    return Rotation->Getphi();
-  case FG_THT:
-    return Rotation->Gettht();
-  case FG_PSI:
-    return Rotation->Getpsi();
-  case FG_PITCHRATE:
-    return Rotation->GetPQR(eQ);
-  case FG_ROLLRATE:
-    return Rotation->GetPQR(eP);
-  case FG_YAWRATE:
-    return Rotation->GetPQR(eR);
-  case FG_AEROP:
-    return Rotation->GetAeroPQR(eP);
-  case FG_AEROQ:
-    return Rotation->GetAeroPQR(eQ);
-  case FG_AEROR:
-    return Rotation->GetAeroPQR(eR);
-  case FG_CL_SQRD:
-    if (Translation->Getqbar() > 0.00)
-      scratch = Aerodynamics->GetvLastFs(eLift)/(Aircraft->GetWingArea()*Translation->Getqbar());
-    else
-      scratch = 0.0;
-    return scratch*scratch;                                       
-  case FG_ELEVATOR_POS:
-    return FCS->GetDePos();
-  case FG_AILERON_POS:
-    return FCS->GetDaPos();
-  case FG_RUDDER_POS:
-    return FCS->GetDrPos();
-  case FG_SPDBRAKE_POS:
-    return FCS->GetDsbPos();
-  case FG_SPOILERS_POS:
-    return FCS->GetDspPos();
-  case FG_FLAPS_POS:
-    return FCS->GetDfPos();
-  case FG_ELEVATOR_CMD:
-    return FCS->GetDeCmd();
-  case FG_AILERON_CMD:
-    return FCS->GetDaCmd();
-  case FG_RUDDER_CMD:
-    return FCS->GetDrCmd();
-  case FG_SPDBRAKE_CMD:
-    return FCS->GetDsbCmd();
-  case FG_SPOILERS_CMD:
-    return FCS->GetDspCmd();
-  case FG_FLAPS_CMD:
-    return FCS->GetDfCmd();
-  case FG_MACH:
-    return Translation->GetMach();
-  case FG_ALTITUDE:
-    return Position->Geth();
-  case FG_BI2VEL:
-    if(Translation->GetVt() > 0)
-        return Aircraft->GetWingSpan()/(2.0 * Translation->GetVt());
-    else
-        return 0;
-  case FG_CI2VEL:
-    if(Translation->GetVt() > 0)
-        return Aircraft->Getcbar()/(2.0 * Translation->GetVt());
-    else
-        return 0;
-  case FG_THROTTLE_CMD:
-    if (ActiveEngine < 0) return FCS->GetThrottleCmd(0);
-    else return FCS->GetThrottleCmd(ActiveEngine);
-  case FG_THROTTLE_POS:
-    if (ActiveEngine < 0) return FCS->GetThrottlePos(0);
-    else return FCS->GetThrottlePos(ActiveEngine);
-  case FG_MAGNETO_CMD:
-    if (ActiveEngine < 0) return Propulsion->GetEngine(0)->GetMagnetos();
-    else return Propulsion->GetEngine(ActiveEngine)->GetMagnetos();
-  case FG_STARTER_CMD:
-    if (ActiveEngine < 0) {
-      if (Propulsion->GetEngine(0)->GetStarter()) return 1.0;
-      else return 0.0;
-    } else {
-      if (Propulsion->GetEngine(ActiveEngine)->GetStarter()) return 1.0;
-      else return 0.0;
-    }
-  case FG_MIXTURE_CMD:
-    if (ActiveEngine < 0) return FCS->GetMixtureCmd(0);
-    else return FCS->GetMixtureCmd(ActiveEngine);
-  case FG_MIXTURE_POS:
-    if (ActiveEngine < 0) return FCS->GetMixturePos(0);
-    else return FCS->GetMixturePos(ActiveEngine);
-  case FG_HOVERB:
-    return Position->GetHOverBMAC();
-  case FG_PITCH_TRIM_CMD:
-    return FCS->GetPitchTrimCmd();
-  case FG_GEAR_CMD:
-    return FCS->GetGearCmd();
-  case FG_GEAR_POS:
-    return FCS->GetGearPos();    
-  default:
-    cerr << "FGState::GetParameter() - No handler for parameter " << paramdef[val_idx] << endl;
-    return 0.0;
-  }
-  return 0;
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-double FGState::GetParameter(string val_string) {
-  return GetParameter(coeffdef[val_string]);
+  Debug(0);
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-eParam FGState::GetParameterIndex(string val_string) {
-  return coeffdef[val_string];
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-void FGState::SetParameter(eParam val_idx, double val) {
-  switch(val_idx) {
-  case FG_ELEVATOR_POS:
-    FCS->SetDePos(val);
-    break;
-  case FG_AILERON_POS:
-    FCS->SetDaPos(val);
-    break;
-  case FG_RUDDER_POS:
-    FCS->SetDrPos(val);
-    break;
-  case FG_SPDBRAKE_POS:
-    FCS->SetDsbPos(val);
-    break;
-  case FG_SPOILERS_POS:
-    FCS->SetDspPos(val);
-    break;
-  case FG_FLAPS_POS:
-    FCS->SetDfPos(val);
-    break;
-  case FG_THROTTLE_POS:
-    FCS->SetThrottlePos(ActiveEngine,val);
-    break;
-  case FG_MIXTURE_POS:
-    FCS->SetMixturePos(ActiveEngine,val);
-    break;
-
-  case FG_ELEVATOR_CMD:
-    FCS->SetDeCmd(val);
-    break;
-  case FG_AILERON_CMD:
-    FCS->SetDaCmd(val);
-    break;
-  case FG_RUDDER_CMD:
-    FCS->SetDrCmd(val);
-    break;
-  case FG_SPDBRAKE_CMD:
-    FCS->SetDsbCmd(val);
-    break;
-  case FG_SPOILERS_CMD:
-    FCS->SetDspCmd(val);
-    break;
-  case FG_FLAPS_CMD:
-    FCS->SetDfCmd(val);
-    break;
-  case FG_THROTTLE_CMD:
-    FCS->SetThrottleCmd(ActiveEngine,val);
-    break;
-  case FG_MIXTURE_CMD:
-    FCS->SetMixtureCmd(ActiveEngine,val);
-    break;
-  case FG_MAGNETO_CMD:
-    Propulsion->GetEngine(ActiveEngine)->SetMagnetos((int)val); // need to account for -1
-    break;
-  case FG_STARTER_CMD:
-    if      (val < 0.001) 
-      Propulsion->GetEngine(ActiveEngine)->SetStarter(false); // need to account for -1
-    else if (val >=  0.001)
-      Propulsion->GetEngine(ActiveEngine)->SetStarter(true); // need to account for -1
-    break;
-  case FG_ACTIVE_ENGINE:
-    ActiveEngine = (int)val;
-    break;
-
-  case FG_LEFT_BRAKE_CMD:
-    FCS->SetLBrake(val);
-    break;
-  case FG_CENTER_BRAKE_CMD:
-    FCS->SetCBrake(val);
-    break;
-  case FG_RIGHT_BRAKE_CMD:
-    FCS->SetRBrake(val);
-    break;
-  case FG_GEAR_CMD:
-    FCS->SetGearCmd(val);
-    break;
-  case  FG_GEAR_POS:
-    FCS->SetGearPos(val);
-    break; 
-  case FG_SET_LOGGING:
-    if      (val < -0.01) Output->Disable();
-    else if (val >  0.01) Output->Enable();
-    else                  Output->Toggle();
-    break;
-
-  default:
-    cerr << "Parameter '" << val_idx << "' (" << paramdef[val_idx] << ") not handled" << endl;
-  }
-}
-
-//***************************************************************************
-//
-// Reset: Assume all angles READ FROM FILE IN DEGREES !!
-//
-
-bool FGState::Reset(string path, string acname, string fname)
+FGState::~FGState()
 {
-  string resetDef;
-  string token="";
-
-  double U, V, W;
-  double phi, tht, psi;
-  double latitude, longitude, h;
-  double wdir, wmag, wnorth, weast;
-
-# ifndef macintosh
-  resetDef = path + "/" + acname + "/" + fname + ".xml";
-# else
-  resetDef = path + ";" + acname + ";" + fname + ".xml";
-# endif
-
-  FGConfigFile resetfile(resetDef);
-  if (!resetfile.IsOpen()) return false;
-
-  resetfile.GetNextConfigLine();
-  token = resetfile.GetValue();
-  if (token != string("initialize")) {
-    cerr << "The reset file " << resetDef
-         << " does not appear to be a reset file" << endl;
-    return false;
-  }
-  
-  resetfile.GetNextConfigLine();
-  resetfile >> token;
-  while (token != string("/initialize") && token != string("EOF")) {
-    if (token == "UBODY") resetfile >> U;
-    if (token == "VBODY") resetfile >> V;
-    if (token == "WBODY") resetfile >> W;
-    if (token == "LATITUDE") resetfile >> latitude;
-    if (token == "LONGITUDE") resetfile >> longitude;
-    if (token == "PHI") resetfile >> phi;
-    if (token == "THETA") resetfile >> tht;
-    if (token == "PSI") resetfile >> psi;
-    if (token == "ALTITUDE") resetfile >> h;
-    if (token == "WINDDIR") resetfile >> wdir;
-    if (token == "VWIND") resetfile >> wmag;
-
-    resetfile >> token;
-  }
-  
-  
-  Position->SetLatitude(latitude*degtorad);
-  Position->SetLongitude(longitude*degtorad);
-  Position->Seth(h);
-
-  wnorth = wmag*ktstofps*cos(wdir*degtorad);
-  weast = wmag*ktstofps*sin(wdir*degtorad);
-  
-  Initialize(U, V, W, phi*degtorad, tht*degtorad, psi*degtorad,
-               latitude*degtorad, longitude*degtorad, h, wnorth, weast, 0.0);
-
-  return true;
+  unbind();
+  Debug(1);
 }
 
 //***************************************************************************
@@ -540,8 +158,8 @@ void FGState::Initialize(double U, double V, double W,
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-void FGState::Initialize(FGInitialCondition *FGIC) {
-
+void FGState::Initialize(FGInitialCondition *FGIC)
+{
   double tht,psi,phi;
   double U, V, W, h;
   double latitude, longitude;
@@ -570,30 +188,8 @@ void FGState::Initialize(FGInitialCondition *FGIC) {
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-bool FGState::StoreData(string fname) {
-  ofstream datafile(fname.c_str());
-
-  if (datafile) {
-    datafile << Translation->GetUVW(eU);
-    datafile << Translation->GetUVW(eV);
-    datafile << Translation->GetUVW(eW);
-    datafile << Position->GetLatitude();
-    datafile << Position->GetLongitude();
-    datafile << Rotation->GetEuler(ePhi);
-    datafile << Rotation->GetEuler(eTht);
-    datafile << Rotation->GetEuler(ePsi);
-    datafile << Position->Geth();
-    datafile.close();
-    return true;
-  } else {
-    cerr << "Could not open dump file " << fname << endl;
-    return false;
-  }
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-void FGState::InitMatrices(double phi, double tht, double psi) {
+void FGState::InitMatrices(double phi, double tht, double psi)
+{
   double thtd2, psid2, phid2;
   double Sthtd2, Spsid2, Sphid2;
   double Cthtd2, Cpsid2, Cphid2;
@@ -629,7 +225,8 @@ void FGState::InitMatrices(double phi, double tht, double psi) {
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-void FGState::CalcMatrices(void) {
+void FGState::CalcMatrices(void)
+{
   double Q0Q0, Q1Q1, Q2Q2, Q3Q3;
   double Q0Q1, Q0Q2, Q0Q3, Q1Q2;
   double Q1Q3, Q2Q3;
@@ -661,21 +258,22 @@ void FGState::CalcMatrices(void) {
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-void FGState::IntegrateQuat(FGColumnVector3 vPQR, int rate) {
+void FGState::IntegrateQuat(FGColumnVector3 vPQR, int rate)
+{
   vQdot(1) = -0.5*(vQtrn(2)*vPQR(eP) + vQtrn(3)*vPQR(eQ) + vQtrn(4)*vPQR(eR));
   vQdot(2) =  0.5*(vQtrn(1)*vPQR(eP) + vQtrn(3)*vPQR(eR) - vQtrn(4)*vPQR(eQ));
   vQdot(3) =  0.5*(vQtrn(1)*vPQR(eQ) + vQtrn(4)*vPQR(eP) - vQtrn(2)*vPQR(eR));
   vQdot(4) =  0.5*(vQtrn(1)*vPQR(eR) + vQtrn(2)*vPQR(eQ) - vQtrn(3)*vPQR(eP));
-  vQtrn += 0.5*dt*rate*(vlastQdot + vQdot);
 
-  vQtrn.Normalize();
+  vQtrn += Integrate(TRAPZ, dt*rate, vQdot, vQdot_prev);
 
-  vlastQdot = vQdot;
+  vQtrn.Normalize();
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-FGColumnVector3& FGState::CalcEuler(void) {
+FGColumnVector3& FGState::CalcEuler(void)
+{
   if (mTl2b(3,3) == 0.0) mTl2b(3,3) = 0.0000001;
   if (mTl2b(1,1) == 0.0) mTl2b(1,1) = 0.0000001;
 
@@ -745,7 +343,9 @@ FGMatrix33& FGState::GetTb2s(void)
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-void FGState::ReportState(void) {
+void FGState::ReportState(void)
+{
+#if !defined(__BORLANDCPP__)
   char out[80], flap[10], gear[12];
   
   cout << endl << "  JSBSim State" << endl;
@@ -755,28 +355,30 @@ void FGState::ReportState(void) {
                    FDMExec->GetMassBalance()->GetXYZcg(2),
                    FDMExec->GetMassBalance()->GetXYZcg(3));
   cout << out;             
-  if( FCS->GetDfPos() <= 0.01)
+  if ( FCS->GetDfPos() <= 0.01)
     snprintf(flap,10,"Up");
   else
     snprintf(flap,10,"%2.0f",FCS->GetDfPos());
-  if(FCS->GetGearPos() < 0.01)
+
+  if (FCS->GetGearPos() < 0.01)
     snprintf(gear,12,"Up");
-  else if(FCS->GetGearPos() > 0.99)
+  else if (FCS->GetGearPos() > 0.99)
     snprintf(gear,12,"Down");
   else
-    snprintf(gear,12,"In Transit");   
+    snprintf(gear,12,"In Transit");
+
   snprintf(out,80, "    Flaps: %3s  Gear: %12s\n",flap,gear);
   cout << out;
   snprintf(out,80, "    Speed: %4.0f KCAS  Mach: %5.2f\n",
                     FDMExec->GetAuxiliary()->GetVcalibratedKTS(),
-                    GetParameter(FG_MACH) );
+                    Translation->GetMach() );
   cout << out;
   snprintf(out,80, "    Altitude: %7.0f ft.  AGL Altitude: %7.0f ft.\n",
                     Position->Geth(),
                     Position->GetDistanceAGL() );
   cout << out;
   snprintf(out,80, "    Angle of Attack: %6.2f deg  Pitch Angle: %6.2f deg\n",
-                    GetParameter(FG_ALPHA)*radtodeg,
+                    Translation->Getalpha()*radtodeg,
                     Rotation->Gettht()*radtodeg );
   cout << out;
   snprintf(out,80, "    Flight Path Angle: %6.2f deg  Climb Rate: %5.0f ft/min\n",
@@ -785,19 +387,21 @@ void FGState::ReportState(void) {
   cout << out;                  
   snprintf(out,80, "    Normal Load Factor: %4.2f g's  Pitch Rate: %5.2f deg/s\n",
                     Aircraft->GetNlf(),
-                    GetParameter(FG_PITCHRATE)*radtodeg );
+                    Rotation->GetPQR(2)*radtodeg );
   cout << out;
-  snprintf(out,80, "    Heading: %3.0f deg true  Sideslip: %5.2f deg\n",
+  snprintf(out,80, "    Heading: %3.0f deg true  Sideslip: %5.2f deg  Yaw Rate: %5.2f deg/s\n",
                     Rotation->Getpsi()*radtodeg,
-                    GetParameter(FG_BETA)*radtodeg );                  
+                    Translation->Getbeta()*radtodeg,
+                    Rotation->GetPQR(3)*radtodeg  );                  
   cout << out;
-  snprintf(out,80, "    Bank Angle: %5.2f deg\n",
-                    Rotation->Getphi()*radtodeg );
+  snprintf(out,80, "    Bank Angle: %5.2f deg  Roll Rate: %5.2f deg/s\n",
+                    Rotation->Getphi()*radtodeg, 
+                    Rotation->GetPQR(1)*radtodeg );
   cout << out;
   snprintf(out,80, "    Elevator: %5.2f deg  Left Aileron: %5.2f deg  Rudder: %5.2f deg\n",
-                    GetParameter(FG_ELEVATOR_POS)*radtodeg,
-                    GetParameter(FG_AILERON_POS)*radtodeg,
-                    GetParameter(FG_RUDDER_POS)*radtodeg );
+                    FCS->GetDePos(ofRad)*radtodeg,
+                    FCS->GetDaLPos(ofRad)*radtodeg,
+                    FCS->GetDrPos(ofRad)*radtodeg );
   cout << out;                  
   snprintf(out,80, "    Throttle: %5.2f%c\n",
                     FCS->GetThrottlePos(0)*100,'%' );
@@ -812,12 +416,67 @@ void FGState::ReportState(void) {
                     Position->GetVground()*fpstokts,
                     Position->GetGroundTrack()*radtodeg );
   cout << out;                                   
-
+#endif
 } 
+
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-void FGState::Debug(void)
+void FGState::bind(void)
+{
+  PropertyManager->Tie("sim-time-sec",this,
+                        &FGState::Getsim_time);
+}
+
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+                        
+void FGState::unbind(void)
 {
-    //TODO: Add your source code here
+  PropertyManager->Untie("sim-time-sec");
 }
 
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+//    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 FGState::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: FGState" << endl;
+    if (from == 1) cout << "Destroyed:    FGState" << 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;
+    }
+  }
+}
+}