fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-30 21:43:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix comment style and type

Browse Source
This commit is contained in:
Thomas Gubler
2014-12-13 17:20:53 +01:00
parent d0325f2b12
commit 6f89514beb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
+3 -3
View File
@@ -1267,12 +1267,12 @@ FixedwingPositionControl::control_position(const math::Vector<2> &current_positi
} }
_control_mode_current = FW_POSCTRL_MODE_POSITION; _control_mode_current = FW_POSCTRL_MODE_POSITION;
// Get demanded airspeed /* Get demanded airspeed */
float altctrl_airspeed = _parameters.airspeed_min + float altctrl_airspeed = _parameters.airspeed_min +
(_parameters.airspeed_max - _parameters.airspeed_min) * (_parameters.airspeed_max - _parameters.airspeed_min) *
_manual.z; _manual.z;
// Get demanded vertical velocity from pitch control /* Get demanded vertical velocity from pitch control */
static bool was_in_deadband = false; static bool was_in_deadband = false;
if (_manual.x > deadBand) { if (_manual.x > deadBand) {
float pitch = (_manual.x - deadBand) / factor; float pitch = (_manual.x - deadBand) / factor;
@@ -1324,7 +1324,7 @@ FixedwingPositionControl::control_position(const math::Vector<2> &current_positi
if (_vehicle_status.engine_failure || _vehicle_status.engine_failure_cmd) { if (_vehicle_status.engine_failure || _vehicle_status.engine_failure_cmd) {
/* Set thrust to 0 to minimize damage */ /* Set thrust to 0 to minimize damage */
_att_sp.thrust = 0.0f; _att_sp.thrust = 0.0f;
} else if (_control_mode_current == FW_POSCTRL_MODE_AUTO && // launchdetector only available in auot } else if (_control_mode_current == FW_POSCTRL_MODE_AUTO && // launchdetector only available in auto
pos_sp_triplet.current.type == SETPOINT_TYPE_TAKEOFF && pos_sp_triplet.current.type == SETPOINT_TYPE_TAKEOFF &&
launch_detection_state != LAUNCHDETECTION_RES_DETECTED_ENABLEMOTORS) { launch_detection_state != LAUNCHDETECTION_RES_DETECTED_ENABLEMOTORS) {
/* making sure again that the correct thrust is used, /* making sure again that the correct thrust is used,