aboutsummaryrefslogtreecommitdiff
path: root/apps/commander/commander.c
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2012-09-05 11:37:17 +0200
committerLorenz Meier <lm@inf.ethz.ch>2012-09-05 11:37:17 +0200
commit84e11a0cac53f753f65b0bea4659e1f2d9c0b35e (patch)
tree05ca5f3573c7cfbc1c43e71a3cbdc5ca58d3cee5 /apps/commander/commander.c
parent86a2a4fb9fd2b5ed38b330923823e06b96af01f3 (diff)
downloadpx4-firmware-84e11a0cac53f753f65b0bea4659e1f2d9c0b35e.tar.gz
px4-firmware-84e11a0cac53f753f65b0bea4659e1f2d9c0b35e.tar.bz2
px4-firmware-84e11a0cac53f753f65b0bea4659e1f2d9c0b35e.zip
Fixed correct RC loss detection, AR.Drone is now shutting down motors after 1 s of RC loss. Added debug topic.
Diffstat (limited to 'apps/commander/commander.c')
-rw-r--r--apps/commander/commander.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/apps/commander/commander.c b/apps/commander/commander.c
index 80d2c58f8..4135abf60 100644
--- a/apps/commander/commander.c
+++ b/apps/commander/commander.c
@@ -69,6 +69,7 @@
#include <uORB/topics/vehicle_gps_position.h>
#include <uORB/topics/vehicle_command.h>
#include <uORB/topics/subsystem_info.h>
+#include <uORB/topics/actuator_controls.h>
#include <mavlink/mavlink_log.h>
#include <systemlib/param/param.h>
@@ -1174,6 +1175,7 @@ int commander_thread_main(int argc, char *argv[])
/* End battery voltage check */
/* Start RC state check */
+ bool prev_lost = current_status.rc_signal_lost;
if (rc.chan_count > 4 && (hrt_absolute_time() - rc.timestamp) < 100000) {
@@ -1238,10 +1240,18 @@ int commander_thread_main(int argc, char *argv[])
/* flag as lost and update interval since when the signal was lost (to initiate RTL after some time) */
current_status.rc_signal_cutting_off = true;
current_status.rc_signal_lost_interval = hrt_absolute_time() - rc.timestamp;
+
/* if the RC signal is gone for a full second, consider it lost */
if (current_status.rc_signal_lost_interval > 1000000) current_status.rc_signal_lost = true;
}
+ /* Check if this is the first loss or first gain*/
+ if ((!prev_lost && current_status.rc_signal_lost) ||
+ prev_lost && !current_status.rc_signal_lost) {
+ /* publish rc lost */
+ publish_armed_status(&current_status);
+ }
+
/* End mode switch */
/* END RC state check */