//
// Written by Curtis Olson, started September 2001.
//
-// Copyright (C) 2001 Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 2001 Curtis L. Olson - http://www.flightgear.org/~curt
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License as
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
// $Id$
void FGProps2NetFDM( FGNetFDM *net, bool net_byte_order ) {
- int i;
+ unsigned int i;
// Version sanity checking
net->version = FG_NET_FDM_VERSION;
net->phi = cur_fdm_state->get_Phi();
net->theta = cur_fdm_state->get_Theta();
net->psi = cur_fdm_state->get_Psi();
+ net->alpha = cur_fdm_state->get_Alpha();
+ net->beta = cur_fdm_state->get_Beta();
net->phidot = cur_fdm_state->get_Phi_dot_degps() * SG_DEGREES_TO_RADIANS;
net->thetadot = cur_fdm_state->get_Theta_dot_degps()
* SG_DEGREES_TO_RADIANS;
for ( i = 0; i < net->num_engines; ++i ) {
SGPropertyNode *node = fgGetNode("engines/engine", i, true);
if ( node->getBoolValue( "running" ) ) {
- net->eng_state[0] = 2;
+ net->eng_state[i] = 2;
} else if ( node->getBoolValue( "cranking" ) ) {
- net->eng_state[0] = 1;
+ net->eng_state[i] = 1;
} else {
- net->eng_state[0] = 0;
+ net->eng_state[i] = 0;
}
net->rpm[i] = node->getDoubleValue( "rpm" );
net->fuel_flow[i] = node->getDoubleValue( "fuel-flow-gph" );
- net->EGT[i] = node->getDoubleValue( "egt-degf" );
+ net->fuel_px[i] = node->getDoubleValue( "fuel-px-psi" );
+ net->egt[i] = node->getDoubleValue( "egt-degf" );
// cout << "egt = " << aero->EGT << endl;
+ net->cht[i] = node->getDoubleValue( "cht-degf" );
+ 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_px[i] = node->getDoubleValue( "oil-pressure-psi" );
}
net->num_wheels = FGNetFDM::FG_MAX_WHEELS;
for (i = 0; i < net->num_wheels; ++i ) {
SGPropertyNode *node = fgGetNode("/gear/gear", i, true);
- net->wow[i] = node->getDoubleValue("wow");
+ net->wow[i] = node->getIntValue("wow");
net->gear_pos[i] = node->getDoubleValue("position-norm");
net->gear_steer[i] = node->getDoubleValue("steering-norm");
net->gear_compression[i] = node->getDoubleValue("compression-norm");
// Control surface positions
SGPropertyNode *node = fgGetNode("/surface-positions", true);
net->elevator = node->getDoubleValue( "elevator-pos-norm" );
- net->flaps = node->getDoubleValue( "flap-pos-norm" );
+ net->elevator_trim_tab
+ = node->getDoubleValue( "elevator-trim-tab-pos-norm" );
+ // FIXME: CLO 10/28/04 - This really should be separated out into 2 values
+ net->left_flap = node->getDoubleValue( "flap-pos-norm" );
+ net->right_flap = node->getDoubleValue( "flap-pos-norm" );
net->left_aileron = node->getDoubleValue( "left-aileron-pos-norm" );
net->right_aileron = node->getDoubleValue( "right-aileron-pos-norm" );
net->rudder = node->getDoubleValue( "rudder-pos-norm" );
- net->rudder = node->getDoubleValue( "nose-wheel-pos-norm" );
+ net->nose_wheel = node->getDoubleValue( "nose-wheel-pos-norm" );
net->speedbrake = node->getDoubleValue( "speedbrake-pos-norm" );
net->spoilers = node->getDoubleValue( "spoilers-pos-norm" );
htonf(net->phi);
htonf(net->theta);
htonf(net->psi);
+ htonf(net->alpha);
+ htonf(net->beta);
htonf(net->phidot);
htonf(net->thetadot);
net->eng_state[i] = htonl(net->eng_state[i]);
htonf(net->rpm[i]);
htonf(net->fuel_flow[i]);
- htonf(net->EGT[i]);
+ htonf(net->fuel_px[i]);
+ htonf(net->egt[i]);
+ htonf(net->cht[i]);
+ htonf(net->mp_osi[i]);
+ htonf(net->tit[i]);
htonf(net->oil_temp[i]);
htonf(net->oil_px[i]);
}
htonf(net->visibility);
htonf(net->elevator);
- htonf(net->flaps);
+ htonf(net->elevator_trim_tab);
+ htonf(net->left_flap);
+ htonf(net->right_flap);
htonf(net->left_aileron);
htonf(net->right_aileron);
htonf(net->rudder);
void FGNetFDM2Props( FGNetFDM *net, bool net_byte_order ) {
- int i;
+ unsigned int i;
if ( net_byte_order ) {
// Convert to the net buffer from network format
htonf(net->phi);
htonf(net->theta);
htonf(net->psi);
+ htonf(net->alpha);
+ htonf(net->beta);
htonf(net->phidot);
htonf(net->thetadot);
net->eng_state[i] = htonl(net->eng_state[i]);
htonf(net->rpm[i]);
htonf(net->fuel_flow[i]);
- htonf(net->EGT[i]);
+ htonf(net->fuel_px[i]);
+ htonf(net->egt[i]);
+ htonf(net->cht[i]);
+ htonf(net->mp_osi[i]);
+ htonf(net->tit[i]);
htonf(net->oil_temp[i]);
htonf(net->oil_px[i]);
}
htonf(net->gear_compression[i]);
}
- net->cur_time = ntohl(net->cur_time);
+ net->cur_time = htonl(net->cur_time);
net->warp = ntohl(net->warp);
htonf(net->visibility);
htonf(net->elevator);
- htonf(net->flaps);
+ htonf(net->elevator_trim_tab);
+ htonf(net->left_flap);
+ htonf(net->right_flap);
htonf(net->left_aileron);
htonf(net->right_aileron);
htonf(net->rudder);
if ( net->agl > -9000 ) {
cur_fdm_state->_set_Altitude_AGL( net->agl * SG_METER_TO_FEET );
} else {
- double agl_m
- = net->altitude - globals->get_scenery()->get_cur_elev();
+ double agl_m = net->altitude
+ - cur_fdm_state->get_Runway_altitude_m();
cur_fdm_state->_set_Altitude_AGL( agl_m * SG_METER_TO_FEET );
}
cur_fdm_state->_set_Euler_Angles( net->phi,
net->theta,
net->psi );
+ cur_fdm_state->_set_Alpha( net->alpha );
+ cur_fdm_state->_set_Beta( net->beta );
cur_fdm_state->_set_Euler_Rates( net->phidot,
net->thetadot,
net->psidot );
node->setDoubleValue( "rpm", net->rpm[i] );
node->setDoubleValue( "fuel-flow-gph", net->fuel_flow[i] );
- node->setDoubleValue( "egt-degf", net->EGT[i] );
+ node->setDoubleValue( "fuel-px-psi", net->fuel_px[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( "tit", net->tit[i] );
node->setDoubleValue( "oil-temperature-degf", net->oil_temp[i] );
node->setDoubleValue( "oil-pressure-psi", net->oil_px[i] );
}
SGPropertyNode *node = fgGetNode("/surface-positions", true);
node->setDoubleValue("elevator-pos-norm", net->elevator);
- node->setDoubleValue("flap-pos-norm", net->flaps);
+ node->setDoubleValue("elevator-trim-tab-pos-norm",
+ net->elevator_trim_tab);
+ // FIXME: CLO 10/28/04 - This really should be separated out
+ // into 2 values
+ node->setDoubleValue("flap-pos-norm", net->left_flap);
+ node->setDoubleValue("flap-pos-norm", net->right_flap);
node->setDoubleValue("left-aileron-pos-norm", net->left_aileron);
node->setDoubleValue("right-aileron-pos-norm", net->right_aileron);
node->setDoubleValue("rudder-pos-norm", net->rudder);