Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SITL: started to use C++11 variable initialisation

This commit is contained in:
Andrew Tridgell 2015-06-01 08:04:51 +10:00
parent b541bfb739
commit 14bdfe2889
2 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/SITL/SIM_Helicopter.cpp
View File

@ -26,17 +26,7 @@
constructor
*/
Helicopter::Helicopter(const char *home_str, const char *frame_str) :
Aircraft(home_str, frame_str),
terminal_rotation_rate(4*radians(360.0)),
hover_throttle(0.65f),
terminal_velocity(40.0f),
hover_lean(8.0f),
yaw_zero(0.1f),
rotor_rot_accel(radians(20)),
roll_rate_max(radians(1400)),
pitch_rate_max(radians(1400)),
yaw_rate_max(radians(1400)),
rsc_setpoint(0.8f)
Aircraft(home_str, frame_str)
{
mass = 2.13f;

20
libraries/SITL/SIM_Helicopter.h
View File

@ -39,16 +39,16 @@ public:
}
private:
float terminal_rotation_rate;
float hover_throttle;
float terminal_velocity;
float hover_lean;
float yaw_zero;
float rotor_rot_accel;
float roll_rate_max;
float pitch_rate_max;
float yaw_rate_max;
float rsc_setpoint;
float terminal_rotation_rate = 4*radians(360.0f);
float hover_throttle = 0.65f;
float terminal_velocity = 40;
float hover_lean = 8.0f;
float yaw_zero = 0.1f;
float rotor_rot_accel = radians(20);
float roll_rate_max = radians(1400);
float pitch_rate_max = radians(1400);
float yaw_rate_max = radians(1400);
float rsc_setpoint = 0.8f;
float thrust_scale;
float tail_thrust_scale;
};