aboutsummaryrefslogtreecommitdiff
path: root/src/drivers
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2013-12-23 22:48:26 +0100
committerThomas Gubler <thomasgubler@gmail.com>2013-12-23 22:48:26 +0100
commit8dda05e0011f9db63ad21ed2d1b74e7bdde58902 (patch)
treeb2d7e55941499684b859df4a40f634930a266612 /src/drivers
parent80986ce813035fa07a257f71056701dbc31487b1 (diff)
parent107bb54b33dd4360fd5fee538f7a87b79279b8ab (diff)
downloadpx4-firmware-8dda05e0011f9db63ad21ed2d1b74e7bdde58902.tar.gz
px4-firmware-8dda05e0011f9db63ad21ed2d1b74e7bdde58902.tar.bz2
px4-firmware-8dda05e0011f9db63ad21ed2d1b74e7bdde58902.zip
Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs_navigator_termination_controlgroups
Diffstat (limited to 'src/drivers')
-rw-r--r--src/drivers/stm32/drv_hrt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/drivers/stm32/drv_hrt.c b/src/drivers/stm32/drv_hrt.c
index 36226c941..f105251f0 100644
--- a/src/drivers/stm32/drv_hrt.c
+++ b/src/drivers/stm32/drv_hrt.c
@@ -342,7 +342,7 @@ static void hrt_call_invoke(void);
#define PPM_MAX_CHANNELS 20
/* Number of same-sized frames required to 'lock' */
-#define PPM_CHANNEL_LOCK 2 /* should be less than the input timeout */
+#define PPM_CHANNEL_LOCK 4 /* should be less than the input timeout */
__EXPORT uint16_t ppm_buffer[PPM_MAX_CHANNELS];
__EXPORT unsigned ppm_decoded_channels = 0;