diff options
| author | Kynos <mail01@delago.net> | 2014-06-15 12:30:06 +0200 |
|---|---|---|
| committer | Kynos <mail01@delago.net> | 2014-06-15 12:30:06 +0200 |
| commit | 137564b4a6b78c82a4c38ebd02782c531f259c19 (patch) | |
| tree | d83e97fca1c3a8e052cf957e6a12b44dc1d8dafa /src/modules/mavlink/mavlink_main.h | |
| parent | 7724e3d889eecd6733c6e85341a9f0b97faa37cf (diff) | |
| parent | 251760679a4bed86fdb10746062fde2cc23e460f (diff) | |
| download | px4-firmware-137564b4a6b78c82a4c38ebd02782c531f259c19.tar.gz px4-firmware-137564b4a6b78c82a4c38ebd02782c531f259c19.tar.bz2 px4-firmware-137564b4a6b78c82a4c38ebd02782c531f259c19.zip | |
Merge master with the exception of ubx.cpp and ubx.h
Diffstat (limited to 'src/modules/mavlink/mavlink_main.h')
| -rw-r--r-- | src/modules/mavlink/mavlink_main.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/modules/mavlink/mavlink_main.h b/src/modules/mavlink/mavlink_main.h index 25c0da820..40edc4b85 100644 --- a/src/modules/mavlink/mavlink_main.h +++ b/src/modules/mavlink/mavlink_main.h @@ -93,6 +93,7 @@ struct mavlink_wpm_storage { uint8_t current_partner_compid; uint64_t timestamp_lastaction; uint64_t timestamp_last_send_setpoint; + uint64_t timestamp_last_send_request; uint32_t timeout; int current_dataman_id; }; |