fly/flightgear
1
0
Fork 0
Code Activity

[JSBSim] Added a new property to ignore/override FG brake properties.

Browse source 
Mickael Danilov reported that one cannot send brake commands to /fdm/jsbsim/fcs/{right,left}-brake-cmd-norm since FG overwrites them with /autopilot/autobrake/* properties.

A new property /fdm/jsbsim/systems/override-fg-brake-properties has been added which is set ot false by default to keep the legacy behavior. When set to true, the properties /fdm/jsbsim/fcs/{right,left}-brake-cmd-norm can be modified by the user and will ignore the setting from FlightGear.
This commit is contained in:
Bertrand Coconnier 2018-07-07 17:04:01 +02:00
parent 07fac8c08e
commit 7178b3ef6a
2 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/FDM/JSBSim/JSBSim.cxx
View file

@ -332,9 +332,12 @@ FGJSBsim::FGJSBsim( double dt )
speedbrake_pos_pct->setDoubleValue(0); speedbrake_pos_pct->setDoubleValue(0);
spoilers_pos_pct->setDoubleValue(0); spoilers_pos_pct->setDoubleValue(0);
override_fg_brake_prop = fgGetNode("/fdm/jsbsim/systems/override-fg-brake-properties", true);
override_fg_brake_prop->setBoolValue(false);
ab_brake_engaged = fgGetNode("/autopilot/autobrake/engaged", true); ab_brake_engaged = fgGetNode("/autopilot/autobrake/engaged", true);
ab_brake_left_pct = fgGetNode("/autopilot/autobrake/brake-left-output", true); ab_brake_left_pct = fgGetNode("/autopilot/autobrake/brake-left-output", true);
ab_brake_right_pct = fgGetNode("/autopilot/autobrake/brake-right-output", true); ab_brake_right_pct = fgGetNode("/autopilot/autobrake/brake-right-output", true);
arrestor_wire_engaged_hook = fgGetNode("/fdm/jsbsim/systems/hook/arrestor-wire-engaged-hook", true); arrestor_wire_engaged_hook = fgGetNode("/fdm/jsbsim/systems/hook/arrestor-wire-engaged-hook", true);
release_hook = fgGetNode("/fdm/jsbsim/systems/hook/tailhook-release-cmd", true); release_hook = fgGetNode("/fdm/jsbsim/systems/hook/tailhook-release-cmd", true);
@ -619,23 +622,24 @@ bool FGJSBsim::copy_to_JSBsim()
FCS->SetDsbCmd( globals->get_controls()->get_speedbrake() ); FCS->SetDsbCmd( globals->get_controls()->get_speedbrake() );
FCS->SetDspCmd( globals->get_controls()->get_spoilers() ); FCS->SetDspCmd( globals->get_controls()->get_spoilers() );
if (!override_fg_brake_prop->getBoolValue()) {
// Parking brake sets minimum braking // Parking brake sets minimum braking
// level for mains. // level for mains.
double parking_brake = globals->get_controls()->get_brake_parking(); double parking_brake = globals->get_controls()->get_brake_parking();
double left_brake = globals->get_controls()->get_brake_left(); double left_brake = globals->get_controls()->get_brake_left();
double right_brake = globals->get_controls()->get_brake_right(); double right_brake = globals->get_controls()->get_brake_right();
if (ab_brake_engaged->getBoolValue()) { if (ab_brake_engaged->getBoolValue()) {
left_brake = ab_brake_left_pct->getDoubleValue(); left_brake = ab_brake_left_pct->getDoubleValue();
right_brake = ab_brake_right_pct->getDoubleValue(); right_brake = ab_brake_right_pct->getDoubleValue();
}
FCS->SetLBrake(FMAX(left_brake, parking_brake));
FCS->SetRBrake(FMAX(right_brake, parking_brake));
FCS->SetCBrake( 0.0 );
// FCS->SetCBrake( globals->get_controls()->get_brake(2) );
} }
FCS->SetLBrake(FMAX(left_brake, parking_brake));
FCS->SetRBrake(FMAX(right_brake, parking_brake));
FCS->SetCBrake( 0.0 );
// FCS->SetCBrake( globals->get_controls()->get_brake(2) );
FCS->SetGearCmd( globals->get_controls()->get_gear_down()); FCS->SetGearCmd( globals->get_controls()->get_gear_down());
for (i = 0; i < Propulsion->GetNumEngines(); i++) { for (i = 0; i < Propulsion->GetNumEngines(); i++) {

1
src/FDM/JSBSim/JSBSim.hxx
View file

@ -270,6 +270,7 @@ private:
SGPropertyNode_ptr speedbrake_pos_pct; SGPropertyNode_ptr speedbrake_pos_pct;
SGPropertyNode_ptr spoilers_pos_pct; SGPropertyNode_ptr spoilers_pos_pct;
SGPropertyNode_ptr override_fg_brake_prop;
SGPropertyNode_ptr ab_brake_engaged; SGPropertyNode_ptr ab_brake_engaged;
SGPropertyNode_ptr ab_brake_left_pct; SGPropertyNode_ptr ab_brake_left_pct;
SGPropertyNode_ptr ab_brake_right_pct; SGPropertyNode_ptr ab_brake_right_pct;