Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs_navigator_termination_controlgroups

This commit is contained in:
Thomas Gubler
2013-12-23 22:48:26 +01:00
3 changed files with 4 additions and 2 deletions
+1 -1
View File
@@ -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;