Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-08 17:08:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Motors: formatting fixes

Browse Source
This commit is contained in:
Leonard Hall 2019-04-20 10:29:40 +09:30 committed by Randy Mackay
parent 4321a987f2
commit 77f8ec9f43
8 changed files with 283 additions and 288 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/AP_Motors/AP_MotorsCoax.cpp
View File

@ -26,7 +26,6 @@
extern const AP_HAL::HAL& hal; extern const AP_HAL::HAL& hal;
// init // init
void AP_MotorsCoax::init(motor_frame_class frame_class, motor_frame_type frame_type) void AP_MotorsCoax::init(motor_frame_class frame_class, motor_frame_type frame_type)
{ {

1
libraries/AP_Motors/AP_MotorsMatrix.cpp
View File

@ -111,7 +111,6 @@ void AP_MotorsMatrix::output_to_motors()
} }
} }
// get_motor_mask - returns a bitmask of which outputs are being used for motors (1 means being used) // get_motor_mask - returns a bitmask of which outputs are being used for motors (1 means being used)
// this can be used to ensure other pwm outputs (i.e. for servos) do not conflict // this can be used to ensure other pwm outputs (i.e. for servos) do not conflict
uint16_t AP_MotorsMatrix::get_motor_mask() uint16_t AP_MotorsMatrix::get_motor_mask()

4
libraries/AP_Motors/AP_MotorsMulticopter.cpp
View File

@ -257,7 +257,6 @@ void AP_MotorsMulticopter::output_boost_throttle(void)
} }
} }
// sends minimum values out to the motors // sends minimum values out to the motors
void AP_MotorsMulticopter::output_min() void AP_MotorsMulticopter::output_min()
{ {
@ -711,8 +710,7 @@ void AP_MotorsMulticopter::output_motor_mask(float thrust, uint8_t mask, float r
*/ */
float diff_thrust = get_roll_factor(i) * rudder_dt * 0.5f; float diff_thrust = get_roll_factor(i) * rudder_dt * 0.5f;
set_actuator_with_slew(_actuator[i], thrust_to_actuator(thrust + diff_thrust)); set_actuator_with_slew(_actuator[i], thrust_to_actuator(thrust + diff_thrust));
int16_t pwm_output = get_pwm_output_min() + int16_t pwm_output = get_pwm_output_min() + (get_pwm_output_max() - get_pwm_output_min()) * _actuator[i];
(get_pwm_output_max()-get_pwm_output_min()) * _actuator[i];
rc_write(i, pwm_output); rc_write(i, pwm_output);
} else { } else {
rc_write(i, get_pwm_output_min()); rc_write(i, get_pwm_output_min());

1
libraries/AP_Motors/AP_MotorsSingle.cpp
View File

@ -26,7 +26,6 @@
extern const AP_HAL::HAL& hal; extern const AP_HAL::HAL& hal;
// init // init
void AP_MotorsSingle::init(motor_frame_class frame_class, motor_frame_type frame_type) void AP_MotorsSingle::init(motor_frame_class frame_class, motor_frame_type frame_type)
{ {