//
// 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$
#include "native_ctrls.hxx"
// FreeBSD works better with this included last ... (?)
-#if defined(WIN32) && !defined(__CYGWIN__)
+#if defined( _MSC_VER )
# include <windows.h>
+#elif defined( __MINGW32__ )
+# include <Winsock2.h>
#else
# include <netinet/in.h> // htonl() ntohl()
#endif
if ( net_byte_order ) {
// convert to network byte order
- net->version = htons(net->version);
+ net->version = htonl(net->version);
htond(net->aileron);
htond(net->elevator);
htond(net->rudder);
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]);
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 < 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_avionics = htonl(net->master_avionics);
htond(net->wind_speed_kt);
htond(net->wind_dir_deg);
htond(net->turbulence_norm);
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);
}
}
if ( net_byte_order ) {
// convert from network byte order
- net->version = htons(net->version);
+ net->version = htonl(net->version);
htond(net->aileron);
htond(net->elevator);
htond(net->rudder);
htond(net->elevator_trim);
htond(net->rudder_trim);
htond(net->flaps);
- for ( i = 0; i < net->num_engines; ++i ) {
+ 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 < (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]);
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 < 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_avionics = htonl(net->master_avionics);
htond(net->wind_speed_kt);
htond(net->wind_dir_deg);
htond(net->turbulence_norm);
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);
}
if ( net->version != FG_NET_CTRLS_VERSION ) {
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 );
->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] );
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 = 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 );
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 );
// 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 );