dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #718 from thomasgubler/fw_posctrl_warning 

fw posctrl: change 2 functions that return nothing from int to void
This commit is contained in:
julianoes 2014-03-10 22:50:14 +01:00
parent ddb94ceba8 e0cf0e3f41
commit b6a087e921
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
View File

@ -350,12 +350,12 @@ private:
/*
* Reset takeoff state
*/
int reset_takeoff_state();
void reset_takeoff_state();
/*
* Reset landing state
*/
int reset_landing_state();
void reset_landing_state();
};
namespace l1_control
@ -1312,14 +1312,14 @@ FixedwingPositionControl::task_main()
_exit(0);
}
int FixedwingPositionControl::reset_takeoff_state()
void FixedwingPositionControl::reset_takeoff_state()
{
launch_detected = false;
usePreTakeoffThrust = false;
launchDetector.reset();
}
int FixedwingPositionControl::reset_landing_state()
void FixedwingPositionControl::reset_landing_state()
{
land_noreturn_horizontal = false;
land_noreturn_vertical = false;