X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2Fnative_ctrls.cxx;h=4d2051a35caaf387312fb4bce5a2935fee71e6f9;hb=cc3d0221ea5fb1def56f53305560829fc66c2ab6;hp=89a4ef0bb770bb2af021aedad232447217088317;hpb=4cf43a8e9fce168b1406ccdc6c79b39ca487e0eb;p=flightgear.git

diff --git a/src/Network/native_ctrls.cxx b/src/Network/native_ctrls.cxx
index 89a4ef0bb..4d2051a35 100644
--- a/src/Network/native_ctrls.cxx
+++ b/src/Network/native_ctrls.cxx
@@ -103,6 +103,8 @@ void FGProps2NetCtrls( FGNetCtrls *net, bool honor_freezes,
 {
     int i;
     SGPropertyNode *node;
+    SGPropertyNode *starter;
+    SGPropertyNode *fuelpump;
     SGPropertyNode *tempnode;
 
     // fill in values
@@ -121,9 +123,22 @@ void FGProps2NetCtrls( FGNetCtrls *net, bool honor_freezes,
     for ( i = 0; i < FGNetCtrls::FG_MAX_ENGINES; ++i ) {
         // Controls
         node = fgGetNode("/controls/engines/engine", i );
-	net->throttle[i] = node->getDoubleValue( "throttle", 0.0 );
+        starter = fgGetNode("/systems/electrical/outputs/starter", i );
+        fuelpump = fgGetNode("/systems/electrical/outputs/fuel-pump", i );
+
+        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 );
@@ -132,13 +147,18 @@ void FGProps2NetCtrls( FGNetCtrls *net, bool honor_freezes,
 	  // cout << "Starter -> " << node->getIntValue( "starter", false )
 	  //      << endl;
 	}
-	net->fuel_pump_power[i]
-            = node->getDoubleValue( "/systems/electrical/outputs/fuel-pump",
-                                    1.0 ) >= 1.0;
 
-	net->starter_power[i]
-            = node->getDoubleValue( "/systems/electrical/outputs/starter",
-                                    1.0 ) >= 1.0;
+        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;
+        }
 
 	// Faults
 	SGPropertyNode *faults = node->getChild( "faults", 0, true );
@@ -164,31 +184,17 @@ void FGProps2NetCtrls( FGNetCtrls *net, bool honor_freezes,
             net->fuel_selector[i] = false;
         }
     }
-    net->num_wheels = FGNetCtrls::FG_MAX_WHEELS;
-    tempnode = fgGetNode("/controls/gear", true);
-    for ( i = 0; i < FGNetCtrls::FG_MAX_WHEELS; ++i ) {
-        node = fgGetNode("/controls/gear/wheel", i);
-        if ( node != NULL && node->getChild("brake") != NULL ) {
-            if ( tempnode->getChild("parking-brake")->getDoubleValue() > 0.0 ) {
-                net->brake[i] = 1.0;
-           } else {
-                net->brake[i]
-                    = node->getChild("brake")->getDoubleValue();
-            }
-        } else {
-            net->brake[i] = 0.0;
-        }
-    }
+    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();
+
+    net->gear_handle = fgGetBool( "controls/gear/gear-down" );
 
-    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();
@@ -209,6 +215,9 @@ void FGProps2NetCtrls( FGNetCtrls *net, bool honor_freezes,
     // the user is switching views.
     net->hground = cur_fdm_state->get_ground_elev_ft() * SG_FEET_TO_METER;
     net->magvar = fgGetDouble("/environment/magnetic-variation-deg");
+
+    net->icing = fgGetDouble("/hazards/icing/wing");
+
     net->speedup = fgGetInt("/sim/speed-up");
     net->freeze = 0;
     if ( honor_freezes ) {
@@ -234,12 +243,15 @@ void FGProps2NetCtrls( FGNetCtrls *net, bool honor_freezes,
         net->flaps_power = htonl(net->flaps_power);
         net->flap_motor_ok = htonl(net->flap_motor_ok);
         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]);
@@ -252,13 +264,12 @@ void FGProps2NetCtrls( FGNetCtrls *net, bool honor_freezes,
             net->fuel_selector[i] = htonl(net->fuel_selector[i]);
         }
         net->num_tanks = htonl(net->num_tanks);
-        for ( i = 0; i < FGNetCtrls::FG_MAX_WHEELS; ++i ) {
-            htond(net->brake[i]);
-        }
-        net->num_wheels = htonl(net->num_wheels);
+        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);
@@ -267,6 +278,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);
     }
@@ -293,12 +305,15 @@ void FGNetCtrls2Props( FGNetCtrls *net, bool honor_freezes,
         net->flap_motor_ok = htonl(net->flap_motor_ok);
         net->num_engines = htonl(net->num_engines);
         for ( i = 0; i < 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]);
@@ -310,13 +325,12 @@ void FGNetCtrls2Props( FGNetCtrls *net, bool honor_freezes,
         for ( i = 0; i < net->num_tanks; ++i ) {
             net->fuel_selector[i] = htonl(net->fuel_selector[i]);
         }
-        net->num_wheels = htonl(net->num_wheels);
-        for ( i = 0; i < net->num_wheels; ++i ) {
-            htond(net->brake[i]);
-        }
+        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);
@@ -325,6 +339,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);
     }
@@ -352,6 +367,8 @@ 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] );
 
 	// Faults
@@ -377,11 +394,15 @@ void FGNetCtrls2Props( FGNetCtrls *net, bool honor_freezes,
         node->getChild( "fuel_selector" )
             ->setBoolValue( net->fuel_selector[i] );
     }
-    for ( i = 0; i < FGNetCtrls::FG_MAX_WHEELS; ++i ) {
-        node = fgGetNode( "/controls/gear/wheel", i );
-        if ( node != NULL ) {
-            node->getChild( "brake" )->setDoubleValue( net->brake[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 );
@@ -405,6 +426,8 @@ void FGNetCtrls2Props( FGNetCtrls *net, bool honor_freezes,
 
     // ground elevation ???
 
+    fgSetDouble("/hazards/icing/wing", net->icing);
+
     fgSetInt( "/sim/speed-up", net->speedup );
 
     if ( honor_freezes ) {