From 9d8b687fc536c1c426bbacfb616c8b4db942f64c Mon Sep 17 00:00:00 2001 From: curt Date: Tue, 15 Feb 2005 18:11:03 +0000 Subject: [PATCH] Add support for aileron and rudder trims. --- src/Network/native_ctrls.cxx | 16 ++++++++++++---- src/Network/net_ctrls.hxx | 6 ++++-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/Network/native_ctrls.cxx b/src/Network/native_ctrls.cxx index 9bbd1f6ea..714a401e1 100644 --- a/src/Network/native_ctrls.cxx +++ b/src/Network/native_ctrls.cxx @@ -111,8 +111,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; @@ -233,8 +235,10 @@ 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); @@ -294,8 +298,10 @@ 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); @@ -350,8 +356,10 @@ 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 ); fgSetBool( "/systems/electrical/outputs/flaps", net->flaps_power ); node->setBoolValue( "flaps-serviceable", net->flap_motor_ok ); diff --git a/src/Network/net_ctrls.hxx b/src/Network/net_ctrls.hxx index 1de077dd8..6bb9461b0 100644 --- a/src/Network/net_ctrls.hxx +++ b/src/Network/net_ctrls.hxx @@ -17,7 +17,7 @@ # error This library requires C++ #endif -const int FG_NET_CTRLS_VERSION = 23; +const int FG_NET_CTRLS_VERSION = 24; // Define a structure containing the control parameters @@ -37,8 +37,10 @@ public: // Aero controls double aileron; // -1 ... 1 double elevator; // -1 ... 1 - double elevator_trim; // -1 ... 1 double rudder; // -1 ... 1 + double aileron_trim; // -1 ... 1 + double elevator_trim; // -1 ... 1 + double rudder_trim; // -1 ... 1 double flaps; // 0 ... 1 // Aero control faults -- 2.39.5