From 4763dbae6a4eb5b0ed0c05760d10799589bf8294 Mon Sep 17 00:00:00 2001 From: curt Date: Tue, 1 Oct 2002 15:26:15 +0000 Subject: [PATCH] Pass data needed to make David's new ASI model work correctly. --- src/FDM/ExternalNet/ExternalNet.cxx | 7 +++++++ src/Network/net_fdm.hxx | 10 +++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/FDM/ExternalNet/ExternalNet.cxx b/src/FDM/ExternalNet/ExternalNet.cxx index 3f2fbc9ce..e5e450908 100644 --- a/src/FDM/ExternalNet/ExternalNet.cxx +++ b/src/FDM/ExternalNet/ExternalNet.cxx @@ -185,6 +185,9 @@ static void net2global( FGNetFDM *net ) { htond(net->v_north); htond(net->v_east); htond(net->v_down); + htond(net->v_wind_body_north); + htond(net->v_wind_body_east); + htond(net->v_wind_body_down); htond(net->stall_warning); htond(net->A_X_pilot); @@ -233,6 +236,10 @@ static void net2global( FGNetFDM *net ) { cur_fdm_state->_set_Velocities_Local( net->v_north, net->v_east, net->v_down ); + cur_fdm_state->_set_Velocities_Wind_Body( net->v_wind_body_north, + net->v_wind_body_east, + net->v_wind_body_down ); + fgSetDouble( "/sim/aero/alarms/stall-warning", net->stall_warning ); cur_fdm_state->_set_Accels_Pilot_Body( net->A_X_pilot, net->A_Y_pilot, diff --git a/src/Network/net_fdm.hxx b/src/Network/net_fdm.hxx index 736d3ec21..6cd717600 100644 --- a/src/Network/net_fdm.hxx +++ b/src/Network/net_fdm.hxx @@ -32,7 +32,7 @@ #include // time_t -const int FG_NET_FDM_VERSION = 10; +const int FG_NET_FDM_VERSION = 11; // Define a structure containing the top level flight dynamics model @@ -72,6 +72,12 @@ public: double v_north; // north velocity in local/body frame, fps double v_east; // east velocity in local/body frame, fps double v_down; // down/vertical velocity in local/body frame, fps + double v_wind_body_north; // north velocity in local/body frame + // relative to local airmass, fps + double v_wind_body_east; // east velocity in local/body frame + // relative to local airmass, fps + double v_wind_body_down; // down/vertical velocity in local/body + // frame relative to local airmass, fps // Stall double stall_warning; // 0.0 - 1.0 indicating the amount of stall @@ -81,6 +87,8 @@ public: double A_Y_pilot; // Y accel in body frame ft/sec^2 double A_Z_pilot; // Z accel in body frame ft/sec^2 + // Pressure + // Engine status int num_engines; // Number of valid engines int eng_state[FG_MAX_ENGINES]; // Engine state (off, cranking, running)