diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2013-11-08 21:56:11 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2013-11-08 21:56:11 +0400 |
| commit | e8224376ca4d32e948cbee75bfecf8a30f3e98ea (patch) | |
| tree | 65290003878c65247d99ad21849a6f3cbeac2e35 /src/modules/mavlink/util.h | |
| parent | 28bf8e238e35a7bbba81f86e63cd0a49226673a4 (diff) | |
| parent | c63995e91c188b476aa2608b42a366f68dced423 (diff) | |
| download | px4-firmware-e8224376ca4d32e948cbee75bfecf8a30f3e98ea.tar.gz px4-firmware-e8224376ca4d32e948cbee75bfecf8a30f3e98ea.tar.bz2 px4-firmware-e8224376ca4d32e948cbee75bfecf8a30f3e98ea.zip | |
Merge branch 'master' into vector_control
Diffstat (limited to 'src/modules/mavlink/util.h')
| -rw-r--r-- | src/modules/mavlink/util.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/mavlink/util.h b/src/modules/mavlink/util.h index a4ff06a88..5e5ee8261 100644 --- a/src/modules/mavlink/util.h +++ b/src/modules/mavlink/util.h @@ -51,4 +51,4 @@ extern mavlink_wpm_storage *wpm; /** * Translate the custom state into standard mavlink modes and state. */ -extern void get_mavlink_mode_and_state(uint8_t *mavlink_state, uint8_t *mavlink_mode); +extern void get_mavlink_mode_and_state(uint8_t *mavlink_state, uint8_t *mavlink_base_mode, uint32_t *mavlink_custom_mode); |