Updated to match changes in radiostack.[ch]xx

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

diff --git a/src/FDM/JSBSim/FGGroundReactions.cpp b/src/FDM/JSBSim/FGGroundReactions.cpp
index 3f133eeace2253605406d1a1418314abf350b4de..c95b42edb80c9c1cc06b1bcb67ee19d17e75e8d6 100644 (file)
--- a/src/FDM/JSBSim/FGGroundReactions.cpp
+++ b/src/FDM/JSBSim/FGGroundReactions.cpp
@@ -36,10 +36,20 @@ INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 #include "FGGroundReactions.h"
+#include "FGPropertyManager.h"
 
 static const char *IdSrc = "$Id$";
 static const char *IdHdr = ID_GROUNDREACTIONS;
 
+#if defined (__APPLE__)
+/* Not all systems have the gcvt function */
+inline char* gcvt (double value, int ndigits, char *buf) {
+    /* note that this is not exactly what gcvt is supposed to do! */
+    snprintf (buf, ndigits+1, "%f", value);
+    return buf;
+}
+#endif
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CLASS IMPLEMENTATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -48,6 +58,8 @@ CLASS IMPLEMENTATION
 FGGroundReactions::FGGroundReactions(FGFDMExec* fgex) : FGModel(fgex)
 {
   Name = "FGGroundReactions";
+  
+  bind();
 
   Debug(0);
 }
@@ -56,6 +68,8 @@ FGGroundReactions::FGGroundReactions(FGFDMExec* fgex) : FGModel(fgex)
 
 FGGroundReactions::~FGGroundReactions(void)
 {
+  unbind();
+
   Debug(1);
 }
 
@@ -116,9 +130,14 @@ string FGGroundReactions::GetGroundReactionStrings(void)
   for (unsigned int i=0;i<lGear.size();i++) {
     if (!firstime) GroundReactionStrings += ", ";
     GroundReactionStrings += (lGear[i].GetName() + "_WOW, ");
-    GroundReactionStrings += (lGear[i].GetName() + "_compressLength, ");
-    GroundReactionStrings += (lGear[i].GetName() + "_compressSpeed, ");
-    GroundReactionStrings += (lGear[i].GetName() + "_Force");
+    GroundReactionStrings += (lGear[i].GetName() + "_stroke, ");
+    GroundReactionStrings += (lGear[i].GetName() + "_strokeVel, ");
+    GroundReactionStrings += (lGear[i].GetName() + "_CompressForce, ");
+    GroundReactionStrings += (lGear[i].GetName() + "_WhlSideForce, ");
+    GroundReactionStrings += (lGear[i].GetName() + "_WhlRollForce, ");
+    GroundReactionStrings += (lGear[i].GetName() + "_BodyXForce, ");
+    GroundReactionStrings += (lGear[i].GetName() + "_BodyYForce, ");
+    GroundReactionStrings += (lGear[i].GetName() + "_WhlSlipDegrees");
 
     firstime = false;
   }
@@ -140,7 +159,12 @@ string FGGroundReactions::GetGroundReactionValues(void)
     GroundReactionValues += string( lGear[i].GetWOW()?"1":"0" ) + ", ";
     GroundReactionValues += (string(gcvt(lGear[i].GetCompLen(),    5, buff)) + ", ");
     GroundReactionValues += (string(gcvt(lGear[i].GetCompVel(),    6, buff)) + ", ");
-    GroundReactionValues += (string(gcvt(lGear[i].GetCompForce(), 10, buff)));
+    GroundReactionValues += (string(gcvt(lGear[i].GetCompForce(), 10, buff)) + ", ");
+    GroundReactionValues += (string(gcvt(lGear[i].GetWheelSideForce(), 6, buff)) + ", ");
+    GroundReactionValues += (string(gcvt(lGear[i].GetWheelRollForce(), 6, buff)) + ", ");
+    GroundReactionValues += (string(gcvt(lGear[i].GetBodyXForce(), 6, buff)) + ", ");
+    GroundReactionValues += (string(gcvt(lGear[i].GetBodyYForce(), 6, buff)) + ", ");
+    GroundReactionValues += (string(gcvt(lGear[i].GetWheelSlipAngle(), 6, buff)));
 
     firstime = false;
   }
@@ -148,6 +172,40 @@ string FGGroundReactions::GetGroundReactionValues(void)
   return GroundReactionValues;
 }
 
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+void FGGroundReactions::bind(void)
+{ 
+  typedef double (FGGroundReactions::*PMF)(int) const;
+  PropertyManager->Tie("gear/num-units", this,
+                       &FGGroundReactions::GetNumGearUnits);  
+  PropertyManager->Tie("moments/l-gear-lbsft", this,1,
+                       (PMF)&FGGroundReactions::GetMoments);
+  PropertyManager->Tie("moments/m-gear-lbsft", this,2,
+                       (PMF)&FGGroundReactions::GetMoments);
+  PropertyManager->Tie("moments/n-gear-lbsft", this,3,
+                       (PMF)&FGGroundReactions::GetMoments);
+  PropertyManager->Tie("forces/fbx-gear-lbs", this,1,
+                       (PMF)&FGGroundReactions::GetForces);
+  PropertyManager->Tie("forces/fby-gear-lbs", this,2,
+                       (PMF)&FGGroundReactions::GetForces);
+  PropertyManager->Tie("forces/fbz-gear-lbs", this,3,
+                       (PMF)&FGGroundReactions::GetForces);
+}
+
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+void FGGroundReactions::unbind(void)
+{
+  PropertyManager->Untie("gear/num-units");
+  PropertyManager->Untie("moments/l-gear-lbsft");
+  PropertyManager->Untie("moments/m-gear-lbsft");
+  PropertyManager->Untie("moments/n-gear-lbsft");
+  PropertyManager->Untie("forces/fbx-gear-lbs");
+  PropertyManager->Untie("forces/fby-gear-lbs");
+  PropertyManager->Untie("forces/fbz-gear-lbs");
+}
+
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 //    The bitmasked value choices are as follows:
 //    unset: In this case (the default) JSBSim would only print