zrzk
/
ardupilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

AP_Motors: tailsitter: slew outputs and output throttle directly

zr-v5.1
Peter Hall 4 years ago committed by Andrew Tridgell
parent
b6fde7ed5a
commit
ed7db5b2b6
1 changed files with 14 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 21
      libraries/AP_Motors/AP_MotorsTailsitter.cpp

21
libraries/AP_Motors/AP_MotorsTailsitter.cpp
Unescape View File

@ -86,23 +86,30 @@ void AP_MotorsTailsitter::output_to_motors() @@ -86,23 +86,30 @@ void AP_MotorsTailsitter::output_to_motors()
switch (_spool_state) {
case SpoolState::SHUT_DOWN:
SRV_Channels::set_output_pwm(SRV_Channel::k_throttleLeft, get_pwm_output_min());
SRV_Channels::set_output_pwm(SRV_Channel::k_throttleRight, get_pwm_output_min());
_actuator[0] = 0.0f;
_actuator[1] = 0.0f;
_actuator[2] = 0.0f;
break;
case SpoolState::GROUND_IDLE:
set_actuator_with_slew(_actuator[0], actuator_spin_up_to_ground_idle());
set_actuator_with_slew(_actuator[1], actuator_spin_up_to_ground_idle());
SRV_Channels::set_output_pwm(SRV_Channel::k_throttleLeft, output_to_pwm(actuator_spin_up_to_ground_idle()));
SRV_Channels::set_output_pwm(SRV_Channel::k_throttleRight, output_to_pwm(actuator_spin_up_to_ground_idle()));
set_actuator_with_slew(_actuator[2], actuator_spin_up_to_ground_idle());
break;
case SpoolState::SPOOLING_UP:
case SpoolState::THROTTLE_UNLIMITED:
case SpoolState::SPOOLING_DOWN:
SRV_Channels::set_output_pwm(SRV_Channel::k_throttleLeft, output_to_pwm(thrust_to_actuator(_thrust_left)));
SRV_Channels::set_output_pwm(SRV_Channel::k_throttleRight, output_to_pwm(thrust_to_actuator(_thrust_right)));
set_actuator_with_slew(_actuator[0], thrust_to_actuator(_thrust_left));
set_actuator_with_slew(_actuator[1], thrust_to_actuator(_thrust_right));
set_actuator_with_slew(_actuator[2], thrust_to_actuator(_throttle));
break;
}
// Always output to tilt servos
SRV_Channels::set_output_pwm(SRV_Channel::k_throttleLeft, output_to_pwm(_actuator[0]));
SRV_Channels::set_output_pwm(SRV_Channel::k_throttleRight, output_to_pwm(_actuator[1]));
// use set scaled to allow a different PWM range on plane forward throttle, throttle range is 0 to 100
SRV_Channels::set_output_scaled(SRV_Channel::k_throttle, _actuator[2]*100);
SRV_Channels::set_output_scaled(SRV_Channel::k_tiltMotorLeft, _tilt_left*SERVO_OUTPUT_RANGE);
SRV_Channels::set_output_scaled(SRV_Channel::k_tiltMotorRight, _tilt_right*SERVO_OUTPUT_RANGE);

Write Preview
Loading…
Cancel
Save