X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInstrumentation%2Finstrument_mgr.cxx;h=751f6c78c7fec517722aaddb5e02215dfdbb5097;hb=de959a14f35ee4e74d405b418bb09689967ee22f;hp=58fe89db1a4c5b5a5c7976cc9f133753b51573d3;hpb=12f694f06d9f2ffabb66959bb3f055074cee9473;p=flightgear.git

diff --git a/src/Instrumentation/instrument_mgr.cxx b/src/Instrumentation/instrument_mgr.cxx
index 58fe89db1..751f6c78c 100644
--- a/src/Instrumentation/instrument_mgr.cxx
+++ b/src/Instrumentation/instrument_mgr.cxx
@@ -14,11 +14,11 @@
 #include <simgear/structure/exception.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/sg_inlines.h>
+#include <simgear/props/props_io.hxx>
 
 #include <Main/fg_props.hxx>
 #include <Main/globals.hxx>
 #include <Main/util.hxx>
-#include <Instrumentation/HUD/HUD.hxx>
 
 #include "instrument_mgr.hxx"
 #include "adf.hxx"
@@ -33,37 +33,36 @@
 #include "heading_indicator_fg.hxx"
 #include "heading_indicator_dg.hxx"
 #include "kr_87.hxx"
-#include "kt_70.hxx"
 #include "mag_compass.hxx"
 #include "marker_beacon.hxx"
-#include "navradio.hxx"
+#include "newnavradio.hxx"
+#include "commradio.hxx"
 #include "slip_skid_ball.hxx"
 #include "transponder.hxx"
 #include "turn_indicator.hxx"
 #include "vertical_speed_indicator.hxx"
 #include "inst_vertical_speed_indicator.hxx"
-#include "od_gauge.hxx"
-#include "wxradar.hxx"
 #include "tacan.hxx"
 #include "mk_viii.hxx"
 #include "mrg.hxx"
-#include "groundradar.hxx"
-#include "agradar.hxx"
 #include "rad_alt.hxx"
 #include "tcas.hxx"
 
 FGInstrumentMgr::FGInstrumentMgr () :
   _explicitGps(false)
-{
-    set_subsystem("od_gauge", new FGODGauge);
-    
-    globals->add_subsystem("hud", new HUD, SGSubsystemMgr::DISPLAY);
+{    
 }
 
 FGInstrumentMgr::~FGInstrumentMgr ()
 {
 }
 
+SGSubsystem::InitStatus FGInstrumentMgr::incrementalInit()
+{
+  init();
+  return INIT_DONE;
+}
+
 void FGInstrumentMgr::init()
 {
   SGPropertyNode_ptr config_props = new SGPropertyNode;
@@ -79,13 +78,13 @@ void FGInstrumentMgr::init()
   try {
     readProperties( config.str(), config_props );
     if (!build(config_props)) {
-      throw sg_error(
+      throw sg_exception(
                     "Detected an internal inconsistency in the instrumentation\n"
                     "system specification file.  See earlier errors for details.");
     }
-  } catch (const sg_exception&) {
+  } catch (const sg_exception& e) {
     SG_LOG(SG_COCKPIT, SG_ALERT, "Failed to load instrumentation system model: "
-                    << config.str() );
+                    << config.str() << ":" << e.getFormattedMessage() );
   }
 
 
@@ -95,7 +94,7 @@ void FGInstrumentMgr::init()
     nd->setStringValue("name", "gps");
     nd->setIntValue("number", 0);
     _instruments.push_back("gps[0]");
-    set_subsystem("gps[0]", new GPS(nd));
+    set_subsystem("gps[0]", new GPS(nd, true /* default GPS mode */));
   }
 
   // bind() created instruments before init.
@@ -108,25 +107,11 @@ void FGInstrumentMgr::init()
   SGSubsystemGroup::init();
 }
 
