diff options
| author | julianoes <julian@oes.ch> | 2014-03-10 22:50:14 +0100 |
|---|---|---|
| committer | julianoes <julian@oes.ch> | 2014-03-10 22:50:14 +0100 |
| commit | b6a087e92183ef9cca513357919b96ea2812d298 (patch) | |
| tree | ae4715f1205092b0e9ffcb5264fb1d322b762642 /src/modules | |
| parent | ddb94ceba8f8813a8d434d00daf42a232e58cbfc (diff) | |
| parent | e0cf0e3f41d0395a902032fc1cf78bc9ca76362c (diff) | |
| download | px4-firmware-b6a087e92183ef9cca513357919b96ea2812d298.tar.gz px4-firmware-b6a087e92183ef9cca513357919b96ea2812d298.tar.bz2 px4-firmware-b6a087e92183ef9cca513357919b96ea2812d298.zip | |
Merge pull request #718 from thomasgubler/fw_posctrl_warning
fw posctrl: change 2 functions that return nothing from int to void
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp b/src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp index 8ba8f2ccb..7f13df785 100644 --- a/src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp +++ b/src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp @@ -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; |