#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 "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 "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 "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"
-#include "NavDisplay.hxx"
FGInstrumentMgr::FGInstrumentMgr () :
_explicitGps(false)
{
- 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;
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.
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 << '-'
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 );
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 ) );
set_subsystem( id, new DME( node ), 1.0 );
} else if ( name == "encoder" ) {
- set_subsystem( id, new Altimeter( node ), 0.15 );
+ 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 ) );
} 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 ), 0.2 );
+ } else if ( name == "comm-radio" ) {
+ set_subsystem( id, Instrumentation::CommRadio::createInstance( node ) );
+
} else if ( name == "nav-radio" ) {
set_subsystem( id, Instrumentation::NavRadio::createInstance( node ) );
} else if ( name == "slip-skid-ball" ) {
set_subsystem( id, new SlipSkidBall( node ), 0.03 );
- } else if ( name == "transponder" ) {
+ } 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" ) {
} else if ( name == "vertical-speed-indicator" ) {
set_subsystem( id, new VerticalSpeedIndicator( node ) );
- } else if ( name == "radar" ) {
- set_subsystem( id, new wxRadarBg ( node ) );
-
} else if ( name == "inst-vertical-speed-indicator" ) {
set_subsystem( id, new InstVerticalSpeedIndicator( node ) );
} else if ( name == "master-reference-gyro" ) {
set_subsystem( id, new MasterReferenceGyro( node ) );
- } else if ( name == "groundradar" ) {
- set_subsystem( id, new GroundRadar( node ) );
-
- } else if ( name == "air-ground-radar" ) {
- set_subsystem( id, new agRadar( node ) );
-
+ } 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 ) );
+ set_subsystem( id, new RadarAltimeter( node ) );
} else if ( name == "tcas" ) {
set_subsystem( id, new TCAS( node ), 0.2);
-
- } else if ( name == "navigation-display" ) {
- set_subsystem( id, new NavDisplay( node ) );
} 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;
}
projects / flightgear.git / blobdiff