Updated to match changes in radiostack.[ch]xx

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

diff --git a/src/FDM/JSBSim/FGModel.cpp b/src/FDM/JSBSim/FGModel.cpp
index 7006b1d0bb2711893d2d1cf266ad71697a3f9aad..6520196e6f418e00fa3bbc9b8dc6900944e73d64 100644 (file)
--- a/src/FDM/JSBSim/FGModel.cpp
+++ b/src/FDM/JSBSim/FGModel.cpp
@@ -47,6 +47,7 @@ INCLUDES
 #include "FGMassBalance.h"
 #include "FGAerodynamics.h"
 #include "FGInertial.h"
+#include "FGGroundReactions.h"
 #include "FGAircraft.h"
 #include "FGTranslation.h"
 #include "FGRotation.h"
@@ -61,8 +62,6 @@ static const char *IdHdr = ID_MODEL;
 GLOBAL DECLARATIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-extern short debug_lvl;
-
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CLASS IMPLEMENTATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -72,20 +71,26 @@ FGModel::FGModel(FGFDMExec* fdmex)
   FDMExec     = fdmex;
   NextModel   = 0L;
 
-  State        = 0;
-  Atmosphere   = 0;
-  FCS          = 0;
-  Propulsion   = 0;
-  MassBalance  = 0;
-  Aerodynamics = 0;
-  Inertial     = 0;
-  Aircraft     = 0;
-  Translation  = 0;
-  Rotation     = 0;
-  Position     = 0;
-  Auxiliary    = 0;
-  Output       = 0;
-
+  State           = 0;
+  Atmosphere      = 0;
+  FCS             = 0;
+  Propulsion      = 0;
+  MassBalance     = 0;
+  Aerodynamics    = 0;
+  Inertial        = 0;
+  GroundReactions = 0;
+  Aircraft        = 0;
+  Translation     = 0;
+  Rotation        = 0;
+  Position        = 0;
+  Auxiliary       = 0;
+  Output          = 0;
+  
+  //in order for FGModel derived classes to self-bind (that is, call
+  //their bind function in the constructor, the PropertyManager pointer
+  //must be brought up now.
+  PropertyManager = FDMExec->GetPropertyManager();
+  
   exe_ctr     = 1;
 
   if (debug_lvl & 2) cout << "              FGModel Base Class" << endl;
@@ -102,20 +107,21 @@ FGModel::~FGModel()
 
 bool FGModel::InitModel(void)
 {
-  State        = FDMExec->GetState();
-  Atmosphere   = FDMExec->GetAtmosphere();
-  FCS          = FDMExec->GetFCS();
-  Propulsion   = FDMExec->GetPropulsion();
-  MassBalance  = FDMExec->GetMassBalance();
-  Aerodynamics = FDMExec->GetAerodynamics();
-  Inertial     = FDMExec->GetInertial();
-  Aircraft     = FDMExec->GetAircraft();
-  Translation  = FDMExec->GetTranslation();
-  Rotation     = FDMExec->GetRotation();
-  Position     = FDMExec->GetPosition();
-  Auxiliary    = FDMExec->GetAuxiliary();
-  Output       = FDMExec->GetOutput();
-
+  State           = FDMExec->GetState();
+  Atmosphere      = FDMExec->GetAtmosphere();
+  FCS             = FDMExec->GetFCS();
+  Propulsion      = FDMExec->GetPropulsion();
+  MassBalance     = FDMExec->GetMassBalance();
+  Aerodynamics    = FDMExec->GetAerodynamics();
+  Inertial        = FDMExec->GetInertial();
+  GroundReactions = FDMExec->GetGroundReactions();
+  Aircraft        = FDMExec->GetAircraft();
+  Translation     = FDMExec->GetTranslation();
+  Rotation        = FDMExec->GetRotation();
+  Position        = FDMExec->GetPosition();
+  Auxiliary       = FDMExec->GetAuxiliary();
+  Output          = FDMExec->GetOutput();
+  
   if (!State ||
       !Atmosphere ||
       !FCS ||
@@ -123,6 +129,7 @@ bool FGModel::InitModel(void)
       !MassBalance ||
       !Aerodynamics ||
       !Inertial ||
+      !GroundReactions ||
       !Aircraft ||
       !Translation ||
       !Rotation ||
@@ -148,9 +155,48 @@ bool FGModel::Run()
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-void FGModel::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 FGModel::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: FGModel" << endl;
+    if (from == 1) cout << "Destroyed:    FGModel" << 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;
+    }
+  }
 }