fly/flightgear
1
0
Fork 0
Code Activity

Read airspeed-indicator overspeed limit values from instrument configuration, as Syd intended.

Browse source
This commit is contained in:
jmt 2010-03-18 00:05:26 +00:00 committed by Tim Moore
parent b1855b34c6
commit 432da86c7b
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/Instrumentation/airspeed_indicator.cxx
View file

@ -21,7 +21,11 @@ AirspeedIndicator::AirspeedIndicator ( SGPropertyNode *node )
_num(node->getIntValue("number", 0)), _num(node->getIntValue("number", 0)),
_total_pressure(node->getStringValue("total-pressure", "/systems/pitot/total-pressure-inhg")), _total_pressure(node->getStringValue("total-pressure", "/systems/pitot/total-pressure-inhg")),
_static_pressure(node->getStringValue("static-pressure", "/systems/static/pressure-inhg")), _static_pressure(node->getStringValue("static-pressure", "/systems/static/pressure-inhg")),
_has_overspeed(node->getBoolValue("has-overspeed-indicator",false)) _has_overspeed(node->getBoolValue("has-overspeed-indicator",false)),
_pressure_alt_source(node->getStringValue("pressure-alt-source", "/instrumentation/altimeter/pressure-alt-ft")),
_ias_limit(node->getDoubleValue("ias-limit", 248.0)),
_mach_limit(node->getDoubleValue("mach-limit", 0.48)),
_alt_threshold(node->getDoubleValue("alt-threshold", 13200))
{ {
} }
@ -47,23 +51,21 @@ AirspeedIndicator::init ()
_ias_limit_node = node->getNode("ias-limit",0, true); _ias_limit_node = node->getNode("ias-limit",0, true);
_mach_limit_node = node->getNode("mach-limit",0, true); _mach_limit_node = node->getNode("mach-limit",0, true);
_alt_threshold_node = node->getNode("alt-threshold",0, true); _alt_threshold_node = node->getNode("alt-threshold",0, true);
_airspeed_limit = node->getChild("airspeed-limit-kt", 0, true);
if (!_ias_limit_node->hasValue()) { if (!_ias_limit_node->hasValue()) {
_ias_limit_node->setDoubleValue(248.0); _ias_limit_node->setDoubleValue(_ias_limit);
} }
if (!_mach_limit_node->hasValue()) { if (!_mach_limit_node->hasValue()) {
_mach_limit_node->setDoubleValue(0.48); _mach_limit_node->setDoubleValue(_mach_limit);
} }
if (!_alt_threshold_node->hasValue()) { if (!_alt_threshold_node->hasValue()) {
_alt_threshold_node->setDoubleValue(13200); _alt_threshold_node->setDoubleValue(_alt_threshold);
} }
string paSource = node->getStringValue("pressure-alt-source", _airspeed_limit = node->getChild("airspeed-limit-kt", 0, true);
"/instrumentation/altimeter/pressure-alt-ft"); _pressure_alt = fgGetNode(_pressure_alt_source.c_str(), true);
_pressure_alt = fgGetNode(paSource.c_str(), true);
_mach = fgGetNode("/velocities/mach", true); _mach = fgGetNode("/velocities/mach", true);
} }
} }

5
src/Instrumentation/airspeed_indicator.hxx
View file

@ -47,6 +47,11 @@ private:
string _total_pressure; string _total_pressure;
string _static_pressure; string _static_pressure;
bool _has_overspeed; bool _has_overspeed;
string _pressure_alt_source;
double _ias_limit;
double _mach_limit;
double _alt_threshold;
SGPropertyNode_ptr _ias_limit_node; SGPropertyNode_ptr _ias_limit_node;
SGPropertyNode_ptr _mach_limit_node; SGPropertyNode_ptr _mach_limit_node;
SGPropertyNode_ptr _alt_threshold_node; SGPropertyNode_ptr _alt_threshold_node;