aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-11-02 21:23:42 +0100
committerLorenz Meier <lm@inf.ethz.ch>2014-11-02 21:23:42 +0100
commitd610564fd007112ed3e66d80fe63014424727f8b (patch)
tree569ec84c650a6a0bf28223e4c3e01ce9b2ff05e6
parent82ebf3ca1c46dd228ed1a95fd334cae6af9dd252 (diff)
parentacb739655d5c2ebf50449842ae2b7b9b7c76dbd1 (diff)
downloadpx4-firmware-d610564fd007112ed3e66d80fe63014424727f8b.tar.gz
px4-firmware-d610564fd007112ed3e66d80fe63014424727f8b.tar.bz2
px4-firmware-d610564fd007112ed3e66d80fe63014424727f8b.zip
Merge branch 'master' of github.com:PX4/Firmware
-rw-r--r--src/modules/uORB/topics/rc_channels.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/modules/uORB/topics/rc_channels.h b/src/modules/uORB/topics/rc_channels.h
index 8978de471..b14ae1edd 100644
--- a/src/modules/uORB/topics/rc_channels.h
+++ b/src/modules/uORB/topics/rc_channels.h
@@ -76,7 +76,6 @@ struct rc_channels_s {
uint64_t timestamp_last_valid; /**< Timestamp of last valid RC signal */
float channels[RC_CHANNELS_FUNCTION_MAX]; /**< Scaled to -1..1 (throttle: 0..1) */
uint8_t channel_count; /**< Number of valid channels */
- char function_name[RC_CHANNELS_FUNCTION_MAX][20]; /**< String array to store the names of the functions */
int8_t function[RC_CHANNELS_FUNCTION_MAX]; /**< Functions mapping */
uint8_t rssi; /**< Receive signal strength index */
bool signal_lost; /**< Control signal lost, should be checked together with topic timeout */