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

Rover: Delete unnecessary decisions

This commit is contained in:
muramura 2024-05-04 07:45:07 +09:00 committed by Randy Mackay
parent 71a4885c87
commit f6246a3c22
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Rover/sailboat.cpp
View File

@ -275,9 +275,9 @@ void Sailboat::relax_sails()
// calculate throttle and mainsail angle required to attain desired speed (in m/s) // calculate throttle and mainsail angle required to attain desired speed (in m/s)
void Sailboat::get_throttle_and_set_mainsail(float desired_speed, float &throttle_out) void Sailboat::get_throttle_and_set_mainsail(float desired_speed, float &throttle_out)
{ {
throttle_out = 0.0f;
if (!sail_enabled()) { if (!sail_enabled()) {
relax_sails(); relax_sails();
throttle_out = 0.0f;
return; return;
} }
@ -292,8 +292,6 @@ void Sailboat::get_throttle_and_set_mainsail(float desired_speed, float &throttl
rover.g.speed_cruise, rover.g.speed_cruise,
rover.g.throttle_cruise * 0.01f, rover.g.throttle_cruise * 0.01f,
rover.G_Dt); rover.G_Dt);
} else {
throttle_out = 0.0f;
} }
if (motor_state == UseMotor::USE_MOTOR_ALWAYS) { if (motor_state == UseMotor::USE_MOTOR_ALWAYS) {