diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2013-12-26 18:17:04 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2013-12-26 18:17:04 +0100 |
| commit | a2cee83e572e08324c4b055f02c294a10cbb9007 (patch) | |
| tree | 23a7162789ab27b8114644685a46d0b9d336410f /src/modules/systemlib | |
| parent | b02b48290fdb5464020ea49209144ab8d5d045af (diff) | |
| parent | 8d2950561d1889ab1d4c2fc5d832a2984048487d (diff) | |
| download | px4-firmware-a2cee83e572e08324c4b055f02c294a10cbb9007.tar.gz px4-firmware-a2cee83e572e08324c4b055f02c294a10cbb9007.tar.bz2 px4-firmware-a2cee83e572e08324c4b055f02c294a10cbb9007.zip | |
Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs_navigator_termination_controlgroups
Conflicts:
src/modules/px4iofirmware/registers.c
Diffstat (limited to 'src/modules/systemlib')
| -rw-r--r-- | src/modules/systemlib/ppm_decode.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/modules/systemlib/ppm_decode.h b/src/modules/systemlib/ppm_decode.h index 6c5e15345..5a1ad84da 100644 --- a/src/modules/systemlib/ppm_decode.h +++ b/src/modules/systemlib/ppm_decode.h @@ -57,6 +57,7 @@ __BEGIN_DECLS * PPM decoder state */ __EXPORT extern uint16_t ppm_buffer[PPM_MAX_CHANNELS]; /**< decoded PPM channel values */ +__EXPORT extern uint16_t ppm_frame_length; /**< length of the decoded PPM frame (includes gap) */ __EXPORT extern unsigned ppm_decoded_channels; /**< count of decoded channels */ __EXPORT extern hrt_abstime ppm_last_valid_decode; /**< timestamp of the last valid decode */ |