diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-03-10 18:59:34 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-03-10 18:59:34 +0100 |
| commit | 100ad8907912198fca4d29caab98cbfa791b5839 (patch) | |
| tree | 788c5234d171aaf73086cb29d9aa9aed22faaaf3 /src/modules | |
| parent | 8719c12e9ab7fc1b453afe6bd761e611924d83f9 (diff) | |
| parent | 935362b7a369e75c18a7aed267d7b0b304e4c430 (diff) | |
| download | px4-firmware-100ad8907912198fca4d29caab98cbfa791b5839.tar.gz px4-firmware-100ad8907912198fca4d29caab98cbfa791b5839.tar.bz2 px4-firmware-100ad8907912198fca4d29caab98cbfa791b5839.zip | |
Merge pull request #714 from thomasgubler/launchdetection_cleanup
launchdetection: better integration of Block class
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp | 3 |
1 files changed, 2 insertions, 1 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 774758ef4..8ba8f2ccb 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 @@ -186,7 +186,7 @@ private: float target_bearing; /* Launch detection */ - LaunchDetector launchDetector; + launchdetection::LaunchDetector launchDetector; /* throttle and airspeed states */ float _airspeed_error; ///< airspeed error to setpoint in m/s @@ -989,6 +989,7 @@ FixedwingPositionControl::control_position(const math::Vector<2> ¤t_positi } else { /* no takeoff detection --> fly */ launch_detected = true; + warnx("launchdetection off"); } } |