the former weather radar is now a generic radar (weather and aircraft),

[flightgear.git] / src / Instrumentation / instrument_mgr.cxx

diff --git a/src/Instrumentation/instrument_mgr.cxx b/src/Instrumentation/instrument_mgr.cxx
index 65e3c1e86c993e540683f8a1f3264fde95bb70b4..aaaba40b804a9309906cf821adc51586af9bc4b5 100644 (file)
--- a/src/Instrumentation/instrument_mgr.cxx
+++ b/src/Instrumentation/instrument_mgr.cxx
@@ -18,19 +18,20 @@
 #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"
 #include "airspeed_indicator.hxx"
 #include "altimeter.hxx"
-#include "annunciator.hxx"
 #include "attitude_indicator.hxx"
 #include "clock.hxx"
 #include "dme.hxx"
-#include "encoder.hxx"
 #include "gps.hxx"
+#include "gsdi.hxx"
 #include "heading_indicator.hxx"
 #include "heading_indicator_fg.hxx"
+#include "heading_indicator_dg.hxx"
 #include "kr_87.hxx"
 #include "kt_70.hxx"
 #include "mag_compass.hxx"
@@ -43,14 +44,15 @@
 #include "inst_vertical_speed_indicator.hxx" // (TJ)
 #include "od_gauge.hxx"
 #include "wxradar.hxx"
-#include "tacan.hxx" 
+#include "tacan.hxx"
 #include "mk_viii.hxx"
+#include "mrg.hxx"
 
 
 FGInstrumentMgr::FGInstrumentMgr ()
 {
-    set_subsystem("annunciator", new Annunciator);
     set_subsystem("od_gauge", new FGODGauge, 1.0);
+    set_subsystem("hud", new HUD);
 
     config_props = new SGPropertyNode;
 
@@ -118,16 +120,22 @@ bool FGInstrumentMgr::build ()
                            new DME( node ), 1.0 );
         } else if ( name == "encoder" ) {
             set_subsystem( "instrument" + temp.str(), 
-                           new Encoder( node ) );
+                           new Altimeter( node ) );
         } else if ( name == "gps" ) {
             set_subsystem( "instrument" + temp.str(), 
                            new GPS( node ), 0.45 );
+        } else if ( name == "gsdi" ) {
+            set_subsystem( "instrument" + temp.str(),
+                           new GSDI( node ) );
         } else if ( name == "heading-indicator" ) {
             set_subsystem( "instrument" + temp.str(), 
                            new HeadingIndicator( node ) );
         } else if ( name == "heading-indicator-fg" ) {
             set_subsystem( "instrument" + temp.str(), 
                            new HeadingIndicatorFG( node ) );
+        } else if ( name == "heading-indicator-dg" ) {
+            set_subsystem( "instrument" + temp.str(), 
+                           new HeadingIndicatorDG( node ) );
         } else if ( name == "KR-87" ) {
             set_subsystem( "instrument" + temp.str(), 
                            new FGKR_87( node ) );
@@ -155,7 +163,7 @@ bool FGInstrumentMgr::build ()
         } else if ( name == "vertical-speed-indicator" ) {
             set_subsystem( "instrument" + temp.str(), 
                            new VerticalSpeedIndicator( node ) );
-        } else if ( name == "wxradar" ) {
+        } else if ( name == "radar" ) {
             set_subsystem( "instrument" + temp.str(), 
                            new wxRadarBg ( node ), 0.5 );
         } else if ( name == "inst-vertical-speed-indicator" ) { // (TJ)
@@ -167,6 +175,10 @@ bool FGInstrumentMgr::build ()
         } else if ( name == "mk-viii" ) { 
             set_subsystem( "instrument" + temp.str(), 
                            new MK_VIII( node ) );
+        } else if ( name == "master-reference-gyro" ) { 
+            set_subsystem( "instrument" + temp.str(), 
+                           new MasterReferenceGyro( node ) );
+
         } else {
             SG_LOG( SG_ALL, SG_ALERT, "Unknown top level section: " 
                     << name );