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

Rover: use enum class for ArmingMethod and ArmingRequired

This commit is contained in:
Peter Barker 2019-03-07 15:02:01 +11:00 committed by Peter Barker
parent ca7566fff9
commit 5bd0db4117
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
APMrover2/APMrover2.cpp
View File

@ -282,7 +282,7 @@ void Rover::one_second_loop(void)
// update notify flags
AP_Notify::flags.pre_arm_check = arming.pre_arm_checks(false);
AP_Notify::flags.pre_arm_gps_check = true;
AP_Notify::flags.armed = arming.is_armed() || arming.arming_required() == AP_Arming::NO;
AP_Notify::flags.armed = arming.is_armed() || arming.arming_required() == AP_Arming::Required::NO;
// cope with changes to mavlink system ID
mavlink_system.sysid = g.sysid_this_mav;

2
APMrover2/GCS_Mavlink.cpp
View File

@ -607,7 +607,7 @@ MAV_RESULT GCS_MAVLINK_Rover::handle_command_long_packet(const mavlink_command_l
case MAV_CMD_COMPONENT_ARM_DISARM:
if (is_equal(packet.param1, 1.0f)) {
// run pre_arm_checks and arm_checks and display failures
if (rover.arm_motors(AP_Arming::MAVLINK)) {
if (rover.arm_motors(AP_Arming::Method::MAVLINK)) {
return MAV_RESULT_ACCEPTED;
} else {
return MAV_RESULT_FAILED;

2
APMrover2/RC_Channel.cpp
View File

@ -137,7 +137,7 @@ void RC_Channel_Rover::do_aux_function(const aux_func_t ch_option, const aux_swi
// arm or disarm the motors
case ARMDISARM:
if (ch_flag == HIGH) {
rover.arm_motors(AP_Arming::RUDDER);
rover.arm_motors(AP_Arming::Method::RUDDER);
} else if (ch_flag == LOW) {
rover.disarm_motors();
}

2
APMrover2/Rover.h
View File

@ -512,7 +512,7 @@ private:
uint8_t check_digital_pin(uint8_t pin);
bool should_log(uint32_t mask);
void change_arm_state(void);
bool arm_motors(AP_Arming::ArmingMethod method);
bool arm_motors(AP_Arming::Method method);
bool disarm_motors(void);
bool is_boat() const;

2
APMrover2/motor_test.cpp
View File

@ -126,7 +126,7 @@ MAV_RESULT Rover::mavlink_motor_test_start(mavlink_channel_t chan, uint8_t motor
// arm motors
if (!arming.is_armed()) {
arm_motors(AP_Arming::ArmingMethod::MOTORTEST);
arm_motors(AP_Arming::Method::MOTORTEST);
}
// disable failsafes

8
APMrover2/radio.cpp
View File

@ -42,8 +42,8 @@ void Rover::init_rc_in()
void Rover::rudder_arm_disarm_check()
{
// check if arming/disarm using rudder is allowed
AP_Arming::ArmingRudder arming_rudder = arming.get_rudder_arming_type();
if (arming_rudder == AP_Arming::ARMING_RUDDER_DISABLED) {
const AP_Arming::RudderArming arming_rudder = arming.get_rudder_arming_type();
if (arming_rudder == AP_Arming::RudderArming::IS_DISABLED) {
return;
}
@ -72,14 +72,14 @@ void Rover::rudder_arm_disarm_check()
}
} else {
// time to arm!
arm_motors(AP_Arming::RUDDER);
arm_motors(AP_Arming::Method::RUDDER);
rudder_arm_timer = 0;
}
} else {
// not at full right rudder
rudder_arm_timer = 0;
}
} else if ((arming_rudder == AP_Arming::ARMING_RUDDER_ARMDISARM) && !g2.motors.active()) {
} else if ((arming_rudder == AP_Arming::RudderArming::ARMDISARM) && !g2.motors.active()) {
// when armed and motor not active (not moving), full left rudder starts disarming counter
if (channel_steer->get_control_in() < -4000) {
const uint32_t now = millis();

2
APMrover2/system.cpp
View File

@ -335,7 +335,7 @@ void Rover::change_arm_state(void)
/*
arm motors
*/
bool Rover::arm_motors(AP_Arming::ArmingMethod method)
bool Rover::arm_motors(AP_Arming::Method method)
{
if (!arming.arm(method)) {
AP_Notify::events.arming_failed = true;