From 70ed5724765b4d8e9e9ac1b2acad648c002d2e81 Mon Sep 17 00:00:00 2001 From: Randy Mackay Date: Thu, 25 May 2017 17:53:20 +0900 Subject: [PATCH] Copter: minor formatting fix This is mostly just to trigger compilation of the latest beta --- ArduCopter/Parameters.cpp | 4 ++-- ArduCopter/system.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ArduCopter/Parameters.cpp b/ArduCopter/Parameters.cpp index 2096df05be..4f115c0480 100644 --- a/ArduCopter/Parameters.cpp +++ b/ArduCopter/Parameters.cpp @@ -807,7 +807,7 @@ const AP_Param::Info Copter::var_info[] = { // @Group: RSSI_ // @Path: ../libraries/AP_RSSI/AP_RSSI.cpp - GOBJECT(rssi, "RSSI_", AP_RSSI), + GOBJECT(rssi, "RSSI_", AP_RSSI), #if RANGEFINDER_ENABLED == ENABLED // @Group: RNGFND @@ -885,7 +885,7 @@ const AP_Param::Info Copter::var_info[] = { // @User: Standard GSCALAR(terrain_follow, "TERRAIN_FOLLOW", 0), - // @Group: + // @Group: // @Path: Parameters.cpp GOBJECT(g2, "", ParametersG2), diff --git a/ArduCopter/system.cpp b/ArduCopter/system.cpp index 912e2c3816..118cc2942f 100644 --- a/ArduCopter/system.cpp +++ b/ArduCopter/system.cpp @@ -325,7 +325,7 @@ void Copter::init_ardupilot() } // disable safety if requested - BoardConfig.init_safety(); + BoardConfig.init_safety(); cliSerial->printf("\nReady to FLY "); @@ -450,7 +450,7 @@ void Copter::update_auto_armed() if(mode_has_manual_throttle(control_mode) && ap.throttle_zero && !failsafe.radio) { set_auto_armed(false); } -#if FRAME_CONFIG == HELI_FRAME +#if FRAME_CONFIG == HELI_FRAME // if helicopters are on the ground, and the motor is switched off, auto-armed should be false // so that rotor runup is checked again before attempting to take-off if(ap.land_complete && !motors->rotor_runup_complete()) { @@ -618,7 +618,7 @@ void Copter::allocate_motors(void) motors = new AP_MotorsHeli_Single(MAIN_LOOP_RATE); motors_var_info = AP_MotorsHeli_Single::var_info; AP_Param::set_frame_type_flags(AP_PARAM_FRAME_HELI); - break; + break; #endif } if (motors == nullptr) {