Browse Source

Merge pull request #718 from thomasgubler/fw_posctrl_warning

fw posctrl: change 2 functions that return nothing from int to void
sbg
julianoes 11 years ago
parent
commit
b6a087e921
  1. 8
      src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp

8
src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp

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

Loading…
Cancel
Save