From 2da7ea746b3cdbd593542a4c0863beb55097ed5b Mon Sep 17 00:00:00 2001 From: Randy Mackay Date: Mon, 12 Dec 2016 19:23:35 +0900 Subject: [PATCH] MotorsHeli: minor formatting updates --- libraries/AP_Motors/AP_MotorsHeli.h | 13 ++++++------- libraries/AP_Motors/AP_MotorsHeli_Single.h | 1 - 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/libraries/AP_Motors/AP_MotorsHeli.h b/libraries/AP_Motors/AP_MotorsHeli.h index 8c3d8a99d1..552aecc6a1 100644 --- a/libraries/AP_Motors/AP_MotorsHeli.h +++ b/libraries/AP_Motors/AP_MotorsHeli.h @@ -65,7 +65,6 @@ public: void Init(); // set update rate to motors - a value in hertz - // you must have setup_motors before calling this virtual void set_update_rate( uint16_t speed_hz ) = 0; // enable - starts allowing signals to be sent to motors @@ -77,7 +76,7 @@ public: // output_test - spin a motor at the pwm value specified // motor_seq is the motor's sequence number from 1 to the number of motors on the frame // pwm value is an actual pwm value that will be output, normally in the range of 1000 ~ 2000 - virtual void output_test(uint8_t motor_seq, int16_t pwm) = 0; + virtual void output_test(uint8_t motor_seq, int16_t pwm) = 0; // // heli specific methods @@ -118,7 +117,7 @@ public: virtual uint16_t get_motor_mask() = 0; // output - sends commands to the motors - void output(); + void output(); // supports_yaw_passthrough virtual bool supports_yaw_passthrough() const { return false; } @@ -141,9 +140,9 @@ protected: }; // output - sends commands to the motors - void output_armed_stabilizing(); - void output_armed_zero_throttle(); - void output_disarmed(); + void output_armed_stabilizing(); + void output_armed_zero_throttle(); + void output_disarmed(); // update_motor_controls - sends commands to motor controllers virtual void update_motor_control(RotorControlState state) = 0; @@ -152,7 +151,7 @@ protected: void reset_flight_controls(); // update the throttle input filter - void update_throttle_filter(); + void update_throttle_filter(); // move_actuators - moves swash plate and tail rotor virtual void move_actuators(float roll_out, float pitch_out, float coll_in, float yaw_out) = 0; diff --git a/libraries/AP_Motors/AP_MotorsHeli_Single.h b/libraries/AP_Motors/AP_MotorsHeli_Single.h index f8a8b99d55..49c054329c 100644 --- a/libraries/AP_Motors/AP_MotorsHeli_Single.h +++ b/libraries/AP_Motors/AP_MotorsHeli_Single.h @@ -55,7 +55,6 @@ public: }; // set update rate to motors - a value in hertz - // you must have setup_motors before calling this void set_update_rate(uint16_t speed_hz); // enable - starts allowing signals to be sent to motors and servos