fly/flightgear
1
0
Fork 0
Code Activity

Fixed a bug where the rate_limit was ignored if it was set by a property.

Browse source
This commit is contained in:
bcoconni 2014-08-09 20:02:44 +02:00
parent 2520124e97
commit beedd9e683
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/FDM/JSBSim/models/flight_control/FGActuator.cpp
View file

@ -46,7 +46,7 @@ using namespace std;
namespace JSBSim { namespace JSBSim {
IDENT(IdSrc,"$Id: FGActuator.cpp,v 1.35 2014/07/18 22:12:40 bcoconni Exp $"); IDENT(IdSrc,"$Id: FGActuator.cpp,v 1.36 2014/08/09 17:40:51 bcoconni Exp $");
IDENT(IdHdr,ID_ACTUATOR); IDENT(IdHdr,ID_ACTUATOR);
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@ -109,9 +109,15 @@ FGActuator::FGActuator(FGFCS* fcs, Element* element) : FGFCSComponent(fcs, eleme
else rate_limit_decr = rate_limit; else rate_limit_decr = rate_limit;
} }
} else { } else {
if (rate_limit_prop != 0) {
rate_limit_incr_prop = rate_limit_prop;
rate_limit_decr_prop = rate_limit_prop;
}
else {
rate_limit_incr = rate_limit; rate_limit_incr = rate_limit;
rate_limit_decr = rate_limit; rate_limit_decr = rate_limit;
} }
}
ratelim_el = element->FindNextElement("rate_limit"); ratelim_el = element->FindNextElement("rate_limit");
} }