fly/flightgear
1
0
Fork 0
Code Activity

Changed -pct properties to -norm

Browse source
This commit is contained in:
tony 2002-03-01 12:38:37 +00:00
parent ab381e5c01
commit 34072bbc42
2 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -151,28 +151,30 @@ FGJSBsim::FGJSBsim( double dt )
stall_warning = fgGetNode("/sim/aero/alarms/stall-warning",true); stall_warning = fgGetNode("/sim/aero/alarms/stall-warning",true);
stall_warning->setDoubleValue(0); stall_warning->setDoubleValue(0);
elevator_pos_deg=fgGetNode("/surface-positions/elevator-pos-deg",true); /* elevator_pos_deg=fgGetNode("/surface-positions/elevator-pos-deg",true);
left_aileron_pos_deg left_aileron_pos_deg
=fgGetNode("/surface-positions/left-aileron-pos-deg",true); =fgGetNode("/surface-positions/left-aileron-pos-deg",true);
right_aileron_pos_deg right_aileron_pos_deg
=fgGetNode("/surface-positions/right-aileron-pos-deg",true); =fgGetNode("/surface-positions/right-aileron-pos-deg",true);
rudder_pos_deg=fgGetNode("/surface-positions/rudder-pos-deg",true); rudder_pos_deg=fgGetNode("/surface-positions/rudder-pos-deg",true);
flap_pos_deg=fgGetNode("/surface-positions/flap-pos-deg",true); flap_pos_deg=fgGetNode("/surface-positions/flap-pos-deg",true); */
flap_pos_pct=fgGetNode("/surface-positions/flap-pos-pct",true); flap_pos_pct=fgGetNode("/surface-positions/flap-pos-norm",true);
elevator_pos_pct=fgGetNode("/surface-positions/elevator-pos-pct",true); elevator_pos_pct=fgGetNode("/surface-positions/elevator-pos-norm",true);
left_aileron_pos_pct left_aileron_pos_pct
=fgGetNode("/surface-positions/left-aileron-pos-pct",true); =fgGetNode("/surface-positions/left-aileron-pos-norm",true);
right_aileron_pos_pct right_aileron_pos_pct
=fgGetNode("/surface-positions/right-aileron-pos-pct",true); =fgGetNode("/surface-positions/right-aileron-pos-norm",true);
rudder_pos_pct=fgGetNode("/surface-positions/rudder-pos-pct",true); rudder_pos_pct=fgGetNode("/surface-positions/rudder-pos-norm",true);
elevator_pos_deg->setDoubleValue(0); /* elevator_pos_deg->setDoubleValue(0);
left_aileron_pos_deg->setDoubleValue(0); left_aileron_pos_deg->setDoubleValue(0);
right_aileron_pos_deg->setDoubleValue(0); right_aileron_pos_deg->setDoubleValue(0);
rudder_pos_deg->setDoubleValue(0); rudder_pos_deg->setDoubleValue(0);
flap_pos_deg->setDoubleValue(0); flap_pos_deg->setDoubleValue(0); */
elevator_pos_pct->setDoubleValue(0); elevator_pos_pct->setDoubleValue(0);
left_aileron_pos_pct->setDoubleValue(0); left_aileron_pos_pct->setDoubleValue(0);
@ -518,11 +520,12 @@ bool FGJSBsim::copy_from_JSBsim() {
stall_warning->setDoubleValue( Aircraft->GetStallWarn() ); stall_warning->setDoubleValue( Aircraft->GetStallWarn() );
elevator_pos_deg->setDoubleValue( FCS->GetDePos()*SG_RADIANS_TO_DEGREES ); /* elevator_pos_deg->setDoubleValue( FCS->GetDePos()*SG_RADIANS_TO_DEGREES );
left_aileron_pos_deg->setDoubleValue( FCS->GetDaLPos()*SG_RADIANS_TO_DEGREES ); left_aileron_pos_deg->setDoubleValue( FCS->GetDaLPos()*SG_RADIANS_TO_DEGREES );
right_aileron_pos_deg->setDoubleValue( FCS->GetDaRPos()*SG_RADIANS_TO_DEGREES ); right_aileron_pos_deg->setDoubleValue( FCS->GetDaRPos()*SG_RADIANS_TO_DEGREES );
rudder_pos_deg->setDoubleValue( -1*FCS->GetDrPos()*SG_RADIANS_TO_DEGREES ); rudder_pos_deg->setDoubleValue( -1*FCS->GetDrPos()*SG_RADIANS_TO_DEGREES );
flap_pos_deg->setDoubleValue( FCS->GetDfPos() ); flap_pos_deg->setDoubleValue( FCS->GetDfPos() ); */
elevator_pos_pct->setDoubleValue( FCS->GetDePosN() ); elevator_pos_pct->setDoubleValue( FCS->GetDePosN() );
left_aileron_pos_pct->setDoubleValue( FCS->GetDaLPosN() ); left_aileron_pos_pct->setDoubleValue( FCS->GetDaLPosN() );

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

@ -241,11 +241,12 @@ private:
SGPropertyNode *rudder_trim; SGPropertyNode *rudder_trim;
SGPropertyNode *stall_warning; SGPropertyNode *stall_warning;
SGPropertyNode *elevator_pos_deg; /* SGPropertyNode *elevator_pos_deg;
SGPropertyNode *left_aileron_pos_deg; SGPropertyNode *left_aileron_pos_deg;
SGPropertyNode *right_aileron_pos_deg; SGPropertyNode *right_aileron_pos_deg;
SGPropertyNode *rudder_pos_deg; SGPropertyNode *rudder_pos_deg;
SGPropertyNode *flap_pos_deg; SGPropertyNode *flap_pos_deg; */
SGPropertyNode *elevator_pos_pct; SGPropertyNode *elevator_pos_pct;
SGPropertyNode *left_aileron_pos_pct; SGPropertyNode *left_aileron_pos_pct;