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

Plane: To define the same wording.

This commit is contained in:
murata 2016-10-06 21:47:33 +09:00 committed by Tom Pittenger
parent c6846062ca
commit b3eecb87ac
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ArduPlane/quadplane.cpp
View File

@ -415,15 +415,16 @@ bool QuadPlane::setup(void)
goto failed; goto failed;
} }
#endif // AP_MOTORS_CLASS #endif // AP_MOTORS_CLASS
const static char *strUnableToAllocate = "Unable to allocate";
if (!motors) { if (!motors) {
hal.console->printf("Unable to allocate motors\n"); hal.console->printf("%s motors\n", strUnableToAllocate);
goto failed; goto failed;
} }
AP_Param::load_object_from_eeprom(motors, motors->var_info); AP_Param::load_object_from_eeprom(motors, motors->var_info);
attitude_control = new AC_AttitudeControl_Multi(ahrs, aparm, *motors, loop_delta_t); attitude_control = new AC_AttitudeControl_Multi(ahrs, aparm, *motors, loop_delta_t);
if (!attitude_control) { if (!attitude_control) {
hal.console->printf("Unable to allocate attitude_control\n"); hal.console->printf("%s attitude_control\n", strUnableToAllocate);
goto failed; goto failed;
} }
AP_Param::load_object_from_eeprom(attitude_control, attitude_control->var_info); AP_Param::load_object_from_eeprom(attitude_control, attitude_control->var_info);
@ -431,13 +432,13 @@ bool QuadPlane::setup(void)
p_alt_hold, p_vel_z, pid_accel_z, p_alt_hold, p_vel_z, pid_accel_z,
p_pos_xy, pi_vel_xy); p_pos_xy, pi_vel_xy);
if (!pos_control) { if (!pos_control) {
hal.console->printf("Unable to allocate pos_control\n"); hal.console->printf("%s pos_control\n", strUnableToAllocate);
goto failed; goto failed;
} }
AP_Param::load_object_from_eeprom(pos_control, pos_control->var_info); AP_Param::load_object_from_eeprom(pos_control, pos_control->var_info);
wp_nav = new AC_WPNav(inertial_nav, ahrs, *pos_control, *attitude_control); wp_nav = new AC_WPNav(inertial_nav, ahrs, *pos_control, *attitude_control);
if (!pos_control) { if (!pos_control) {
hal.console->printf("Unable to allocate wp_nav\n"); hal.console->printf("%s wp_nav\n", strUnableToAllocate);
goto failed; goto failed;
} }
AP_Param::load_object_from_eeprom(wp_nav, wp_nav->var_info); AP_Param::load_object_from_eeprom(wp_nav, wp_nav->var_info);