aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Copter: Start logging on arming attempt, rather than on successful arm

Browse Source
This commit is contained in:
Jonathan Challinger 2014-10-10 05:31:38 -07:00 committed by Randy Mackay
parent 67a38be7ce
commit dd38ad6bbf
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ArduCopter/motors.pde
View File

@ -121,11 +121,6 @@ static void init_arm_motors()
update_notify(); update_notify();
} }
#if LOGGING_ENABLED == ENABLED
// start dataflash
start_logging();
#endif
#if HIL_MODE != HIL_MODE_DISABLED || CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL #if HIL_MODE != HIL_MODE_DISABLED || CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL
gcs_send_text_P(SEVERITY_HIGH, PSTR("ARMING MOTORS")); gcs_send_text_P(SEVERITY_HIGH, PSTR("ARMING MOTORS"));
#endif #endif
@ -503,9 +498,15 @@ static bool pre_arm_gps_checks(bool display_failure)
} }
// arm_checks - perform final checks before arming // arm_checks - perform final checks before arming
// always called just before arming. Return true if ok to arm // always called just before arming. Return true if ok to arm
// has side-effect that logging is started
static bool arm_checks(bool display_failure, bool arming_from_gcs) static bool arm_checks(bool display_failure, bool arming_from_gcs)
{ {
#if LOGGING_ENABLED == ENABLED
// start dataflash
start_logging();
#endif
// always check if the current mode allows arming // always check if the current mode allows arming
if (!mode_allows_arming(control_mode, arming_from_gcs)) { if (!mode_allows_arming(control_mode, arming_from_gcs)) {
if (display_failure) { if (display_failure) {