bool net_byte_order )
{
int i;
- SGPropertyNode * node;
- SGPropertyNode * tempnode;
+ SGPropertyNode *node;
+ SGPropertyNode *starter;
+ SGPropertyNode *fuelpump;
+ SGPropertyNode *tempnode;
// fill in values
node = fgGetNode("/controls/flight", true);
net->elevator_trim = node->getDoubleValue( "elevator-trim" );
net->rudder = node->getDoubleValue( "rudder" );
net->flaps = node->getDoubleValue( "flaps" );
- node = fgGetNode("/controls", true);
net->flaps_power
- = node->getDoubleValue( "/systems/electrical/outputs/flaps",
- 1.0 ) >= 1.0;
+ = fgGetDouble( "/systems/electrical/outputs/flaps", 1.0 ) >= 1.0;
+ net->flap_motor_ok = node->getBoolValue( "flaps-serviceable" );
+
net->num_engines = FGNetCtrls::FG_MAX_ENGINES;
for ( i = 0; i < FGNetCtrls::FG_MAX_ENGINES; ++i ) {
+ // Controls
node = fgGetNode("/controls/engines/engine", i );
- net->throttle[i] = node->getDoubleValue( "throttle", 0.0 );
+ starter = fgGetNode("/systems/electrical/outputs/starter", i );
+ fuelpump = fgGetNode("/systems/electrical/outputs/fuel-pump", i );
+ net->throttle[i] = node->getDoubleValue( "throttle", 0.0 );
net->mixture[i] = node->getDoubleValue( "mixture", 0.0 );
net->prop_advance[i] = node->getDoubleValue( "propeller-pitch", 0.0 );
net->magnetos[i] = node->getIntValue( "magnetos", 0 );
// cout << "Starter -> " << node->getIntValue( "starter", false )
// << endl;
}
- node = fgGetNode("/controls", true);
- net->fuel_pump_power[i]
- = node->getDoubleValue( "/systems/electrical/outputs/fuel-pump",
- 1.0 ) >= 1.0;
-
- net->starter_power[i]
- = node->getDoubleValue( "/systems/electrical/outputs/starter",
- 1.0 ) >= 1.0;
+
+ if ( fuelpump != NULL ) {
+ net->fuel_pump_power[i] = ( fuelpump->getDoubleValue() >= 1.0 );
+ } else {
+ net->fuel_pump_power[i] = 0.0;
+ }
+
+ if ( starter != NULL ) {
+ net->starter_power[i] = ( starter->getDoubleValue() >= 1.0 );
+ } else {
+ net->starter_power[i] = 0.0;
+ }
+
+ // Faults
+ SGPropertyNode *faults = node->getChild( "faults", 0, true );
+ net->engine_ok[i] = faults->getBoolValue( "serviceable", true );
+ net->mag_left_ok[i]
+ = faults->getBoolValue( "left-magneto-serviceable", true );
+ net->mag_right_ok[i]
+ = faults->getBoolValue( "right-magneto-serviceable", true);
+ net->spark_plugs_ok[i]
+ = faults->getBoolValue( "spark-plugs-serviceable", true );
+ net->oil_press_status[i]
+ = faults->getIntValue( "oil-pressure-status", 0 );
+ net->fuel_pump_ok[i]
+ = faults->getBoolValue( "fuel-pump-serviceable", true );
}
net->num_tanks = FGNetCtrls::FG_MAX_TANKS;
for ( i = 0; i < FGNetCtrls::FG_MAX_TANKS; ++i ) {
net->fuel_selector[i] = false;
}
}
- net->num_wheels = FGNetCtrls::FG_MAX_WHEELS;
- tempnode = fgGetNode("/controls/gear", true);
- for ( i = 0; i < FGNetCtrls::FG_MAX_WHEELS; ++i ) {
- node = fgGetNode("/controls/gear/wheel", i);
- if ( node->getChild("brake") != NULL ) {
- if ( tempnode->getChild("parking-brake")->getDoubleValue() > 0.0 ) {
- net->brake[i] = 1.0;
- } else {
- net->brake[i]
- = node->getChild("brake")->getDoubleValue();
- }
- } else {
- net->brake[i] = 0.0;
- }
- }
+ node = fgGetNode("/controls/gear", true);
+ net->brake_left = node->getChild("brake-left")->getDoubleValue();
+ net->brake_right = node->getChild("brake-right")->getDoubleValue();
+ net->brake_parking = node->getChild("brake-parking")->getDoubleValue();
node = fgGetNode("/controls/switches", true);
tempnode = node->getChild("master-bat");
net->turbulence_norm =
fgGetDouble("/environment/turbulence/magnitude-norm");
+ net->temp_c = fgGetDouble("/environment/temperature-degc");
+ net->press_inhg = fgGetDouble("/environment/pressure-sea-level-inhg");
+
// cur_fdm_state->get_ground_elev_ft() is what we want ... this
// reports the altitude of the aircraft.
// "/environment/ground-elevation-m" reports the ground elevation
htond(net->rudder);
htond(net->flaps);
net->flaps_power = htonl(net->flaps_power);
+ net->flap_motor_ok = htonl(net->flap_motor_ok);
for ( i = 0; i < FGNetCtrls::FG_MAX_ENGINES; ++i ) {
+ net->magnetos[i] = htonl(net->magnetos[i]);
+ net->starter_power[i] = htonl(net->starter_power[i]);
htond(net->throttle[i]);
htond(net->mixture[i]);
net->fuel_pump_power[i] = htonl(net->fuel_pump_power[i]);
htond(net->prop_advance[i]);
- net->magnetos[i] = htonl(net->magnetos[i]);
- net->starter_power[i] = htonl(net->starter_power[i]);
+ net->engine_ok[i] = htonl(net->engine_ok[i]);
+ net->mag_left_ok[i] = htonl(net->mag_left_ok[i]);
+ net->mag_right_ok[i] = htonl(net->mag_right_ok[i]);
+ net->spark_plugs_ok[i] = htonl(net->spark_plugs_ok[i]);
+ net->oil_press_status[i] = htonl(net->oil_press_status[i]);
+ net->fuel_pump_ok[i] = htonl(net->fuel_pump_ok[i]);
}
net->num_engines = htonl(net->num_engines);
for ( i = 0; i < FGNetCtrls::FG_MAX_TANKS; ++i ) {
net->fuel_selector[i] = htonl(net->fuel_selector[i]);
}
net->num_tanks = htonl(net->num_tanks);
- for ( i = 0; i < FGNetCtrls::FG_MAX_WHEELS; ++i ) {
- htond(net->brake[i]);
- }
- net->num_wheels = htonl(net->num_wheels);
+ htond(net->brake_left);
+ htond(net->brake_right);
+ htond(net->brake_parking);
net->gear_handle = htonl(net->gear_handle);
net->master_bat = htonl(net->master_bat);
net->master_alt = htonl(net->master_alt);
htond(net->wind_speed_kt);
htond(net->wind_dir_deg);
htond(net->turbulence_norm);
- htond(net->hground);
+ htond(net->temp_c);
+ htond(net->press_inhg);
+ htond(net->hground);
htond(net->magvar);
net->speedup = htonl(net->speedup);
net->freeze = htonl(net->freeze);
htond(net->rudder);
htond(net->flaps);
net->flaps_power = htonl(net->flaps_power);
+ net->flap_motor_ok = htonl(net->flap_motor_ok);
net->num_engines = htonl(net->num_engines);
for ( i = 0; i < net->num_engines; ++i ) {
net->magnetos[i] = htonl(net->magnetos[i]);
htond(net->mixture[i]);
net->fuel_pump_power[i] = htonl(net->fuel_pump_power[i]);
htond(net->prop_advance[i]);
+ net->engine_ok[i] = htonl(net->engine_ok[i]);
+ net->mag_left_ok[i] = htonl(net->mag_left_ok[i]);
+ net->mag_right_ok[i] = htonl(net->mag_right_ok[i]);
+ net->spark_plugs_ok[i] = htonl(net->spark_plugs_ok[i]);
+ net->oil_press_status[i] = htonl(net->oil_press_status[i]);
+ net->fuel_pump_ok[i] = htonl(net->fuel_pump_ok[i]);
}
net->num_tanks = htonl(net->num_tanks);
for ( i = 0; i < net->num_tanks; ++i ) {
net->fuel_selector[i] = htonl(net->fuel_selector[i]);
}
- net->num_wheels = htonl(net->num_wheels);
- for ( i = 0; i < net->num_wheels; ++i ) {
- htond(net->brake[i]);
- }
+ htond(net->brake_left);
+ htond(net->brake_right);
+ htond(net->brake_parking);
net->gear_handle = htonl(net->gear_handle);
net->master_bat = htonl(net->master_bat);
net->master_alt = htonl(net->master_alt);
htond(net->wind_speed_kt);
htond(net->wind_dir_deg);
htond(net->turbulence_norm);
+ htond(net->temp_c);
+ htond(net->press_inhg);
htond(net->hground);
htond(net->magvar);
net->speedup = htonl(net->speedup);
node->setDoubleValue( "elevator-trim", net->elevator_trim );
node->setDoubleValue( "rudder", net->rudder );
node->setDoubleValue( "flaps", net->flaps );
-
fgSetBool( "/systems/electrical/outputs/flaps", net->flaps_power );
+ node->setBoolValue( "flaps-serviceable", net->flap_motor_ok );
for ( i = 0; i < FGNetCtrls::FG_MAX_ENGINES; ++i ) {
+ // Controls
node = fgGetNode("/controls/engines/engine", i);
node->getChild( "throttle" )->setDoubleValue( net->throttle[i] );
node->getChild( "mixture" )->setDoubleValue( net->mixture[i] );
node->getChild( "propeller-pitch" )
->setDoubleValue( net->prop_advance[i] );
node->getChild( "magnetos" )->setDoubleValue( net->magnetos[i] );
+
+ // Faults
+ SGPropertyNode *faults = node->getNode( "faults", true );
+ faults->setBoolValue( "serviceable", net->engine_ok[i] );
+ faults->setBoolValue( "left-magneto-serviceable",
+ net->mag_left_ok[i] );
+ faults->setBoolValue( "right-magneto-serviceable",
+ net->mag_right_ok[i]);
+ faults->setBoolValue( "spark-plugs-serviceable",
+ net->spark_plugs_ok[i] );
+ faults->setIntValue( "oil-pressure-status", net->oil_press_status[i] );
+ faults->setBoolValue( "fuel-pump-serviceable", net->fuel_pump_ok[i] );
}
fgSetBool( "/systems/electrical/outputs/fuel-pump",
node->getChild( "fuel_selector" )
->setBoolValue( net->fuel_selector[i] );
}
- for ( i = 0; i < FGNetCtrls::FG_MAX_WHEELS; ++i ) {
- node = fgGetNode( "/controls/gear/wheel", i );
- node->getChild( "brake" )->setDoubleValue( net->brake[i] );
+ node = fgGetNode( "/controls/gear" );
+ if ( node != NULL ) {
+ node->getChild( "brake-left" )->setDoubleValue( net->brake_left );
+ node->getChild( "brake-right" )->setDoubleValue( net->brake_right );
+ node->getChild( "brake-parking" )->setDoubleValue( net->brake_parking );
}
node = fgGetNode( "/controls/gear", true );
node->setDoubleValue( "turbulence/magnitude-norm", net->turbulence_norm );
node->setBoolValue( "magnetic-variation-deg", net->magvar );
+ node->setDoubleValue( "/environment/temperature-degc",
+ net->temp_c );
+ node->setDoubleValue( "/environment/pressure-sea-level-inhg",
+ net->press_inhg );
+
// ground elevation ???
fgSetInt( "/sim/speed-up", net->speedup );
projects / flightgear.git / blobdiff