diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2012-11-05 16:04:45 +0100 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2012-11-05 16:04:45 +0100 |
commit | e7f2c053c241849e3ea035fcd22a0e29945b3415 (patch) | |
tree | 704d9d21d46ba670ef1ec0286f24aa272e6cca25 /apps/uORB | |
parent | 39659e57f817c4f49be595d6cecf05e67e2d89db (diff) | |
download | px4-firmware-e7f2c053c241849e3ea035fcd22a0e29945b3415.tar.gz px4-firmware-e7f2c053c241849e3ea035fcd22a0e29945b3415.tar.bz2 px4-firmware-e7f2c053c241849e3ea035fcd22a0e29945b3415.zip |
Quickly separated low-level raw RC from mapped / scaled RC, supports FMU PPM and IO PPM / Spektrum now
Diffstat (limited to 'apps/uORB')
-rw-r--r-- | apps/uORB/topics/rc_channels.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/apps/uORB/topics/rc_channels.h b/apps/uORB/topics/rc_channels.h index 2c487cf3b..fef6ef2b3 100644 --- a/apps/uORB/topics/rc_channels.h +++ b/apps/uORB/topics/rc_channels.h @@ -50,14 +50,6 @@ * @{ */ -enum RC_CHANNELS_STATUS -{ - UNKNOWN = 0, - KNOWN = 1, - SIGNAL = 2, - TIMEOUT = 3 -}; - /** * This defines the mapping of the RC functions. * The value assigned to the specific function corresponds to the entry of @@ -85,12 +77,7 @@ struct rc_channels_s { uint64_t timestamp; /**< In microseconds since boot time. */ uint64_t timestamp_last_valid; /**< timestamp of last valid RC signal. */ struct { - uint16_t mid; /**< midpoint (0). */ - float scaling_factor; /**< scaling factor from raw counts to -1..+1 */ - uint16_t raw; /**< current raw value */ float scaled; /**< Scaled to -1..1 (throttle: 0..1) */ - uint16_t override; - enum RC_CHANNELS_STATUS status; /**< status of the channel */ } chan[RC_CHANNELS_FUNCTION_MAX]; uint8_t chan_count; /**< maximum number of valid channels */ @@ -98,6 +85,7 @@ struct rc_channels_s { char function_name[RC_CHANNELS_FUNCTION_MAX][20]; uint8_t function[RC_CHANNELS_FUNCTION_MAX]; uint8_t rssi; /**< Overall receive signal strength */ + bool is_valid; /**< Inputs are valid, no timeout */ }; /**< radio control channels. */ /** |