From a1acd92a1c3903ba08d963d63bc368e655ffa412 Mon Sep 17 00:00:00 2001
From: Torsten Dreyer <Torsten@t3r.de>
Date: Mon, 14 Feb 2011 20:58:54 +0100
Subject: [PATCH 1/3] gcc warning fixes
---
src/FDM/JSBSim/JSBSim.cxx | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/FDM/JSBSim/JSBSim.cxx b/src/FDM/JSBSim/JSBSim.cxx
index b86c2403d..1118902d6 100644
--- a/src/FDM/JSBSim/JSBSim.cxx
+++ b/src/FDM/JSBSim/JSBSim.cxx
@@ -540,7 +540,7 @@ void FGJSBsim::update( double dt )
}
FGJSBBase::Message* msg;
- while (msg = fdmex->ProcessNextMessage()) {
+ while ((msg = fdmex->ProcessNextMessage()) != NULL) {
// msg = fdmex->ProcessNextMessage();
switch (msg->type) {
case FGJSBBase::Message::eText:
@@ -636,7 +636,7 @@ bool FGJSBsim::copy_to_JSBsim()
} // end FGTurbine code block
case FGEngine::etRocket:
{ // FGRocket code block
- FGRocket* eng = (FGRocket*)Propulsion->GetEngine(i);
+// FGRocket* eng = (FGRocket*)Propulsion->GetEngine(i);
break;
} // end FGRocket code block
case FGEngine::etTurboprop:
@@ -828,7 +828,7 @@ bool FGJSBsim::copy_from_JSBsim()
break;
case FGEngine::etRocket:
{ // FGRocket code block
- FGRocket* eng = (FGRocket*)Propulsion->GetEngine(i);
+// FGRocket* eng = (FGRocket*)Propulsion->GetEngine(i);
} // end FGRocket code block
break;
case FGEngine::etTurbine:
@@ -898,7 +898,7 @@ bool FGJSBsim::copy_from_JSBsim()
switch (thruster->GetType()) {
case FGThruster::ttNozzle:
{ // FGNozzle code block
- FGNozzle* noz = (FGNozzle*)thruster;
+// FGNozzle* noz = (FGNozzle*)thruster;
} // end FGNozzle code block
break;
case FGThruster::ttPropeller:
@@ -912,7 +912,7 @@ bool FGJSBsim::copy_from_JSBsim()
break;
case FGThruster::ttRotor:
{ // FGRotor code block
- FGRotor* rotor = (FGRotor*)thruster;
+// FGRotor* rotor = (FGRotor*)thruster;
} // end FGRotor code block
break;
case FGThruster::ttDirect:
From 5ec361ae061e0159273ec755b7abb6f3ab0114e1 Mon Sep 17 00:00:00 2001
From: Torsten Dreyer <Torsten@t3r.de>
Date: Mon, 14 Feb 2011 21:01:48 +0100
Subject: [PATCH 2/3] Fix wrong throttle-position on init (trim)
---
src/FDM/JSBSim/JSBSim.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/FDM/JSBSim/JSBSim.cxx b/src/FDM/JSBSim/JSBSim.cxx
index 1118902d6..c986cbdd9 100644
--- a/src/FDM/JSBSim/JSBSim.cxx
+++ b/src/FDM/JSBSim/JSBSim.cxx
@@ -1217,8 +1217,8 @@ void FGJSBsim::do_trim(void)
globals->get_controls()->set_elevator_trim(FCS->GetPitchTrimCmd());
globals->get_controls()->set_elevator(FCS->GetDeCmd());
- globals->get_controls()->set_throttle(FGControls::ALL_ENGINES,
- FCS->GetThrottleCmd(0));
+ for( unsigned i = 0; i < Propulsion->GetNumEngines(); i++ )
+ globals->get_controls()->set_throttle(i, FCS->GetThrottleCmd(i));
globals->get_controls()->set_aileron(FCS->GetDaCmd());
globals->get_controls()->set_rudder( FCS->GetDrCmd());
From df370549c37104df1d3369f360d8234c9add1578 Mon Sep 17 00:00:00 2001
From: Torsten Dreyer <Torsten@t3r.de>
Date: Mon, 14 Feb 2011 22:11:56 +0100
Subject: [PATCH 3/3] Warning fixes for MSVC
---
src/FDM/JSBSim/JSBSim.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/FDM/JSBSim/JSBSim.cxx b/src/FDM/JSBSim/JSBSim.cxx
index c986cbdd9..0eb21888e 100644
--- a/src/FDM/JSBSim/JSBSim.cxx
+++ b/src/FDM/JSBSim/JSBSim.cxx
@@ -839,7 +839,7 @@ bool FGJSBsim::copy_from_JSBsim()
node->setDoubleValue("egt-degf", 32 + eng->GetEGT()*9/5);
node->setBoolValue("augmentation", eng->GetAugmentation());
node->setBoolValue("water-injection", eng->GetInjection());
- node->setBoolValue("ignition", eng->GetIgnition());
+ node->setBoolValue("ignition", eng->GetIgnition() != 0);
node->setDoubleValue("nozzle-pos-norm", eng->GetNozzle());
node->setDoubleValue("inlet-pos-norm", eng->GetInlet());
node->setDoubleValue("oil-pressure-psi", eng->getOilPressure_psi());
@@ -858,7 +858,7 @@ bool FGJSBsim::copy_from_JSBsim()
node->setDoubleValue("n1", eng->GetN1());
//node->setDoubleValue("n2", eng->GetN2());
node->setDoubleValue("itt_degf", 32 + eng->GetITT()*9/5);
- node->setBoolValue("ignition", eng->GetIgnition());
+ node->setBoolValue("ignition", eng->GetIgnition() != 0);
node->setDoubleValue("nozzle-pos-norm", eng->GetNozzle());
node->setDoubleValue("inlet-pos-norm", eng->GetInlet());
node->setDoubleValue("oil-pressure-psi", eng->getOilPressure_psi());
@@ -866,7 +866,7 @@ bool FGJSBsim::copy_from_JSBsim()
node->setBoolValue("cutoff", eng->GetCutoff());
node->setBoolValue("starting", eng->GetEngStarting());
node->setBoolValue("generator-power", eng->GetGeneratorPower());
- node->setBoolValue("damaged", eng->GetCondition());
+ node->setBoolValue("damaged", eng->GetCondition() != 0);
node->setBoolValue("ielu-intervent", eng->GetIeluIntervent());
node->setDoubleValue("oil-temperature-degf", eng->getOilTemp_degF());
// node->setBoolValue("onfire", eng->GetFire());