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

Sub: Remove unused pre_arm_check() 

This is performed by AP_Arming now
This commit is contained in:
Jacob Walser 2017-04-10 23:34:33 -04:00
parent 6f54eef857
commit 2fac49a163
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ArduSub/AP_State.cpp
View File

@ -37,16 +37,6 @@ void Sub::set_auto_armed(bool b)
} }
} }
// ---------------------------------------------
void Sub::set_pre_arm_check(bool b)
{
if (ap.pre_arm_check != b) {
ap.pre_arm_check = b;
AP_Notify::flags.pre_arm_check = b;
}
}
void Sub::set_motor_emergency_stop(bool b) void Sub::set_motor_emergency_stop(bool b)
{ {
if (ap.motor_emergency_stop != b) { if (ap.motor_emergency_stop != b) {

4
ArduSub/ArduSub.cpp
View File

@ -363,7 +363,9 @@ void Sub::three_hz_loop()
// one_hz_loop - runs at 1Hz // one_hz_loop - runs at 1Hz
void Sub::one_hz_loop() void Sub::one_hz_loop()
{ {
AP_Notify::flags.pre_arm_check = arming.pre_arm_checks(false); bool arm_check = arming.pre_arm_checks(false);
ap.pre_arm_check = arm_check;
AP_Notify::flags.pre_arm_check = arm_check;
AP_Notify::flags.pre_arm_gps_check = position_ok(); AP_Notify::flags.pre_arm_gps_check = position_ok();
if (should_log(MASK_LOG_ANY)) { if (should_log(MASK_LOG_ANY)) {

1
ArduSub/Sub.h
View File

@ -470,7 +470,6 @@ private:
void set_home_state(enum HomeState new_home_state); void set_home_state(enum HomeState new_home_state);
bool home_is_set(); bool home_is_set();
void set_auto_armed(bool b); void set_auto_armed(bool b);
void set_pre_arm_check(bool b);
void set_motor_emergency_stop(bool b); void set_motor_emergency_stop(bool b);
float get_smoothing_gain(); float get_smoothing_gain();
void get_pilot_desired_lean_angles(float roll_in, float pitch_in, float &roll_out, float &pitch_out, float angle_max); void get_pilot_desired_lean_angles(float roll_in, float pitch_in, float &roll_out, float &pitch_out, float angle_max);