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

AP_Motors: remove duplicate get_throttle function

This commit is contained in:
Jonathan Challinger 2015-03-31 18:30:06 -07:00 committed by Randy Mackay
parent 0e53c0a892
commit 89cdd02f58
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/AP_Motors/AP_Motors_Class.h
View File

@ -124,12 +124,9 @@ public:
void set_throttle(int16_t throttle_in) { _rc_throttle.servo_out = throttle_in; }; // range 0 ~ 1000 void set_throttle(int16_t throttle_in) { _rc_throttle.servo_out = throttle_in; }; // range 0 ~ 1000
// accessors for roll, pitch, yaw and throttle inputs to motors // accessors for roll, pitch, yaw and throttle inputs to motors
int16_t get_roll() { return _rc_roll.servo_out; } int16_t get_roll() const { return _rc_roll.servo_out; }
int16_t get_pitch() { return _rc_pitch.servo_out; } int16_t get_pitch() const { return _rc_pitch.servo_out; }
int16_t get_yaw() { return _rc_yaw.servo_out; } int16_t get_yaw() const { return _rc_yaw.servo_out; }
int16_t get_throttle() { return _rc_throttle.servo_out; }
// get_throttle_out - returns throttle sent to motors in the range 0 ~ 1000
int16_t get_throttle_out() const { return _rc_throttle.servo_out; } int16_t get_throttle_out() const { return _rc_throttle.servo_out; }
// output - sends commands to the motors // output - sends commands to the motors