-void FGInstrumentMgr::reinit()
-{  
-// delete all our instrument
-  for (unsigned int i=0; i<_instruments.size(); ++i) {
-    const std::string& nm(_instruments[i]);
-    SGSubsystem* instr = get_subsystem(nm);
-    instr->unbind();
-    remove_subsystem(nm);
-    delete instr;
-  }
-  
-  init();
-}
-
 bool FGInstrumentMgr::build (SGPropertyNode* config_props)
 {
     for ( int i = 0; i < config_props->nChildren(); ++i ) {
         SGPropertyNode *node = config_props->getChild(i);
-        string name = node->getName();
+        std::string name = node->getName();
 
         std::ostringstream subsystemname;
         subsystemname << "instrument-" << i << '-'
@@ -134,9 +119,8 @@ bool FGInstrumentMgr::build (SGPropertyNode* config_props)
         int index = node->getIntValue("number", 0);
         if (index > 0)
             subsystemname << '['<< index << ']';
-        string id = subsystemname.str();
-        _instruments.push_back(id);
-
+        std::string id = subsystemname.str();
+      
         if ( name == "adf" ) {
             set_subsystem( id, new ADF( node ), 0.15 );
 
@@ -144,7 +128,7 @@ bool FGInstrumentMgr::build (SGPropertyNode* config_props)
             set_subsystem( id, new AirspeedIndicator( node ) );
 
         } else if ( name == "altimeter" ) {
-            set_subsystem( id, new Altimeter( node ) );
+            set_subsystem( id, new Altimeter( node, "altimeter" ) );
 
         } else if ( name == "attitude-indicator" ) {
             set_subsystem( id, new AttitudeIndicator( node ) );
@@ -156,10 +140,14 @@ bool FGInstrumentMgr::build (SGPropertyNode* config_props)
             set_subsystem( id, new DME( node ), 1.0 );
 
         } else if ( name == "encoder" ) {
-            set_subsystem( id, new Altimeter( node ) );
+            set_subsystem( id, new Altimeter( node, "encoder" ), 0.15 );
 
         } else if ( name == "gps" ) {
-            set_subsystem( id, new GPS( node ) );
+            // post 2.12.0, add a new name (distinct from 'gps'), so
+            // it is possible to create non-default GPS instruments.
+            // then authors of realistic GPS and FMSs can transition to using
+            // that name as they choose.
+            set_subsystem( id, new GPS( node, true /* default GPS mode */ ) );
             _explicitGps = true;
         } else if ( name == "gsdi" ) {
             set_subsystem( id, new GSDI( node ) );
@@ -176,23 +164,29 @@ bool FGInstrumentMgr::build (SGPropertyNode* config_props)
         } else if ( name == "KR-87" ) {
             set_subsystem( id, new FGKR_87( node ) );
 
-        } else if ( name == "KT-70" ) {
-            set_subsystem( id, new FGKT_70( node ) );
-
         } else if ( name == "magnetic-compass" ) {
             set_subsystem( id, new MagCompass( node ) );
 
         } else if ( name == "marker-beacon" ) {
-            set_subsystem( id, new FGMarkerBeacon( node ) );
+            set_subsystem( id, new FGMarkerBeacon( node ), 0.2 );
+
+        } else if ( name == "comm-radio" ) {
+            set_subsystem( id, Instrumentation::CommRadio::createInstance( node ) );
 
         } else if ( name == "nav-radio" ) {
-            set_subsystem( id, new FGNavRadio( node ) );
+            set_subsystem( id, Instrumentation::NavRadio::createInstance( node ) );
 
         } else if ( name == "slip-skid-ball" ) {
-            set_subsystem( id, new SlipSkidBall( node ) );
+            set_subsystem( id, new SlipSkidBall( node ), 0.03 );
 
-        } else if ( name == "transponder" ) {
-            set_subsystem( id, new Transponder( node ) );
+        } else if (( name == "transponder" ) || ( name == "KT-70" )) {
+            if  (name == "KT-70") {
+                SG_LOG(SG_INSTR, SG_WARN, "KT-70 legacy instrument compatibility. "
+                       "Please update aircraft to use transponder directly");
+                // force configuration into compatibility mode
+                node->setBoolValue("kt70-compatibility", true);
+            }
+            set_subsystem( id, new Transponder( node ), 0.2 );
 
         } else if ( name == "turn-indicator" ) {
             set_subsystem( id, new TurnIndicator( node ) );
@@ -200,39 +194,42 @@ bool FGInstrumentMgr::build (SGPropertyNode* config_props)
         } else if ( name == "vertical-speed-indicator" ) {
             set_subsystem( id, new VerticalSpeedIndicator( node ) );
 
-        } else if ( name == "radar" ) {
-            set_subsystem( id, new wxRadarBg ( node ), 1);
-
         } else if ( name == "inst-vertical-speed-indicator" ) {
             set_subsystem( id, new InstVerticalSpeedIndicator( node ) );
 
         } else if ( name == "tacan" ) {
-            set_subsystem( id, new TACAN( node ) );
+            set_subsystem( id, new TACAN( node ), 0.2 );
 
         } else if ( name == "mk-viii" ) {
-            set_subsystem( id, new MK_VIII( node ) );
+            set_subsystem( id, new MK_VIII( node ), 0.2);
 
         } else if ( name == "master-reference-gyro" ) {
             set_subsystem( id, new MasterReferenceGyro( node ) );
 
-        } else if ( name == "groundradar" ) {
-            set_subsystem( id, new GroundRadar( node ), 1 );
-
-        } else if ( name == "air-ground-radar" ) {
-            set_subsystem( id, new agRadar( node ),1);
-
+        } else if (( name == "groundradar" ) ||
+                   ( name == "radar" ) ||
+                   ( name == "air-ground-radar" ) ||
+                   ( name == "navigation-display" ))
+        {
+        // these instruments are handled by the CockpitDisplayManager
+        // catch them here so we can still warn about bogus names in
+        // the instruments file
+          continue;
         } else if ( name == "radar-altimeter" ) {
-            set_subsystem( id, new radAlt( node ),1);
+            set_subsystem( id, new RadarAltimeter( node ) );
 
         } else if ( name == "tcas" ) {
-            set_subsystem( id, new TCAS( node ) );
-
+            set_subsystem( id, new TCAS( node ), 0.2);
+            
         } else {
-            SG_LOG( SG_ALL, SG_ALERT, "Unknown top level section: "
-                    << name );
-            return false;
+            SG_LOG( SG_INSTR, SG_ALERT,
+                     "Unknown top level section in instrumentation: " << name );
+            continue;
         }
-    }
+      
+      // only push to our array if we actually built an insturment
+        _instruments.push_back(id);
+    } // of instruments iteration
     return true;
 }