Various clean-ups.

diff --git a/src/FDM/JSBSim/FGFCS.cpp b/src/FDM/JSBSim/FGFCS.cpp
index ed6dbf356d1c1611d892318e00f8875c69cb351d..e75f7df6107b53b731e119269354f1f4bb7dd8ba 100644 (file)
--- a/src/FDM/JSBSim/FGFCS.cpp
+++ b/src/FDM/JSBSim/FGFCS.cpp
@@ -697,87 +697,87 @@ void FGFCS::bind(void)
                        &FGFCS::SetGearPos,
                        true);
 
-  PropertyManager->Tie("jsbsim/ap/elevator_cmd", this,
+  PropertyManager->Tie("ap/elevator_cmd", this,
                        &FGFCS::GetAPDeCmd,
                        &FGFCS::SetAPDeCmd,
                        true);
 
-  PropertyManager->Tie("jsbsim/ap/aileron_cmd", this,
+  PropertyManager->Tie("ap/aileron_cmd", this,
                        &FGFCS::GetAPDaCmd,
                        &FGFCS::SetAPDaCmd,
                        true);
 
-  PropertyManager->Tie("jsbsim/ap/rudder_cmd", this,
+  PropertyManager->Tie("ap/rudder_cmd", this,
                        &FGFCS::GetAPDrCmd,
                        &FGFCS::SetAPDrCmd,
                        true);
 
-  PropertyManager->Tie("jsbsim/ap/throttle_cmd", this,
+  PropertyManager->Tie("ap/throttle_cmd", this,
                        &FGFCS::GetAPThrottleCmd,
                        &FGFCS::SetAPThrottleCmd,
                        true);
 
-  PropertyManager->Tie("jsbsim/ap/attitude_setpoint", this,
+  PropertyManager->Tie("ap/attitude_setpoint", this,
                        &FGFCS::GetAPAttitudeSetPt,
                        &FGFCS::SetAPAttitudeSetPt,
                        true);
 
-  PropertyManager->Tie("jsbsim/ap/altitude_setpoint", this,
+  PropertyManager->Tie("ap/altitude_setpoint", this,
                        &FGFCS::GetAPAltitudeSetPt,
                        &FGFCS::SetAPAltitudeSetPt,
                        true);
 
-  PropertyManager->Tie("jsbsim/ap/heading_setpoint", this,
+  PropertyManager->Tie("ap/heading_setpoint", this,
                        &FGFCS::GetAPHeadingSetPt,
                        &FGFCS::SetAPHeadingSetPt,
                        true);
 
-  PropertyManager->Tie("jsbsim/ap/airspeed_setpoint", this,
+  PropertyManager->Tie("ap/airspeed_setpoint", this,
                        &FGFCS::GetAPAirspeedSetPt,
                        &FGFCS::SetAPAirspeedSetPt,
                        true);
 
-  PropertyManager->Tie("jsbsim/ap/acquire_attitude", this,
+  PropertyManager->Tie("ap/acquire_attitude", this,
                        &FGFCS::GetAPAcquireAttitude,
                        &FGFCS::SetAPAcquireAttitude,
                        true);
 
-  PropertyManager->Tie("jsbsim/ap/acquire_altitude", this,
+  PropertyManager->Tie("ap/acquire_altitude", this,
                        &FGFCS::GetAPAcquireAltitude,
                        &FGFCS::SetAPAcquireAltitude,
                        true);
 
-  PropertyManager->Tie("jsbsim/ap/acquire_heading", this,
+  PropertyManager->Tie("ap/acquire_heading", this,
                        &FGFCS::GetAPAcquireHeading,
                        &FGFCS::SetAPAcquireHeading,
                        true);
 
-  PropertyManager->Tie("jsbsim/ap/acquire_airspeed", this,
+  PropertyManager->Tie("ap/acquire_airspeed", this,
                        &FGFCS::GetAPAcquireAirspeed,
                        &FGFCS::SetAPAcquireAirspeed,
                        true);
 
-  PropertyManager->Tie("jsbsim/ap/attitude_hold", this,
+  PropertyManager->Tie("ap/attitude_hold", this,
                        &FGFCS::GetAPAttitudeHold,
                        &FGFCS::SetAPAttitudeHold,
                        true);
 
-  PropertyManager->Tie("jsbsim/ap/altitude_hold", this,
+  PropertyManager->Tie("ap/altitude_hold", this,
                        &FGFCS::GetAPAltitudeHold,
                        &FGFCS::SetAPAltitudeHold,
                        true);
 
-  PropertyManager->Tie("jsbsim/ap/heading_hold", this,
+  PropertyManager->Tie("ap/heading_hold", this,
                        &FGFCS::GetAPHeadingHold,
                        &FGFCS::SetAPHeadingHold,
                        true);
 
-  PropertyManager->Tie("jsbsim/ap/airspeed_hold", this,
+  PropertyManager->Tie("ap/airspeed_hold", this,
                        &FGFCS::GetAPAirspeedHold,
                        &FGFCS::SetAPAirspeedHold,
                        true);
 
-  PropertyManager->Tie("jsbsim/ap/wingslevel_hold", this,
+  PropertyManager->Tie("ap/wingslevel_hold", this,
                        &FGFCS::GetAPWingsLevelHold,
                        &FGFCS::SetAPWingsLevelHold,
                        true);
@@ -863,23 +863,23 @@ void FGFCS::unbind(void)
   PropertyManager->Untie("fcs/mag-spoiler-pos-rad");
   PropertyManager->Untie("fcs/spoiler-pos-norm");
   PropertyManager->Untie("gear/gear-pos-norm");
-  PropertyManager->Untie("jsbsim/ap/elevator_cmd");
-  PropertyManager->Untie("jsbsim/ap/aileron_cmd");
-  PropertyManager->Untie("jsbsim/ap/rudder_cmd");
-  PropertyManager->Untie("jsbsim/ap/throttle_cmd");
-  PropertyManager->Untie("jsbsim/ap/attitude_setpoint");
-  PropertyManager->Untie("jsbsim/ap/altitude_setpoint");
-  PropertyManager->Untie("jsbsim/ap/heading_setpoint");
-  PropertyManager->Untie("jsbsim/ap/airspeed_setpoint");
-  PropertyManager->Untie("jsbsim/ap/acquire_attitude");
-  PropertyManager->Untie("jsbsim/ap/acquire_altitude");
-  PropertyManager->Untie("jsbsim/ap/acquire_heading");
-  PropertyManager->Untie("jsbsim/ap/acquire_airspeed");
-  PropertyManager->Untie("jsbsim/ap/attitude_hold");
-  PropertyManager->Untie("jsbsim/ap/altitude_hold");
-  PropertyManager->Untie("jsbsim/ap/heading_hold");
-  PropertyManager->Untie("jsbsim/ap/airspeed_hold");
-  PropertyManager->Untie("jsbsim/ap/wingslevel_hold");
+  PropertyManager->Untie("ap/elevator_cmd");
+  PropertyManager->Untie("ap/aileron_cmd");
+  PropertyManager->Untie("ap/rudder_cmd");
+  PropertyManager->Untie("ap/throttle_cmd");
+  PropertyManager->Untie("ap/attitude_setpoint");
+  PropertyManager->Untie("ap/altitude_setpoint");
+  PropertyManager->Untie("ap/heading_setpoint");
+  PropertyManager->Untie("ap/airspeed_setpoint");
+  PropertyManager->Untie("ap/acquire_attitude");
+  PropertyManager->Untie("ap/acquire_altitude");
+  PropertyManager->Untie("ap/acquire_heading");
+  PropertyManager->Untie("ap/acquire_airspeed");
+  PropertyManager->Untie("ap/attitude_hold");
+  PropertyManager->Untie("ap/altitude_hold");
+  PropertyManager->Untie("ap/heading_hold");
+  PropertyManager->Untie("ap/airspeed_hold");
+  PropertyManager->Untie("ap/wingslevel_hold");
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/src/FDM/JSBSim/FGFDMExec.cpp b/src/FDM/JSBSim/FGFDMExec.cpp
index 039ac7798453408d462eb60bb530ec7533937757..fa8191660bdbf7a2ab90532fd58ac31f32293c75 100644 (file)
--- a/src/FDM/JSBSim/FGFDMExec.cpp
+++ b/src/FDM/JSBSim/FGFDMExec.cpp
@@ -117,7 +117,7 @@ FGFDMExec::FGFDMExec(FGPropertyManager* root)
 
   IdFDM = FDMctr;
   FDMctr++;
-  
+
   try {
     char* num = getenv("JSBSIM_DEBUG");
     if (!num) debug_lvl = 1;
@@ -332,9 +332,9 @@ bool FGFDMExec::Run(void)
 
   Debug(2);
 
-  for (unsigned int i=0; i<SlaveFDMList.size(); i++) {
-    // TransferState(i);
-    // Run(i)
+  for (unsigned int i=1; i<SlaveFDMList.size(); i++) {
+//    SlaveFDMList[i]->exec->State->Initialize(); // Transfer state to the slave FDM
+//    SlaveFDMList[i]->exec->Run();
   }
 
   while (model_iterator != 0L) {
@@ -617,7 +617,7 @@ void FGFDMExec::Debug(int from)
 {
   if (debug_lvl <= 0) return;
 
-  if (debug_lvl & 1) { // Standard console startup message output
+  if (debug_lvl & 1 && IdFDM == 0) { // Standard console startup message output
     if (from == 0) { // Constructor
       cout << "\n\n     " << highint << underon << "JSBSim Flight Dynamics Model v"
                                      << JSBSim_version << underoff << normint << endl;

diff --git a/src/FDM/JSBSim/FGScript.cpp b/src/FDM/JSBSim/FGScript.cpp
index 796f2c338a2299078dd21f24c1c052e3f8cea610..c8f7362841335526cf1b6e635192c1bf09203e1a 100644 (file)
--- a/src/FDM/JSBSim/FGScript.cpp
+++ b/src/FDM/JSBSim/FGScript.cpp
@@ -108,7 +108,7 @@ bool FGScript::LoadScript(string script)
   ScriptName = Script.GetValue("name");
   Scripted = true;
 
-  if (debug_lvl > 0) cout << "Reading Script File " << ScriptName << endl;
+  if (debug_lvl > 0) cout << "Reading and running from script file " << ScriptName << endl << endl;
 
   while (Script.GetNextConfigLine() != string("EOF") && Script.GetValue() != string("/runscript")) {
     token = Script.GetValue();

diff --git a/src/FDM/JSBSim/FGTurbine.cpp b/src/FDM/JSBSim/FGTurbine.cpp
index a380b4b60cf70c6f8bfa72997f31deb0f98dae42..d91b9c41a422b9d4628cfe36f048b27647464419 100644 (file)
--- a/src/FDM/JSBSim/FGTurbine.cpp
+++ b/src/FDM/JSBSim/FGTurbine.cpp
@@ -115,6 +115,7 @@ void FGTurbine::doTransition(void)
 
 bool FGTurbine::Load(FGConfigFile *AC_cfg)
 {
+  return true;
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%