diff options
| author | Lorenz Meier <lm@qgroundcontrol.org> | 2014-11-23 21:32:13 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@qgroundcontrol.org> | 2014-11-23 21:32:13 +0100 |
| commit | 7cb613bb264499e56ad2743c75d563117978eddb (patch) | |
| tree | 67a1c2fd9afe32d3280b4965053b61f7bd5c794c | |
| parent | 2f271888d2ed934c271637c22554b503ce68e535 (diff) | |
| parent | 08d6cbe6bf0b5b04f63e42c6c60f5b1fe6167547 (diff) | |
| download | px4-firmware-7cb613bb264499e56ad2743c75d563117978eddb.tar.gz px4-firmware-7cb613bb264499e56ad2743c75d563117978eddb.tar.bz2 px4-firmware-7cb613bb264499e56ad2743c75d563117978eddb.zip | |
Merge pull request #1398 from philipoe/master
Addition of rc-loss duration to the mavlink warning messages
| -rw-r--r-- | src/modules/commander/commander.cpp | 5 | ||||
| -rw-r--r-- | src/modules/uORB/topics/vehicle_status.h | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp index e081955d0..c9c8d16b5 100644 --- a/src/modules/commander/commander.cpp +++ b/src/modules/commander/commander.cpp @@ -1548,7 +1548,7 @@ int commander_thread_main(int argc, char *argv[]) } else { if (status.rc_signal_lost) { - mavlink_log_critical(mavlink_fd, "RC signal regained"); + mavlink_log_critical(mavlink_fd, "RC SIGNAL REGAINED after %llums",(hrt_absolute_time()-status.rc_signal_lost_timestamp)/1000); status_changed = true; } } @@ -1649,8 +1649,9 @@ int commander_thread_main(int argc, char *argv[]) } else { if (!status.rc_signal_lost) { - mavlink_log_critical(mavlink_fd, "RC SIGNAL LOST"); + mavlink_log_critical(mavlink_fd, "RC SIGNAL LOST (at t=%llums)",hrt_absolute_time()/1000); status.rc_signal_lost = true; + status.rc_signal_lost_timestamp=sp_man.timestamp; status_changed = true; } } diff --git a/src/modules/uORB/topics/vehicle_status.h b/src/modules/uORB/topics/vehicle_status.h index 91491c148..8ec9d98d6 100644 --- a/src/modules/uORB/topics/vehicle_status.h +++ b/src/modules/uORB/topics/vehicle_status.h @@ -201,6 +201,7 @@ struct vehicle_status_s { bool rc_signal_found_once; bool rc_signal_lost; /**< true if RC reception lost */ + uint64_t rc_signal_lost_timestamp; /**< Time at which the RC reception was lost */ bool rc_signal_lost_cmd; /**< true if RC lost mode is commanded */ bool rc_input_blocked; /**< set if RC input should be ignored */ |