fly/flightgear
1
0
Fork 0
Code Activity

Merge branch 'syd/ias-limit' into next

Browse source
This commit is contained in:
Tim Moore 2010-03-16 15:12:46 +01:00
commit a357aad365
2 changed files with 28 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/Instrumentation/airspeed_indicator.cxx
View file

@ -21,7 +21,7 @@ AirspeedIndicator::AirspeedIndicator ( SGPropertyNode *node )
_num(node->getIntValue("number", 0)),
_total_pressure(node->getStringValue("total-pressure", "/systems/pitot/total-pressure-inhg")),
_static_pressure(node->getStringValue("static-pressure", "/systems/static/pressure-inhg")),
_has_barber_pole(node->getBoolValue("has-barber-pole",false))
_has_overspeed(node->getBoolValue("has-overspeed-indicator",false))
{
}
@ -41,17 +41,31 @@ AirspeedIndicator::init ()
_static_pressure_node = fgGetNode(_static_pressure.c_str(), true);
_density_node = fgGetNode("/environment/density-slugft3", true);
_speed_node = node->getChild("indicated-speed-kt", 0, true);
// barber-pole properties
_ias_limit_node = node->getNode("ias-limit",0, true);
_mach_limit_node = node->getNode("mach-limit",0, true);
_alt_threshold_node = node->getNode("alt-threshold",0, true);
_airspeed_limit = node->getChild("airspeed-limit-kt", 0, true);
string paSource = node->getStringValue("pressure-alt-source",
"/instrumentation/altimeter/pressure-alt-ft");
_pressure_alt = fgGetNode(paSource.c_str(), true);
_mach = fgGetNode("/velocities/mach", true);
// overspeed-indicator properties
if (_has_overspeed) {
_ias_limit_node = node->getNode("ias-limit",0, true);
_mach_limit_node = node->getNode("mach-limit",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()) {
_ias_limit_node->setDoubleValue(248.0);
}
if (!_mach_limit_node->hasValue()) {
_mach_limit_node->setDoubleValue(0.48);
}
if (!_alt_threshold_node->hasValue()) {
_alt_threshold_node->setDoubleValue(13200);
}
string paSource = node->getStringValue("pressure-alt-source",
"/instrumentation/altimeter/pressure-alt-ft");
_pressure_alt = fgGetNode(paSource.c_str(), true);
_mach = fgGetNode("/velocities/mach", true);
}
}
#ifndef FPSTOKTS
@ -87,7 +101,7 @@ AirspeedIndicator::update (double dt)
dt * RESPONSIVENESS);
_speed_node->setDoubleValue(filtered_speed);
if (!_has_barber_pole) {
if (!_has_overspeed) {
return;
}

2
src/Instrumentation/airspeed_indicator.hxx
View file

@ -46,7 +46,7 @@ private:
unsigned int _num;
string _total_pressure;
string _static_pressure;
bool _has_barber_pole;
bool _has_overspeed;
SGPropertyNode_ptr _ias_limit_node;
SGPropertyNode_ptr _mach_limit_node;
SGPropertyNode_ptr _alt_threshold_node;