Added velocity and climb_rate to mini_fdm structure.

diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index abe3acb61c8622386aed01b3d1d574e0ae40f46c..dc55328d36979f538d99add1700a349c3a4d3873 100644 (file)
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -916,7 +916,7 @@ parse_option (const string& arg)
     } else if ( arg.find( "--native-fdm=" ) == 0 ) {
        add_channel( "native_fdm", arg.substr(13) );
     } else if ( arg.find( "--mini-fdm=" ) == 0 ) {
-       add_channel( "mini_fdm", arg.substr(13) );
+       add_channel( "mini_fdm", arg.substr(11) );
     } else if ( arg.find( "--opengc=" ) == 0 ) {
        // char stop;
        // cout << "Adding channel for OpenGC Display" << endl; cin >> stop;

diff --git a/src/Network/mini_fdm.cxx b/src/Network/mini_fdm.cxx
index f5b7ef229b4e6b786e4a011509fd6ad6598bf1d8..80bb4c4b84726735b0a303aefa64438056338167 100644 (file)
--- a/src/Network/mini_fdm.cxx
+++ b/src/Network/mini_fdm.cxx
@@ -114,6 +114,10 @@ void FGProps2NetMiniFDM( FGNetMiniFDM *net ) {
     net->theta = cur_fdm_state->get_Theta();
     net->psi = cur_fdm_state->get_Psi();
 
+    // Velocities
+    net->vcas = cur_fdm_state->get_V_calibrated_kts();
+    net->climb_rate = cur_fdm_state->get_Climb_Rate();
+
     // Consumables
     net->num_tanks = FGNetMiniFDM::FG_MAX_TANKS;
     for ( i = 0; i < net->num_tanks; ++i ) {
@@ -134,6 +138,8 @@ void FGProps2NetMiniFDM( FGNetMiniFDM *net ) {
     htond(net->phi);
     htond(net->theta);
     htond(net->psi);
+    htond(net->vcas);
+    htond(net->climb_rate);
 
     for ( i = 0; i < net->num_tanks; ++i ) {
         htond(net->fuel_quantity[i]);
@@ -157,6 +163,8 @@ void FGNetMiniFDM2Props( FGNetMiniFDM *net ) {
     htond(net->phi);
     htond(net->theta);
     htond(net->psi);
+    htond(net->vcas);
+    htond(net->climb_rate);
 
     net->num_tanks = htonl(net->num_tanks);
     for ( i = 0; i < net->num_tanks; ++i ) {
@@ -178,6 +186,9 @@ void FGNetMiniFDM2Props( FGNetMiniFDM *net ) {
                                           net->theta,
                                           net->psi );
 
+        cur_fdm_state->_set_V_calibrated_kts( net->vcas );
+        cur_fdm_state->_set_Climb_Rate( net->climb_rate );
+
        for (i = 0; i < net->num_tanks; ++i ) {
            SGPropertyNode * node
                = fgGetNode("/consumables/fuel/tank", i, true);

diff --git a/src/Network/net_fdm_mini.hxx b/src/Network/net_fdm_mini.hxx
index 71c922a7f93c90e30401bbf2662f256ac48bf121..d0cabec043b51cd4b45dc08f5b3ad509604c0850 100644 (file)
--- a/src/Network/net_fdm_mini.hxx
+++ b/src/Network/net_fdm_mini.hxx
@@ -62,6 +62,10 @@ public:
     double theta;              // pitch (radians)
     double psi;                        // yaw or true heading (radians)
 
+    // Velocities
+    double vcas;
+    double climb_rate;         // feet per second
+
     // Consumables
     int num_tanks;             // Max number of fuel tanks
     double fuel_quantity[FG_MAX_TANKS];