diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-06-10 14:32:37 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-06-10 14:32:37 +0200 |
| commit | 3015f2e7af94e684c666689aa70c602f79810218 (patch) | |
| tree | 33a942b684486309ef0e02c8709f26b29c1973b4 /src/modules/mavlink/mavlink_main.h | |
| parent | cad0877f67c393b698b8fc4f242944c9e1ba1bc5 (diff) | |
| download | px4-firmware-3015f2e7af94e684c666689aa70c602f79810218.tar.gz px4-firmware-3015f2e7af94e684c666689aa70c602f79810218.tar.bz2 px4-firmware-3015f2e7af94e684c666689aa70c602f79810218.zip | |
mavlink: retry timeout moved to define
Diffstat (limited to 'src/modules/mavlink/mavlink_main.h')
| -rw-r--r-- | src/modules/mavlink/mavlink_main.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/modules/mavlink/mavlink_main.h b/src/modules/mavlink/mavlink_main.h index fbb25029d..e31bbbb31 100644 --- a/src/modules/mavlink/mavlink_main.h +++ b/src/modules/mavlink/mavlink_main.h @@ -78,8 +78,9 @@ enum MAVLINK_WPM_CODES { #define MAVLINK_WPM_MAX_WP_COUNT 255 -#define MAVLINK_WPM_PROTOCOL_TIMEOUT_DEFAULT 5000000 ///< Protocol communication timeout in useconds -#define MAVLINK_WPM_SETPOINT_DELAY_DEFAULT 1000000 ///< When to send a new setpoint +#define MAVLINK_WPM_PROTOCOL_TIMEOUT_DEFAULT 5000000 ///< Protocol communication action timeout in useconds +#define MAVLINK_WPM_RETRY_TIMEOUT_DEFAULT 500000 ///< Protocol communication retry timeout in useconds +#define MAVLINK_WPM_SETPOINT_DELAY_DEFAULT 1000000 ///< When to send a new setpoint #define MAVLINK_WPM_PROTOCOL_DELAY_DEFAULT 40000 @@ -96,7 +97,8 @@ struct mavlink_wpm_storage { uint64_t timestamp_lastaction; uint64_t timestamp_last_send_setpoint; uint64_t timestamp_last_send_request; - uint32_t timeout; + uint32_t action_timeout; + uint32_t retry_timeout; }; |