//
// This file is in the Public Domain and comes with no warranty.
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include <iostream>
#include <string>
#include <sstream>
#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 "gps.hxx"
+#include "gsdi.hxx"
#include "heading_indicator.hxx"
-#include "kr_87.cxx"
+#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 "slip_skid_ball.hxx"
+#include "transponder.hxx"
#include "turn_indicator.hxx"
#include "vertical_speed_indicator.hxx"
+#include "inst_vertical_speed_indicator.hxx" // (TJ)
+#include "od_gauge.hxx"
+#include "wxradar.hxx"
+#include "tacan.hxx"
+#include "mk_viii.hxx"
+#include "mrg.hxx"
FGInstrumentMgr::FGInstrumentMgr ()
{
- //set_subsystem("asi", new AirspeedIndicator(0));
- //set_subsystem("asi-backup", new AirspeedIndicator(1, 1, 1));
- set_subsystem("annunciator", new Annunciator);
- //set_subsystem("ai", new AttitudeIndicator);
- //set_subsystem("alt", new Altimeter);
- //set_subsystem("ti", new TurnIndicator);
- //set_subsystem("ball", new SlipSkidBall);
- //set_subsystem("hi", new HeadingIndicator);
- //set_subsystem("vsi", new VerticalSpeedIndicator);
- //set_subsystem("compass", new MagCompass);
- //set_subsystem("dme", new DME, 1.0);
- //set_subsystem("adf", new ADF, 0.15);
- //set_subsystem("gps", new GPS, 0.45);
- //set_subsystem("clock", new Clock, 0.25);
- //set_subsystem("nhi", new NewHeadingIndicator);
+ set_subsystem("od_gauge", new FGODGauge, 1.0);
+ set_subsystem("hud", new HUD);
config_props = new SGPropertyNode;
try {
readProperties( config.str(), config_props );
- if ( build() ) {
- enabled = true;
- } else {
- SG_LOG( SG_ALL, SG_ALERT,
- "Detected an internal inconsistancy in the instrumentation");
- SG_LOG( SG_ALL, SG_ALERT,
- " system specification file. See earlier errors for" );
- SG_LOG( SG_ALL, SG_ALERT,
- " details.");
- exit(-1);
- }
+ if ( !build() ) {
+ throw sg_throwable(string(
+ "Detected an internal inconsistency in the instrumentation\n"
+ "system specification file. See earlier errors for details."));
+ }
} catch (const sg_exception& exc) {
SG_LOG( SG_ALL, SG_ALERT, "Failed to load instrumentation system model: "
<< config.str() );
} else if ( name == "dme" ) {
set_subsystem( "instrument" + temp.str(),
new DME( node ), 1.0 );
+ } else if ( name == "encoder" ) {
+ set_subsystem( "instrument" + temp.str(),
+ 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 ) );
+ } else if ( name == "KT-70" ) {
+ set_subsystem( "instrument" + temp.str(),
+ new FGKT_70( node ) );
} else if ( name == "magnetic-compass" ) {
set_subsystem( "instrument" + temp.str(),
new MagCompass( node ) );
+ } else if ( name == "marker-beacon" ) {
+ set_subsystem( "instrument" + temp.str(),
+ new FGMarkerBeacon( node ) );
+ } else if ( name == "nav-radio" ) {
+ set_subsystem( "instrument" + temp.str(),
+ new FGNavRadio( node ) );
} else if ( name == "slip-skid-ball" ) {
set_subsystem( "instrument" + temp.str(),
new SlipSkidBall( node ) );
+ } else if ( name == "transponder" ) {
+ set_subsystem( "instrument" + temp.str(),
+ new Transponder( node ) );
} else if ( name == "turn-indicator" ) {
set_subsystem( "instrument" + temp.str(),
new TurnIndicator( node ) );
} else if ( name == "vertical-speed-indicator" ) {
set_subsystem( "instrument" + temp.str(),
new VerticalSpeedIndicator( node ) );
- } else if ( name == "gps" ) {
+ } else if ( name == "radar" ) {
set_subsystem( "instrument" + temp.str(),
- new GPS( node ), 0.45 );
+ new wxRadarBg ( node ), 0.5 );
+ } else if ( name == "inst-vertical-speed-indicator" ) { // (TJ)
+ set_subsystem( "instrument" + temp.str(),
+ new InstVerticalSpeedIndicator( node ) );
+ } else if ( name == "tacan" ) {
+ set_subsystem( "instrument" + temp.str(),
+ new TACAN( node ) );
+ } 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 );