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

Rover: move from AUX_FUNC::SAVE_TRIM to AUX_FUNC::TRIM_TO_CURRENT_SERVO_RC

Browse Source
This commit is contained in:
Iampete1 2021-09-21 22:18:25 +01:00 committed by Andrew Tridgell
parent 3d566ca59b
commit 6ebef3fe6b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Rover/RC_Channel.cpp
View File

@ -45,7 +45,7 @@ void RC_Channel_Rover::init_aux_function(const aux_func_t ch_option, const AuxSw
case AUX_FUNC::WALKING_HEIGHT: case AUX_FUNC::WALKING_HEIGHT:
case AUX_FUNC::RTL: case AUX_FUNC::RTL:
case AUX_FUNC::SAILBOAT_TACK: case AUX_FUNC::SAILBOAT_TACK:
case AUX_FUNC::SAVE_TRIM: case AUX_FUNC::TRIM_TO_CURRENT_SERVO_RC:
case AUX_FUNC::SAVE_WP: case AUX_FUNC::SAVE_WP:
case AUX_FUNC::SIMPLE: case AUX_FUNC::SIMPLE:
case AUX_FUNC::SMART_RTL: case AUX_FUNC::SMART_RTL:
@ -230,7 +230,7 @@ bool RC_Channel_Rover::do_aux_function(const aux_func_t ch_option, const AuxSwit
break; break;
// save steering trim // save steering trim
case AUX_FUNC::SAVE_TRIM: case AUX_FUNC::TRIM_TO_CURRENT_SERVO_RC:
if (!rover.g2.motors.have_skid_steering() && rover.arming.is_armed() && if (!rover.g2.motors.have_skid_steering() && rover.arming.is_armed() &&
(rover.control_mode != &rover.mode_loiter) (rover.control_mode != &rover.mode_loiter)
&& (rover.control_mode != &rover.mode_hold) && ch_flag == AuxSwitchPos::HIGH) { && (rover.control_mode != &rover.mode_hold) && ch_flag == AuxSwitchPos::HIGH) {

1
Rover/system.cpp
View File

@ -131,6 +131,7 @@ void Rover::init_ardupilot()
// initialise rc channels // initialise rc channels
rc().convert_options(RC_Channel::AUX_FUNC::ARMDISARM_UNUSED, RC_Channel::AUX_FUNC::ARMDISARM); rc().convert_options(RC_Channel::AUX_FUNC::ARMDISARM_UNUSED, RC_Channel::AUX_FUNC::ARMDISARM);
rc().convert_options(RC_Channel::AUX_FUNC::SAVE_TRIM, RC_Channel::AUX_FUNC::TRIM_TO_CURRENT_SERVO_RC);
rc().init(); rc().init();
rover.g2.sailboat.init(); rover.g2.sailboat.init();