X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2Fnative_ctrls.cxx;h=2ad871f834f28387b39baebd9cb1eea00661e054;hb=a0588272dc51ef0b2630f981cf1a913665cdc87a;hp=ace029444b4b5f3ce154fb3a07e06f99cf9193e0;hpb=92010f9f9483082bbf83638a49e08053f53c5daa;p=flightgear.git diff --git a/src/Network/native_ctrls.cxx b/src/Network/native_ctrls.cxx index ace029444..2ad871f83 100644 --- a/src/Network/native_ctrls.cxx +++ b/src/Network/native_ctrls.cxx @@ -2,7 +2,7 @@ // // Written by Curtis Olson, started July 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 @@ -16,7 +16,7 @@ // // 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$ @@ -29,15 +29,16 @@ #include #include // endian tests -#include #include
#include // ground elevation #include "native_ctrls.hxx" // FreeBSD works better with this included last ... (?) -#if defined(WIN32) && !defined(__CYGWIN__) +#if defined( _MSC_VER ) # include +#elif defined( __MINGW32__ ) +# include #else # include // htonl() ntohl() #endif @@ -103,7 +104,6 @@ void FGProps2NetCtrls( FGNetCtrls *net, bool honor_freezes, { int i; SGPropertyNode *node; - SGPropertyNode *starter; SGPropertyNode *fuelpump; SGPropertyNode *tempnode; @@ -112,8 +112,10 @@ void FGProps2NetCtrls( FGNetCtrls *net, bool honor_freezes, net->version = FG_NET_CTRLS_VERSION; net->aileron = node->getDoubleValue( "aileron" ); net->elevator = node->getDoubleValue( "elevator" ); - net->elevator_trim = node->getDoubleValue( "elevator-trim" ); net->rudder = node->getDoubleValue( "rudder" ); + net->aileron_trim = node->getDoubleValue( "aileron-trim" ); + net->elevator_trim = node->getDoubleValue( "elevator-trim" ); + net->rudder_trim = node->getDoubleValue( "rudder-trim" ); net->flaps = node->getDoubleValue( "flaps" ); net->flaps_power = fgGetDouble( "/systems/electrical/outputs/flaps", 1.0 ) >= 1.0; @@ -123,11 +125,25 @@ void FGProps2NetCtrls( FGNetCtrls *net, bool honor_freezes, for ( i = 0; i < FGNetCtrls::FG_MAX_ENGINES; ++i ) { // Controls node = fgGetNode("/controls/engines/engine", i ); - starter = fgGetNode("/systems/electrical/outputs/starter", i ); fuelpump = fgGetNode("/systems/electrical/outputs/fuel-pump", i ); + + tempnode = node->getChild("starter"); + if ( tempnode != NULL ) { + net->starter_power[i] = ( tempnode->getDoubleValue() >= 1.0 ); + } + tempnode = node->getChild("master-bat"); + if ( tempnode != NULL ) { + net->master_bat[i] = tempnode->getBoolValue(); + } + tempnode = node->getChild("master-alt"); + if ( tempnode != NULL ) { + net->master_alt[i] = tempnode->getBoolValue(); + } + 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->condition[i] = node->getDoubleValue( "condition", 0.0 ); net->magnetos[i] = node->getIntValue( "magnetos", 0 ); if ( i == 0 ) { // cout << "Magnetos -> " << node->getIntValue( "magnetos", 0 ); @@ -140,13 +156,7 @@ void FGProps2NetCtrls( FGNetCtrls *net, bool honor_freezes, 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; + net->fuel_pump_power[i] = 0; } // Faults @@ -176,21 +186,15 @@ void FGProps2NetCtrls( FGNetCtrls *net, bool honor_freezes, node = fgGetNode("/controls/gear", true); net->brake_left = node->getChild("brake-left")->getDoubleValue(); net->brake_right = node->getChild("brake-right")->getDoubleValue(); + net->copilot_brake_left + = node->getChild("copilot-brake-left")->getDoubleValue(); + net->copilot_brake_right + = node->getChild("copilot-brake-right")->getDoubleValue(); net->brake_parking = node->getChild("brake-parking")->getDoubleValue(); - node = fgGetNode("/controls/switches", true); - tempnode = node->getChild("master-bat"); - if ( tempnode != NULL ) { - net->master_bat = tempnode->getBoolValue(); - } - tempnode = node->getChild("master-alt"); - if ( tempnode != NULL ) { - net->master_alt = tempnode->getBoolValue(); - } - tempnode = node->getChild("master-avionics"); - if ( tempnode != NULL ) { - net->master_avionics = tempnode->getBoolValue(); - } + net->gear_handle = fgGetBool( "/controls/gear/gear-down" ); + + net->master_avionics = fgGetBool("/controls/switches/master-avionics"); net->wind_speed_kt = fgGetDouble("/environment/wind-speed-kt"); net->wind_dir_deg = fgGetDouble("/environment/wind-from-heading-deg"); @@ -200,13 +204,11 @@ void FGProps2NetCtrls( FGNetCtrls *net, bool honor_freezes, 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 - // of the current view point which could change substantially if - // the user is switching views. - net->hground = cur_fdm_state->get_ground_elev_ft() * SG_FEET_TO_METER; + net->hground = fgGetDouble("/position/ground-elev-m"); net->magvar = fgGetDouble("/environment/magnetic-variation-deg"); + + net->icing = fgGetBool("/hazards/icing/wing"); + net->speedup = fgGetInt("/sim/speed-up"); net->freeze = 0; if ( honor_freezes ) { @@ -226,36 +228,45 @@ void FGProps2NetCtrls( FGNetCtrls *net, bool honor_freezes, net->version = htonl(net->version); htond(net->aileron); htond(net->elevator); - htond(net->elevator_trim); htond(net->rudder); + htond(net->aileron_trim); + htond(net->elevator_trim); + htond(net->rudder_trim); 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 < FGNetCtrls::FG_MAX_ENGINES; ++i ) { + net->master_bat[i] = htonl(net->master_bat[i]); + net->master_alt[i] = htonl(net->master_alt[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->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]); + htond(net->condition[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); + + net->num_tanks = htonl(net->num_tanks); 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); + + net->cross_feed = htonl(net->cross_feed); htond(net->brake_left); htond(net->brake_right); + htond(net->copilot_brake_left); + htond(net->copilot_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); net->master_avionics = htonl(net->master_avionics); htond(net->wind_speed_kt); htond(net->wind_dir_deg); @@ -264,6 +275,7 @@ void FGProps2NetCtrls( FGNetCtrls *net, bool honor_freezes, htond(net->press_inhg); htond(net->hground); htond(net->magvar); + net->icing = htonl(net->icing); net->speedup = htonl(net->speedup); net->freeze = htonl(net->freeze); } @@ -283,36 +295,45 @@ void FGNetCtrls2Props( FGNetCtrls *net, bool honor_freezes, net->version = htonl(net->version); htond(net->aileron); htond(net->elevator); - htond(net->elevator_trim); htond(net->rudder); + htond(net->aileron_trim); + htond(net->elevator_trim); + htond(net->rudder_trim); 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 ) { + for ( i = 0; i < (int)net->num_engines; ++i ) { + net->master_bat[i] = htonl(net->master_bat[i]); + net->master_alt[i] = htonl(net->master_alt[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->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]); + htond(net->condition[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 ) { + for ( i = 0; i < FGNetCtrls::FG_MAX_TANKS; ++i ) { net->fuel_selector[i] = htonl(net->fuel_selector[i]); } + + net->cross_feed = htonl(net->cross_feed); htond(net->brake_left); htond(net->brake_right); + htond(net->copilot_brake_left); + htond(net->copilot_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); net->master_avionics = htonl(net->master_avionics); htond(net->wind_speed_kt); htond(net->wind_dir_deg); @@ -321,6 +342,7 @@ void FGNetCtrls2Props( FGNetCtrls *net, bool honor_freezes, htond(net->press_inhg); htond(net->hground); htond(net->magvar); + net->icing = htonl(net->icing); net->speedup = htonl(net->speedup); net->freeze = htonl(net->freeze); } @@ -335,9 +357,15 @@ void FGNetCtrls2Props( FGNetCtrls *net, bool honor_freezes, node = fgGetNode("/controls/flight", true); node->setDoubleValue( "aileron", net->aileron ); node->setDoubleValue( "elevator", net->elevator ); - node->setDoubleValue( "elevator-trim", net->elevator_trim ); node->setDoubleValue( "rudder", net->rudder ); + node->setDoubleValue( "aileron-trim", net->aileron_trim ); + node->setDoubleValue( "elevator-trim", net->elevator_trim ); + node->setDoubleValue( "rudder-trim", net->rudder_trim ); node->setDoubleValue( "flaps", net->flaps ); + node->setDoubleValue( "speedbrake", net->speedbrake ); //JWW + // or + node->setDoubleValue( "spoilers", net->spoilers ); //JWW +// cout << "NET->Spoilers: " << net->spoilers << endl; fgSetBool( "/systems/electrical/outputs/flaps", net->flaps_power ); node->setBoolValue( "flaps-serviceable", net->flap_motor_ok ); @@ -348,8 +376,12 @@ void FGNetCtrls2Props( FGNetCtrls *net, bool honor_freezes, node->getChild( "mixture" )->setDoubleValue( net->mixture[i] ); node->getChild( "propeller-pitch" ) ->setDoubleValue( net->prop_advance[i] ); + node->getChild( "condition" ) + ->setDoubleValue( net->condition[i] ); node->getChild( "magnetos" )->setDoubleValue( net->magnetos[i] ); - + node->getChild( "starter" )->setDoubleValue( net->starter_power[i] ); + node->getChild( "feed_tank" )->setIntValue( net->feed_tank_to[i] ); + node->getChild( "reverser" )->setBoolValue( net->reverse[i] ); // Faults SGPropertyNode *faults = node->getNode( "faults", true ); faults->setBoolValue( "serviceable", net->engine_ok[i] ); @@ -365,23 +397,29 @@ void FGNetCtrls2Props( FGNetCtrls *net, bool honor_freezes, fgSetBool( "/systems/electrical/outputs/fuel-pump", net->fuel_pump_power[0] ); - fgSetBool( "/systems/electrical/outputs/starter", - net->starter_power[0] ); for ( i = 0; i < FGNetCtrls::FG_MAX_TANKS; ++i ) { node = fgGetNode( "/controls/fuel/tank", i ); node->getChild( "fuel_selector" ) ->setBoolValue( net->fuel_selector[i] ); +// node->getChild( "to_tank" )->xfer_tank( i, net->xfer_to[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( "copilot-brake-left" ) + ->setDoubleValue( net->copilot_brake_left ); + node->getChild( "copilot-brake-right" ) + ->setDoubleValue( net->copilot_brake_right ); node->getChild( "brake-parking" )->setDoubleValue( net->brake_parking ); } node = fgGetNode( "/controls/gear", true ); node->setBoolValue( "gear-down", net->gear_handle ); +// node->setDoubleValue( "brake-parking", net->brake_parking ); +// node->setDoubleValue( net->brake_left ); +// node->setDoubleValue( net->brake_right ); node = fgGetNode( "/controls/switches", true ); node->setBoolValue( "master-bat", net->master_bat ); @@ -392,7 +430,7 @@ void FGNetCtrls2Props( FGNetCtrls *net, bool honor_freezes, node->setDoubleValue( "wind-speed-kt", net->wind_speed_kt ); node->setDoubleValue( "wind-from-heading-deg", net->wind_dir_deg ); node->setDoubleValue( "turbulence/magnitude-norm", net->turbulence_norm ); - node->setBoolValue( "magnetic-variation-deg", net->magvar ); + node->setDoubleValue( "magnetic-variation-deg", net->magvar ); node->setDoubleValue( "/environment/temperature-degc", net->temp_c ); @@ -401,6 +439,13 @@ void FGNetCtrls2Props( FGNetCtrls *net, bool honor_freezes, // ground elevation ??? + fgSetDouble("/hazards/icing/wing", net->icing); + + node = fgGetNode( "/radios", true ); + node->setDoubleValue( "comm/frequencies/selected-mhz[0]", net->comm_1 ); + node->setDoubleValue( "nav/frequencies/selected-mhz[0]", net->nav_1 ); + node->setDoubleValue( "nav[1]/frequencies/selected-mhz[0]", net->nav_2 ); + fgSetInt( "/sim/speed-up", net->speedup ); if ( honor_freezes ) { @@ -418,7 +463,6 @@ bool FGNativeCtrls::process() { int length = sizeof(FGNetCtrls); if ( get_direction() == SG_IO_OUT ) { - // cout << "size of cur_fdm_state = " << length << endl; FGProps2NetCtrls( &net_ctrls, true, true );