This is the patch to change jsbsim's level-lb to level-lbs . I'm currently
going through the data folder to find all other uses ... I'll try to get it
done tonight so if the patch is applied . the breakage time should be short
:)
I don't have the JSBsim source , just what's included with FG , but only 3
source files need to be changed...
Cheers
Index: src/FDM/JSBSim/JSBSim.cxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/source/src/FDM/JSBSim/JSBSim.cxx,v
retrieving revision 1.51
diff -U 3 -r1.51 JSBSim.cxx
--- src/FDM/JSBSim/JSBSim.cxx 26 Jan 2009 20:36:18 -0000 1.51
+++ src/FDM/JSBSim/JSBSim.cxx 6 Feb 2009 02:13:11 -0000
@@ -211,7 +211,7 @@
if (node->getChild("level-gal_us", 0, false) != 0) {
Propulsion->GetTank(i)->SetContents(node->getDoubleValue("level-gal_us") * 6.6);
} else {
- node->setDoubleValue("level-lb", Propulsion->GetTank(i)->GetContents());
+ node->setDoubleValue("level-lbs", Propulsion->GetTank(i)->GetContents());
node->setDoubleValue("level-gal_us", Propulsion->GetTank(i)->GetContents() / 6.6);
}
node->setDoubleValue("capacity-gal_us",
@@ -626,7 +626,7 @@
SGPropertyNode * node = fgGetNode("/consumables/fuel/tank", i, true);
FGTank * tank = Propulsion->GetTank(i);
tank->SetContents(node->getDoubleValue("level-gal_us") * 6.6);
-// tank->SetContents(node->getDoubleValue("level-lb"));
+// tank->SetContents(node->getDoubleValue("level-lbs"));
}
Propulsion->SetFuelFreeze((fgGetNode("/sim/freeze/fuel",true))->getBoolValue());
@@ -866,7 +866,7 @@
double contents = tank->GetContents();
double temp = tank->GetTemperature_degC();
node->setDoubleValue("level-gal_us", contents/6.6);
- node->setDoubleValue("level-lb", contents);
+ node->setDoubleValue("level-lbs", contents);
if (temp != -9999.0) node->setDoubleValue("temperature_degC", temp);
}
}
Index: src/Network/lfsglass.cxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/source/src/Network/lfsglass.cxx,v
retrieving revision 1.4
diff -U 3 -r1.4 lfsglass.cxx
--- src/Network/lfsglass.cxx 27 Jul 2008 16:25:16 -0000 1.4
+++ src/Network/lfsglass.cxx 6 Feb 2009 02:13:11 -0000
@@ -89,14 +89,14 @@
oil_temp1(fgGetNode("engines/engine[1]/oil-temp-degF[0]", true)),
oil_temp2(fgGetNode("engines/engine[2]/oil-temp-degF[0]", true)),
oil_temp3(fgGetNode("engines/engine[3]/oil-temp-degF[0]", true)),
- tank0_node(fgGetNode("/consumables/fuel/tank/level-lb[0]", true)),
- tank1_node(fgGetNode("/consumables/fuel/tank[1]/level-lb[0]", true)),
- tank2_node(fgGetNode("/consumables/fuel/tank[2]/level-lb[0]", true)),
- tank3_node(fgGetNode("/consumables/fuel/tank[3]/level-lb[0]", true)),
- tank4_node(fgGetNode("/consumables/fuel/tank[4]/level-lb[0]", true)),
- tank5_node(fgGetNode("/consumables/fuel/tank[5]/level-lb[0]", true)),
- tank6_node(fgGetNode("/consumables/fuel/tank[6]/level-lb[0]", true)),
- tank7_node(fgGetNode("/consumables/fuel/tank[7]/level-lb[0]", true)),
+ tank0_node(fgGetNode("/consumables/fuel/tank/level-lbs[0]", true)),
+ tank1_node(fgGetNode("/consumables/fuel/tank[1]/level-lbs[0]", true)),
+ tank2_node(fgGetNode("/consumables/fuel/tank[2]/level-lbs[0]", true)),
+ tank3_node(fgGetNode("/consumables/fuel/tank[3]/level-lbs[0]", true)),
+ tank4_node(fgGetNode("/consumables/fuel/tank[4]/level-lbs[0]", true)),
+ tank5_node(fgGetNode("/consumables/fuel/tank[5]/level-lbs[0]", true)),
+ tank6_node(fgGetNode("/consumables/fuel/tank[6]/level-lbs[0]", true)),
+ tank7_node(fgGetNode("/consumables/fuel/tank[7]/level-lbs[0]", true)),
p_alphadot(fgGetNode("/fdm/jsbsim/aero/alphadot-rad_sec[0]", true)),
p_betadot(fgGetNode("/fdm/jsbsim/aero/betadot-rad_sec[0]", true))
Index: src/Network/opengc.cxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/source/src/Network/opengc.cxx,v
retrieving revision 1.11
diff -U 3 -r1.11 opengc.cxx
--- src/Network/opengc.cxx 27 Jul 2008 16:25:16 -0000 1.11
+++ src/Network/opengc.cxx 6 Feb 2009 02:13:11 -0000
@@ -86,14 +86,14 @@
oil_temp1(fgGetNode("engines/engine[1]/oil-temp-degF[0]", true)),
oil_temp2(fgGetNode("engines/engine[2]/oil-temp-degF[0]", true)),
oil_temp3(fgGetNode("engines/engine[3]/oil-temp-degF[0]", true)),
- tank0_node(fgGetNode("/consumables/fuel/tank/level-lb[0]", true)),
- tank1_node(fgGetNode("/consumables/fuel/tank[1]/level-lb[0]", true)),
- tank2_node(fgGetNode("/consumables/fuel/tank[2]/level-lb[0]", true)),
- tank3_node(fgGetNode("/consumables/fuel/tank[3]/level-lb[0]", true)),
- tank4_node(fgGetNode("/consumables/fuel/tank[4]/level-lb[0]", true)),
- tank5_node(fgGetNode("/consumables/fuel/tank[5]/level-lb[0]", true)),
- tank6_node(fgGetNode("/consumables/fuel/tank[6]/level-lb[0]", true)),
- tank7_node(fgGetNode("/consumables/fuel/tank[7]/level-lb[0]", true)),
+ tank0_node(fgGetNode("/consumables/fuel/tank/level-lbs[0]", true)),
+ tank1_node(fgGetNode("/consumables/fuel/tank[1]/level-lbs[0]", true)),
+ tank2_node(fgGetNode("/consumables/fuel/tank[2]/level-lbs[0]", true)),
+ tank3_node(fgGetNode("/consumables/fuel/tank[3]/level-lbs[0]", true)),
+ tank4_node(fgGetNode("/consumables/fuel/tank[4]/level-lbs[0]", true)),
+ tank5_node(fgGetNode("/consumables/fuel/tank[5]/level-lbs[0]", true)),
+ tank6_node(fgGetNode("/consumables/fuel/tank[6]/level-lbs[0]", true)),
+ tank7_node(fgGetNode("/consumables/fuel/tank[7]/level-lbs[0]", true)),
p_park_brake(fgGetNode("/controls/gear/brake-parking", true)),
p_pitch(fgGetNode("/orientation/pitch-deg[0]", true)),
p_bank(fgGetNode("/orientation/roll-deg[0]", true)),
------------------------------------------------------------------------------
Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM)
software. With Adobe AIR, Ajax developers can use existing skills and code to
build responsive, highly engaging applications that combine the power of local
resources and data with the reach of the web. Download the Adobe AIR SDK and
Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
