diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2013-12-23 11:13:42 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2013-12-23 11:13:42 +0100 |
| commit | 68d8230e78b9116da794e93a0a5edcce4d1d8ee4 (patch) | |
| tree | e0c86a748a5604e042f1e56c464df117d4eb3030 /src/modules/uORB | |
| parent | 23d0c6f8dd1a0b9aa64dafe26cfd56e43637c5ee (diff) | |
| parent | f6176890947dd33f6b26fb2cad53263882fb8e3b (diff) | |
| download | px4-firmware-68d8230e78b9116da794e93a0a5edcce4d1d8ee4.tar.gz px4-firmware-68d8230e78b9116da794e93a0a5edcce4d1d8ee4.tar.bz2 px4-firmware-68d8230e78b9116da794e93a0a5edcce4d1d8ee4.zip | |
Merge remote-tracking branch 'upstream/control_groups' into fw_autoland_att_tecs_navigator_termination_controlgroups
Conflicts:
src/systemcmds/tests/module.mk
src/systemcmds/tests/tests.h
Diffstat (limited to 'src/modules/uORB')
| -rw-r--r-- | src/modules/uORB/topics/rc_channels.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/modules/uORB/topics/rc_channels.h b/src/modules/uORB/topics/rc_channels.h index 5a8580143..086b2ef15 100644 --- a/src/modules/uORB/topics/rc_channels.h +++ b/src/modules/uORB/topics/rc_channels.h @@ -1,9 +1,6 @@ /**************************************************************************** * - * Copyright (C) 2008-2012 PX4 Development Team. All rights reserved. - * Author: @author Nils Wenzler <wenzlern@student.ethz.ch> - * @author Ivan Ovinnikov <oivan@student.ethz.ch> - * @author Lorenz Meier <lm@inf.ethz.ch> + * Copyright (c) 2012, 2013 PX4 Development Team. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -47,13 +44,13 @@ /** * The number of RC channel inputs supported. - * Current (Q1/2013) radios support up to 18 channels, + * Current (Q4/2013) radios support up to 18 channels, * leaving at a sane value of 15. * This number can be greater then number of RC channels, * because single RC channel can be mapped to multiple * functions, e.g. for various mode switches. */ -#define RC_CHANNELS_MAX 15 +#define RC_CHANNELS_MAPPED_MAX 15 /** * This defines the mapping of the RC functions. @@ -91,7 +88,7 @@ struct rc_channels_s { uint64_t timestamp_last_valid; /**< timestamp of last valid RC signal. */ struct { float scaled; /**< Scaled to -1..1 (throttle: 0..1) */ - } chan[RC_CHANNELS_MAX]; + } chan[RC_CHANNELS_MAPPED_MAX]; uint8_t chan_count; /**< number of valid channels */ /*String array to store the names of the functions*/ |