diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-01-13 13:07:25 +0100 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-01-13 13:07:25 +0100 |
| commit | 7bcddd192fba723d165957043163762b2e08d802 (patch) | |
| tree | ad3a7d1d7a901d5d7a984a3f3aaa1b175ca358ca /src/modules/fw_pos_control_l1 | |
| parent | 8d7620c3cbe86414b84917350bcc99b65cef9b0d (diff) | |
| parent | f224374ed3c84717b8c92a3f0d6d902c5701eb04 (diff) | |
| download | px4-firmware-7bcddd192fba723d165957043163762b2e08d802.tar.gz px4-firmware-7bcddd192fba723d165957043163762b2e08d802.tar.bz2 px4-firmware-7bcddd192fba723d165957043163762b2e08d802.zip | |
Merge branch 'navigator_new' into navigator_new_vector
Diffstat (limited to 'src/modules/fw_pos_control_l1')
| -rw-r--r-- | src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp | 12 |
1 files changed, 5 insertions, 7 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 b8ef73d04..d8dbf9085 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 @@ -175,7 +175,6 @@ private: /* takeoff/launch states */ bool launch_detected; bool usePreTakeoffThrust; - bool launch_detection_message_sent; /* Landingslope object */ Landingslope landingslope; @@ -397,8 +396,7 @@ FixedwingPositionControl::FixedwingPositionControl() : _mavlink_fd(-1), launchDetector(), launch_detected(false), - usePreTakeoffThrust(false), - launch_detection_message_sent(false) + usePreTakeoffThrust(false) { /* safely initialize structs */ vehicle_attitude_s _att = {0}; @@ -985,10 +983,11 @@ FixedwingPositionControl::control_position(const math::Vector<2> ¤t_positi // warnx("Launch detection running"); if(!launch_detected) { //do not do further checks once a launch was detected if (launchDetector.launchDetectionEnabled()) { -// warnx("Launch detection enabled"); - if(!launch_detection_message_sent) { + static hrt_abstime last_sent = 0; + if(hrt_absolute_time() - last_sent > 4e6) { +// warnx("Launch detection running"); mavlink_log_info(_mavlink_fd, "#audio: Launchdetection running"); - launch_detection_message_sent = true; + last_sent = hrt_absolute_time(); } launchDetector.update(_sensor_combined.accelerometer_m_s2[0]); if (launchDetector.getLaunchDetected()) { @@ -1057,7 +1056,6 @@ FixedwingPositionControl::control_position(const math::Vector<2> ¤t_positi if (mission_item_triplet.current.nav_cmd != NAV_CMD_TAKEOFF) { launch_detected = false; usePreTakeoffThrust = false; - launch_detection_message_sent = false; } if (was_circle_mode && !_l1_control.circle_mode()) { |