fly/flightgear
1
0
Fork 0
Code Activity

Add cht (cylinder head temp) and tit (turbine inlet temp) to net_fdm.hxx

Browse source
This commit is contained in:
curt 2005-01-05 03:43:05 +00:00
parent e7fa493b0d
commit 8512984da5
3 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Network/native_fdm.cxx
View file

@ -173,7 +173,9 @@ void FGProps2NetFDM( FGNetFDM *net, bool net_byte_order ) {
net->fuel_flow[i] = node->getDoubleValue( "fuel-flow-gph" ); net->fuel_flow[i] = node->getDoubleValue( "fuel-flow-gph" );
net->egt[i] = node->getDoubleValue( "egt-degf" ); net->egt[i] = node->getDoubleValue( "egt-degf" );
// cout << "egt = " << aero->EGT << endl; // cout << "egt = " << aero->EGT << endl;
net->cht[i] = node->getDoubleValue( "cht-degf" );
net->mp_osi[i] = node->getDoubleValue( "mp-osi" ); net->mp_osi[i] = node->getDoubleValue( "mp-osi" );
net->tit[i] = node->getDoubleValue( "tit" );
net->oil_temp[i] = node->getDoubleValue( "oil-temperature-degf" ); net->oil_temp[i] = node->getDoubleValue( "oil-temperature-degf" );
net->oil_px[i] = node->getDoubleValue( "oil-pressure-psi" ); net->oil_px[i] = node->getDoubleValue( "oil-pressure-psi" );
} }
@ -253,7 +255,9 @@ void FGProps2NetFDM( FGNetFDM *net, bool net_byte_order ) {
htonf(net->rpm[i]); htonf(net->rpm[i]);
htonf(net->fuel_flow[i]); htonf(net->fuel_flow[i]);
htonf(net->egt[i]); htonf(net->egt[i]);
htonf(net->cht[i]);
htonf(net->mp_osi[i]); htonf(net->mp_osi[i]);
htonf(net->tit[i]);
htonf(net->oil_temp[i]); htonf(net->oil_temp[i]);
htonf(net->oil_px[i]); htonf(net->oil_px[i]);
} }
@ -332,7 +336,9 @@ void FGNetFDM2Props( FGNetFDM *net, bool net_byte_order ) {
htonf(net->rpm[i]); htonf(net->rpm[i]);
htonf(net->fuel_flow[i]); htonf(net->fuel_flow[i]);
htonf(net->egt[i]); htonf(net->egt[i]);
htonf(net->cht[i]);
htonf(net->mp_osi[i]); htonf(net->mp_osi[i]);
htonf(net->tit[i]);
htonf(net->oil_temp[i]); htonf(net->oil_temp[i]);
htonf(net->oil_px[i]); htonf(net->oil_px[i]);
} }
@ -428,7 +434,9 @@ void FGNetFDM2Props( FGNetFDM *net, bool net_byte_order ) {
node->setDoubleValue( "rpm", net->rpm[i] ); node->setDoubleValue( "rpm", net->rpm[i] );
node->setDoubleValue( "fuel-flow-gph", net->fuel_flow[i] ); node->setDoubleValue( "fuel-flow-gph", net->fuel_flow[i] );
node->setDoubleValue( "egt-degf", net->egt[i] ); node->setDoubleValue( "egt-degf", net->egt[i] );
node->setDoubleValue( "cht-degf", net->cht[i] );
node->setDoubleValue( "mp-osi", net->mp_osi[i] ); node->setDoubleValue( "mp-osi", net->mp_osi[i] );
node->setDoubleValue( "tit", net->tit[i] );
node->setDoubleValue( "oil-temperature-degf", net->oil_temp[i] ); node->setDoubleValue( "oil-temperature-degf", net->oil_temp[i] );
node->setDoubleValue( "oil-pressure-psi", net->oil_px[i] ); node->setDoubleValue( "oil-pressure-psi", net->oil_px[i] );
} }

4
src/Network/net_fdm.hxx
View file

@ -18,7 +18,7 @@
#include <time.h> // time_t #include <time.h> // time_t
const int FG_NET_FDM_VERSION = 19; const int FG_NET_FDM_VERSION = 20;
// Define a structure containing the top level flight dynamics model // Define a structure containing the top level flight dynamics model
@ -84,7 +84,9 @@ public:
float rpm[FG_MAX_ENGINES]; // Engine RPM rev/min float rpm[FG_MAX_ENGINES]; // Engine RPM rev/min
float fuel_flow[FG_MAX_ENGINES]; // Fuel flow gallons/hr float fuel_flow[FG_MAX_ENGINES]; // Fuel flow gallons/hr
float egt[FG_MAX_ENGINES]; // Exhuast gas temp deg F float egt[FG_MAX_ENGINES]; // Exhuast gas temp deg F
float cht[FG_MAX_ENGINES]; // Cylinder head temp deg F
float mp_osi[FG_MAX_ENGINES]; // Manifold pressure float mp_osi[FG_MAX_ENGINES]; // Manifold pressure
float tit[FG_MAX_ENGINES]; // Turbine Inlet Temperature
float oil_temp[FG_MAX_ENGINES]; // Oil temp deg F float oil_temp[FG_MAX_ENGINES]; // Oil temp deg F
float oil_px[FG_MAX_ENGINES]; // Oil pressure psi float oil_px[FG_MAX_ENGINES]; // Oil pressure psi

2
src/Replay/replay.cxx
View file

@ -268,7 +268,9 @@ static FGReplayData interpolate( double time, FGReplayData f1, FGReplayData f2 )
result.fdm.fuel_flow[i] result.fdm.fuel_flow[i]
= weight( fdm1.fuel_flow[i], fdm2.fuel_flow[i], ratio ); = weight( fdm1.fuel_flow[i], fdm2.fuel_flow[i], ratio );
result.fdm.egt[i] = weight( fdm1.egt[i], fdm2.egt[i], ratio ); result.fdm.egt[i] = weight( fdm1.egt[i], fdm2.egt[i], ratio );
result.fdm.cht[i] = weight( fdm1.cht[i], fdm2.cht[i], ratio );
result.fdm.mp_osi[i] = weight( fdm1.mp_osi[i], fdm2.mp_osi[i], ratio ); result.fdm.mp_osi[i] = weight( fdm1.mp_osi[i], fdm2.mp_osi[i], ratio );
result.fdm.tit[i] = weight( fdm1.tit[i], fdm2.tit[i], ratio );
result.fdm.oil_temp[i] result.fdm.oil_temp[i]
= weight( fdm1.oil_temp[i], fdm2.oil_temp[i], ratio ); = weight( fdm1.oil_temp[i], fdm2.oil_temp[i], ratio );
result.fdm.oil_px[i] = weight( fdm1.oil_px[i], fdm2.oil_px[i], ratio ); result.fdm.oil_px[i] = weight( fdm1.oil_px[i], fdm2.oil_px[i], ratio );