]> git.mxchange.org Git - flightgear.git/blobdiff - src/FDM/JSBSim/FGRotation.cpp
Updated to match changes in radiostack.[ch]xx
[flightgear.git] / src / FDM / JSBSim / FGRotation.cpp
index dd928d555d6f63e271dfe6a24345d014389255a0..aa48af0e121b5a80ef02899ae963caec90661683 100644 (file)
@@ -66,6 +66,8 @@ INCLUDES
 #include "FGPosition.h"
 #include "FGAuxiliary.h"
 #include "FGOutput.h"
+#include "FGPropertyManager.h"
+
 
 static const char *IdSrc = "$Id$";
 static const char *IdHdr = ID_ROTATION;
@@ -75,34 +77,31 @@ CLASS IMPLEMENTATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 
-FGRotation::FGRotation(FGFDMExec* fdmex) : FGModel(fdmex),
-        vPQR(3),
-        vPQRdot(3),
-        vMoments(3),
-        vEuler(3),
-        vEulerRates(3),
-       vlastPQRdot(3)
+FGRotation::FGRotation(FGFDMExec* fdmex) : FGModel(fdmex)
 {
   Name = "FGRotation";
   cTht=cPhi=cPsi=1.0;
   sTht=sPhi=sPsi=0.0;
-
-  if (debug_lvl & 2) cout << "Instantiated: " << Name << endl;
+  
+  bind();
+  
+  Debug(0);
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 FGRotation::~FGRotation()
 {
-  if (debug_lvl & 2) cout << "Destroyed:    FGRotation" << endl;
+  unbind();
+  Debug(1);
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 bool FGRotation::Run(void)
 {
-  float L2, N1;
-  float tTheta;
+  double L2, N1;
+  double tTheta;
 
   if (!FGModel::Run()) {
     GetState();
@@ -115,6 +114,7 @@ bool FGRotation::Run(void)
     vPQRdot(eR) = (N1*Ixx + L2*Ixz) / (Ixx*Izz - Ixz*Ixz);
 
     vPQR += dt*rate*(vlastPQRdot + vPQRdot)/2.0;
+    vAeroPQR = vPQR + Atmosphere->GetTurbPQR();
 
     State->IntegrateQuat(vPQR, rate);
     State->CalcMatrices();
@@ -133,7 +133,7 @@ bool FGRotation::Run(void)
 
     vlastPQRdot = vPQRdot;
 
-    if (debug_lvl > 1) Debug();
+    if (debug_lvl > 1) Debug(2);
 
     return false;
   } else {
@@ -156,15 +156,122 @@ void FGRotation::GetState(void)
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-void FGRotation::Debug(void)
+void FGRotation::bind(void)
+{
+  typedef double (FGRotation::*PMF)(int) const;
+  PropertyManager->Tie("velocities/p-rad_sec", this,1,
+                       (PMF)&FGRotation::GetPQR);
+  PropertyManager->Tie("velocities/q-rad_sec", this,2,
+                       (PMF)&FGRotation::GetPQR);
+  PropertyManager->Tie("velocities/r-rad_sec", this,3,
+                       (PMF)&FGRotation::GetPQR);
+  PropertyManager->Tie("velocities/p-aero-rad_sec", this,1,
+                       (PMF)&FGRotation::GetAeroPQR);
+  PropertyManager->Tie("velocities/q-aero-rad_sec", this,2,
+                       (PMF)&FGRotation::GetAeroPQR);
+  PropertyManager->Tie("velocities/r-aero-rad_sec", this,3,
+                       (PMF)&FGRotation::GetAeroPQR);
+  PropertyManager->Tie("accelerations/pdot-rad_sec", this,1,
+                       (PMF)&FGRotation::GetPQRdot);
+  PropertyManager->Tie("accelerations/qdot-rad_sec", this,2,
+                       (PMF)&FGRotation::GetPQRdot);
+  PropertyManager->Tie("accelerations/rdot-rad_sec", this,3,
+                       (PMF)&FGRotation::GetPQRdot);
+  PropertyManager->Tie("attitude/roll-rad", this,1,
+                       (PMF)&FGRotation::GetEuler);
+  PropertyManager->Tie("attitude/pitch-rad", this,2,
+                       (PMF)&FGRotation::GetEuler);
+  PropertyManager->Tie("attitude/heading-true-rad", this,3,
+                       (PMF)&FGRotation::GetEuler);
+  PropertyManager->Tie("velocities/phidot-rad_sec", this,1,
+                       (PMF)&FGRotation::GetEulerRates);
+  PropertyManager->Tie("velocities/thetadot-rad_sec", this,2,
+                       (PMF)&FGRotation::GetEulerRates);
+  PropertyManager->Tie("velocities/psidot-rad_sec", this,3,
+                       (PMF)&FGRotation::GetEulerRates);
+  PropertyManager->Tie("attitude/phi-rad", this,
+                       &FGRotation::Getphi);
+  PropertyManager->Tie("attitude/theta-rad", this,
+                       &FGRotation::Gettht);
+  PropertyManager->Tie("attitude/psi-true-rad", this,
+                       &FGRotation::Getpsi);
+}
+
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+void FGRotation::unbind(void)
+{
+  PropertyManager->Untie("velocities/p-rad_sec");
+  PropertyManager->Untie("velocities/q-rad_sec");
+  PropertyManager->Untie("velocities/r-rad_sec");
+  PropertyManager->Untie("velocities/p-aero-rad_sec");
+  PropertyManager->Untie("velocities/q-aero-rad_sec");
+  PropertyManager->Untie("velocities/r-aero-rad_sec");
+  PropertyManager->Untie("accelerations/pdot-rad_sec");
+  PropertyManager->Untie("accelerations/qdot-rad_sec");
+  PropertyManager->Untie("accelerations/rdot-rad_sec");
+  PropertyManager->Untie("attitude/roll-rad");
+  PropertyManager->Untie("attitude/pitch-rad");
+  PropertyManager->Untie("attitude/heading-true-rad");
+  PropertyManager->Untie("velocities/phidot-rad_sec");
+  PropertyManager->Untie("velocities/thetadot-rad_sec");
+  PropertyManager->Untie("velocities/psidot-rad_sec");
+  PropertyManager->Untie("attitude/phi-rad");
+  PropertyManager->Untie("attitude/theta-rad");
+  PropertyManager->Untie("attitude/psi-true-rad");
+}
+
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+//    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 FGRotation::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: FGRotation" << endl;
+    if (from == 1) cout << "Destroyed:    FGRotation" << 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 check variables
-    if (fabs(vPQR(eP)) > 100)
-      cout << "FGRotation::P (Roll Rate) out of bounds: " << vPQR(eP) << endl;
-    if (fabs(vPQR(eQ)) > 100)
-      cout << "FGRotation::Q (Pitch Rate) out of bounds: " << vPQR(eQ) << endl;
-    if (fabs(vPQR(eR)) > 100)
-      cout << "FGRotation::R (Yaw Rate) out of bounds: " << vPQR(eR) << endl;
+    if (from == 2) {
+      if (fabs(vPQR(eP)) > 100)
+        cout << "FGRotation::P (Roll Rate) out of bounds: " << vPQR(eP) << endl;
+      if (fabs(vPQR(eQ)) > 100)
+        cout << "FGRotation::Q (Pitch Rate) out of bounds: " << vPQR(eQ) << endl;
+      if (fabs(vPQR(eR)) > 100)
+        cout << "FGRotation::R (Yaw Rate) out of bounds: " << vPQR(eR) << endl;
+    }
+  }
+  if (debug_lvl & 64) {
+    if (from == 0) { // Constructor
+      cout << IdSrc << endl;
+      cout << IdHdr << endl;
+    }
   }
 }