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

Single: remove use of motor_out array

Browse Source 
Also allow fins to move when throttle at zero
This commit is contained in:
Randy Mackay 2014-02-09 17:49:52 +09:00 committed by Andrew Tridgell
parent a036009524
commit 2f3fc3a3ce
1 changed files with 26 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
libraries/AP_Motors/AP_MotorsSingle.cpp
View File

@ -143,13 +143,6 @@ void AP_MotorsSingle::enable()
// output_min - sends minimum values out to the motor and trim values to the servos // output_min - sends minimum values out to the motor and trim values to the servos
void AP_MotorsSingle::output_min() void AP_MotorsSingle::output_min()
{ {
// fill the motor_out[] array for HIL use
motor_out[AP_MOTORS_MOT_1] = _servo1->radio_trim;
motor_out[AP_MOTORS_MOT_2] = _servo2->radio_trim;
motor_out[AP_MOTORS_MOT_3] = _servo3->radio_trim;
motor_out[AP_MOTORS_MOT_4] = _servo4->radio_trim;
motor_out[AP_MOTORS_MOT_7] = _rc_throttle->radio_min;
// send minimum value to each motor // send minimum value to each motor
hal.rcout->write(_motor_to_channel_map[AP_MOTORS_MOT_1], _servo1->radio_trim); hal.rcout->write(_motor_to_channel_map[AP_MOTORS_MOT_1], _servo1->radio_trim);
hal.rcout->write(_motor_to_channel_map[AP_MOTORS_MOT_2], _servo2->radio_trim); hal.rcout->write(_motor_to_channel_map[AP_MOTORS_MOT_2], _servo2->radio_trim);
@ -162,6 +155,7 @@ void AP_MotorsSingle::output_min()
void AP_MotorsSingle::output_armed() void AP_MotorsSingle::output_armed()
{ {
int16_t out_min = _rc_throttle->radio_min + _min_throttle; int16_t out_min = _rc_throttle->radio_min + _min_throttle;
int16_t motor_out; // main motor output
// Throttle is 0 to 1000 only // Throttle is 0 to 1000 only
_rc_throttle->servo_out = constrain_int16(_rc_throttle->servo_out, 0, _max_throttle); _rc_throttle->servo_out = constrain_int16(_rc_throttle->servo_out, 0, _max_throttle);
@ -179,18 +173,27 @@ void AP_MotorsSingle::output_armed()
_spin_when_armed = _min_throttle; _spin_when_armed = _min_throttle;
} }
motor_out[AP_MOTORS_MOT_7] = _rc_throttle->radio_min + _spin_when_armed; motor_out = _rc_throttle->radio_min + _spin_when_armed;
}else{ }else{
//motor //motor
motor_out[AP_MOTORS_MOT_7] = _rc_throttle->radio_out; motor_out = _rc_throttle->radio_out;
//front
// adjust for throttle curve
if( _throttle_curve_enabled ) {
motor_out = _throttle_curve.get_y(motor_out);
}
// ensure motor doesn't drop below a minimum value and stop
motor_out = max(motor_out, out_min);
}
// front servo
_servo1->servo_out = _rev_roll*_rc_roll->servo_out + _rev_yaw*_rc_yaw->servo_out; _servo1->servo_out = _rev_roll*_rc_roll->servo_out + _rev_yaw*_rc_yaw->servo_out;
//right // right servo
_servo2->servo_out = _rev_pitch*_rc_pitch->servo_out + _rev_yaw*_rc_yaw->servo_out; _servo2->servo_out = _rev_pitch*_rc_pitch->servo_out + _rev_yaw*_rc_yaw->servo_out;
//rear // rear servo
_servo3->servo_out = -_rev_roll*_rc_roll->servo_out + _rev_yaw*_rc_yaw->servo_out; _servo3->servo_out = -_rev_roll*_rc_roll->servo_out + _rev_yaw*_rc_yaw->servo_out;
//left // left servo
_servo4->servo_out = -_rev_pitch*_rc_pitch->servo_out + _rev_yaw*_rc_yaw->servo_out; _servo4->servo_out = -_rev_pitch*_rc_pitch->servo_out + _rev_yaw*_rc_yaw->servo_out;
_servo1->calc_pwm(); _servo1->calc_pwm();
@ -198,27 +201,12 @@ void AP_MotorsSingle::output_armed()
_servo3->calc_pwm(); _servo3->calc_pwm();
_servo4->calc_pwm(); _servo4->calc_pwm();
motor_out[AP_MOTORS_MOT_1] = _servo1->radio_out;
motor_out[AP_MOTORS_MOT_2] = _servo2->radio_out;
motor_out[AP_MOTORS_MOT_3] = _servo3->radio_out;
motor_out[AP_MOTORS_MOT_4] = _servo4->radio_out;
// adjust for throttle curve
if( _throttle_curve_enabled ) {
motor_out[AP_MOTORS_MOT_7] = _throttle_curve.get_y(motor_out[AP_MOTORS_MOT_7]);
}
// ensure motors don't drop below a minimum value and stop
motor_out[AP_MOTORS_MOT_7] = max(motor_out[AP_MOTORS_MOT_7], out_min);
}
// send output to each motor // send output to each motor
hal.rcout->write(_motor_to_channel_map[AP_MOTORS_MOT_1], motor_out[AP_MOTORS_MOT_1]); hal.rcout->write(_motor_to_channel_map[AP_MOTORS_MOT_1], _servo1->radio_out);
hal.rcout->write(_motor_to_channel_map[AP_MOTORS_MOT_2], motor_out[AP_MOTORS_MOT_2]); hal.rcout->write(_motor_to_channel_map[AP_MOTORS_MOT_2], _servo2->radio_out);
hal.rcout->write(_motor_to_channel_map[AP_MOTORS_MOT_3], motor_out[AP_MOTORS_MOT_3]); hal.rcout->write(_motor_to_channel_map[AP_MOTORS_MOT_3], _servo3->radio_out);
hal.rcout->write(_motor_to_channel_map[AP_MOTORS_MOT_4], motor_out[AP_MOTORS_MOT_4]); hal.rcout->write(_motor_to_channel_map[AP_MOTORS_MOT_4], _servo4->radio_out);
hal.rcout->write(_motor_to_channel_map[AP_MOTORS_MOT_7], motor_out[AP_MOTORS_MOT_7]); hal.rcout->write(_motor_to_channel_map[AP_MOTORS_MOT_7], motor_out);
} }
// output_disarmed - sends commands to the motors // output_disarmed - sends commands to the motors