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

Copter: minor formatting fix 

This is mostly just to trigger compilation of the latest beta
This commit is contained in:
Randy Mackay 2017-05-25 17:53:20 +09:00
parent 5f0214dd41
commit 70ed572476
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ArduCopter/Parameters.cpp
View File

@ -807,7 +807,7 @@ const AP_Param::Info Copter::var_info[] = {
// @Group: RSSI_ // @Group: RSSI_
// @Path: ../libraries/AP_RSSI/AP_RSSI.cpp // @Path: ../libraries/AP_RSSI/AP_RSSI.cpp
GOBJECT(rssi, "RSSI_", AP_RSSI), GOBJECT(rssi, "RSSI_", AP_RSSI),
#if RANGEFINDER_ENABLED == ENABLED #if RANGEFINDER_ENABLED == ENABLED
// @Group: RNGFND // @Group: RNGFND
@ -885,7 +885,7 @@ const AP_Param::Info Copter::var_info[] = {
// @User: Standard // @User: Standard
GSCALAR(terrain_follow, "TERRAIN_FOLLOW", 0), GSCALAR(terrain_follow, "TERRAIN_FOLLOW", 0),
// @Group: // @Group:
// @Path: Parameters.cpp // @Path: Parameters.cpp
GOBJECT(g2, "", ParametersG2), GOBJECT(g2, "", ParametersG2),

6
ArduCopter/system.cpp
View File

@ -325,7 +325,7 @@ void Copter::init_ardupilot()
} }
// disable safety if requested // disable safety if requested
BoardConfig.init_safety(); BoardConfig.init_safety();
cliSerial->printf("\nReady to FLY "); 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) { if(mode_has_manual_throttle(control_mode) && ap.throttle_zero && !failsafe.radio) {
set_auto_armed(false); 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 // 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 // so that rotor runup is checked again before attempting to take-off
if(ap.land_complete && !motors->rotor_runup_complete()) { 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 = new AP_MotorsHeli_Single(MAIN_LOOP_RATE);
motors_var_info = AP_MotorsHeli_Single::var_info; motors_var_info = AP_MotorsHeli_Single::var_info;
AP_Param::set_frame_type_flags(AP_PARAM_FRAME_HELI); AP_Param::set_frame_type_flags(AP_PARAM_FRAME_HELI);
break; break;
#endif #endif
} }
if (motors == nullptr) { if (motors == nullptr) {